[CalendarServer-changes] [12452] CalendarServer/trunk/bin/_build.sh

[source_changes at macosforge.org]

Revision: 12452
          http://trac.calendarserver.org//changeset/12452
Author:   wsanchez at apple.com
Date:     2014-01-27 11:55:00 -0800 (Mon, 27 Jan 2014)
Log Message:
-----------
Setup python hooey in init_build

Modified Paths:
--------------
    CalendarServer/trunk/bin/_build.sh

Modified: CalendarServer/trunk/bin/_build.sh
===================================================================
--- CalendarServer/trunk/bin/_build.sh	2014-01-27 19:43:44 UTC (rev 12451)
+++ CalendarServer/trunk/bin/_build.sh	2014-01-27 19:55:00 UTC (rev 12452)
@@ -95,8 +95,18 @@
   dep_packages="${dev_home}/pkg";
    dep_sources="${dev_home}/src";
 
+    py_root="${dev_roots}/py_modules";
+  py_libdir="${py_root}/lib/python";
+  py_bindir="${py_root}/bin";
+
   mkdir -p "${dep_sources}";
 
+  # Set up virtual environment
+
+  "${bootstrap_python}" -m virtualenv "${py_root}";
+
+  python="${py_bindir}/python";
+
   # These variables are defaults for things which might be configured by
   # environment; only set them if they're un-set.
 
@@ -537,20 +547,10 @@
 # Build Python dependencies
 #
 py_dependencies () {
-    py_root="${dev_roots}/py_modules";
-  py_libdir="${py_root}/lib/python";
-  py_bindir="${py_root}/bin";
+  # export PYTHONPATH="${py_libdir}:${PYTHONPATH:-}"
 
-  # Set up virtual environment
-
-  "${bootstrap_python}" -m virtualenv "${py_root}";
-
   export PATH="${py_root}/bin:${PATH}";
 
-  python="${py_bindir}/python";
-
-  # Install requirements into virtual environment
-
   for requirements in "${wd}/requirements/"*; do
 
     ruler "Preparing Python requirements: ${requirements}";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/651b4151/attachment.html>