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

[source_changes at macosforge.org]

Revision: 12489
          http://trac.calendarserver.org//changeset/12489
Author:   wsanchez at apple.com
Date:     2014-01-30 15:37:42 -0800 (Thu, 30 Jan 2014)
Log Message:
-----------
Make ! do_setup do slightly more setup

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

Modified: CalendarServer/trunk/bin/_build.sh
===================================================================
--- CalendarServer/trunk/bin/_build.sh	2014-01-30 23:35:02 UTC (rev 12488)
+++ CalendarServer/trunk/bin/_build.sh	2014-01-30 23:37:42 UTC (rev 12489)
@@ -105,16 +105,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.
 
@@ -472,8 +462,6 @@
 # Build C dependencies
 #
 c_dependencies () {
-  if ! "${do_setup}"; then return 0; fi;
-
      c_glue_root="${dev_roots}/c_glue";
   c_glue_include="${c_glue_root}/include";
 
@@ -567,6 +555,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/a6dbc857/attachment.html>