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

[source_changes at macosforge.org]

Revision: 12487
          http://trac.calendarserver.org//changeset/12487
Author:   wsanchez at apple.com
Date:     2014-01-30 15:34:57 -0800 (Thu, 30 Jan 2014)
Log Message:
-----------
Make ! do_setup do less setup

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

Modified: twext/trunk/bin/_build.sh
===================================================================
--- twext/trunk/bin/_build.sh	2014-01-30 23:15:40 UTC (rev 12486)
+++ twext/trunk/bin/_build.sh	2014-01-30 23:34:57 UTC (rev 12487)
@@ -472,6 +472,8 @@
 # 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";
 
@@ -549,26 +551,26 @@
 py_dependencies () {
   export PATH="${py_root}/bin:${PATH}";
 
+  if ! "${do_setup}"; then return 0; fi;
+
   for requirements in "${wd}/requirements/py_"*".txt"; do
 
     ruler "Preparing Python requirements: ${requirements}";
     echo "";
 
-    if "${do_setup}"; then
-      if ! "${python}" -m pip install               \
-          --requirement "${requirements}"           \
-          --download-cache "${dev_home}/pip_cache"  \
-          --log "${dev_home}/pip.log"               \
-      ; then
-        err=$?;
-        echo "Unable to set up Python requirements: ${requirements}";
-        if [ "${requirements#${wd}/requirements/py_opt_}" != "${requirements}" ]; then
-          echo "Requirements ${requirements} are optional; continuing.";
-        else
-          echo "";
-          echo "pip log: ${dev_home}/pip.log";
-          return 1;
-        fi;
+    if ! "${python}" -m pip install               \
+        --requirement "${requirements}"           \
+        --download-cache "${dev_home}/pip_cache"  \
+        --log "${dev_home}/pip.log"               \
+    ; then
+      err=$?;
+      echo "Unable to set up Python requirements: ${requirements}";
+      if [ "${requirements#${wd}/requirements/py_opt_}" != "${requirements}" ]; then
+        echo "Requirements ${requirements} are optional; continuing.";
+      else
+        echo "";
+        echo "pip log: ${dev_home}/pip.log";
+        return 1;
       fi;
     fi;
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/590c4913/attachment.html>