[CalendarServer-changes] [12564] twext/trunk/bin/_build.sh

source_changes at macosforge.org source_changes at macosforge.org
Wed Mar 12 11:20:47 PDT 2014


Revision: 12564
          http://trac.calendarserver.org//changeset/12564
Author:   wsanchez at apple.com
Date:     2014-02-04 15:38:34 -0800 (Tue, 04 Feb 2014)
Log Message:
-----------
sync

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

Modified: twext/trunk/bin/_build.sh
===================================================================
--- twext/trunk/bin/_build.sh	2014-02-04 23:38:09 UTC (rev 12563)
+++ twext/trunk/bin/_build.sh	2014-02-04 23:38:34 UTC (rev 12564)
@@ -111,16 +111,6 @@
     rm -rf "${py_root}";
   fi;
 
-  # Set up virtual environment
-
-  "${bootstrap_python}" -m virtualenv "${py_root}";
-
-  python="${py_bindir}/python";
-
-  # Make sure setup got called enough to write the version file.
-
-  "${python}" "${wd}/setup.py" check > /dev/null;
-
   # These variables are defaults for things which might be configured by
   # environment; only set them if they're un-set.
 
@@ -171,9 +161,9 @@
 
 
 setup_print () {
-    what="$1"; shift;
+  what="$1"; shift;
 
-    PYTHONPATH="${wd}" "${python}" - << EOF
+  PYTHONPATH="${wd}" "${python}" - << EOF
 from __future__ import print_function
 import setup
 print(setup.${what})
@@ -568,6 +558,16 @@
 
   if ! "${do_setup}"; then return 0; fi;
 
+  # Set up virtual environment
+
+  "${bootstrap_python}" -m virtualenv "${py_root}";
+
+  python="${py_bindir}/python";
+
+  # Make sure setup got called enough to write the version file.
+
+  "${python}" "${wd}/setup.py" check > /dev/null;
+
   for requirements in "${wd}/requirements/py_"*".txt"; do
 
     ruler "Preparing Python requirements: ${requirements}";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/e495a416/attachment.html>


More information about the calendarserver-changes mailing list