[CalendarServer-changes] [13383] CalendarServer/trunk/support/Apple.make

[source_changes at macosforge.org]

Revision: 13383
          http://trac.calendarserver.org//changeset/13383
Author:   wsanchez at apple.com
Date:     2014-04-29 17:01:42 -0700 (Tue, 29 Apr 2014)
Log Message:
-----------
Set PYTHONPATH when creating ve.

Modified Paths:
--------------
    CalendarServer/trunk/support/Apple.make

Modified: CalendarServer/trunk/support/Apple.make
===================================================================
--- CalendarServer/trunk/support/Apple.make	2014-04-29 22:00:37 UTC (rev 13382)
+++ CalendarServer/trunk/support/Apple.make	2014-04-30 00:01:42 UTC (rev 13383)
@@ -77,16 +77,16 @@
 	$(_v) mkdir -p "$(BuildDirectory)/pytools/lib";
 	$(_v) mkdir -p "$(BuildDirectory)/pytools/junk";
 	$(_v) for pkg in $$(find "$(Sources)/.develop/tools" -type f -name "*.tgz"); do \
-	          tar -C "$(BuildDirectory)" -xvzf "$${pkg}"; 							\
-	          cd "$(BuildDirectory)/$$(basename "$${pkg}" .tgz)" && 				\
-	              PYTHONPATH="$(BuildDirectory)/pytools/lib" 						\
-	              "$(PYTHON)" setup.py install 										\
-	                  --install-base="$(BuildDirectory)/pytools" 					\
-	                  --install-lib="$(BuildDirectory)/pytools/lib" 				\
-	                  --install-headers="$(BuildDirectory)/pytools/junk" 		\
-	                  --install-scripts="$(BuildDirectory)/pytools/junk" 			\
-	                  --install-data="$(BuildDirectory)/pytools/junk" 				\
-	                  ; 															\
+	          tar -C "$(BuildDirectory)" -xvzf "$${pkg}";                           \
+	          cd "$(BuildDirectory)/$$(basename "$${pkg}" .tgz)" &&                 \
+	              PYTHONPATH="$(BuildDirectory)/pytools/lib"                        \
+	              "$(PYTHON)" setup.py install                                      \
+	                  --install-base="$(BuildDirectory)/pytools"                    \
+	                  --install-lib="$(BuildDirectory)/pytools/lib"                 \
+	                  --install-headers="$(BuildDirectory)/pytools/junk"            \
+	                  --install-scripts="$(BuildDirectory)/pytools/junk"            \
+	                  --install-data="$(BuildDirectory)/pytools/junk"               \
+	                  ;                                                             \
 	      done;
 	@#
 	@# Set up a virtual environment in Server.app; we'll install into that.
@@ -102,10 +102,11 @@
 	@#
 	@echo "Installing Python packages...";
 	$(_v) for pkg in $$(find "$(Sources)/.develop/pip_downloads" -type f); do \
-	          $(Environment) "$(DSTROOT)$(CS_VIRTUALENV)/bin/pip" install     \
-                  --pre --allow-all-external --no-index --no-deps             \
-	              --log=/tmp/pip.log                                          \
-	              "$${pkg}";                                                  \
+	          $(Environment) PYTHONPATH="$(BuildDirectory)/pytools/lib"       \
+	              "$(DSTROOT)$(CS_VIRTUALENV)/bin/pip" install                \
+                      --pre --allow-all-external --no-index --no-deps         \
+	                  --log=/tmp/pip.log                                      \
+	                  "$${pkg}";                                              \
 	      done;
 	@#
 	@# Make the virtualenv relocatable
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140429/ab3e0398/attachment-0001.html>