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

[source_changes at macosforge.org]

Revision: 12582
          http://trac.calendarserver.org//changeset/12582
Author:   wsanchez at apple.com
Date:     2014-02-05 16:17:39 -0800 (Wed, 05 Feb 2014)
Log Message:
-----------
Defer setup/cleanup of directories until it's needed.

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

Modified: CalendarServer/trunk/bin/_build.sh
===================================================================
--- CalendarServer/trunk/bin/_build.sh	2014-02-06 00:13:48 UTC (rev 12581)
+++ CalendarServer/trunk/bin/_build.sh	2014-02-06 00:17:39 UTC (rev 12582)
@@ -103,12 +103,6 @@
     dep_packages="${TWEXT_PKG_CACHE}";
   fi;
 
-  mkdir -p "${dep_sources}";
-
-  if "${force_setup}"; then
-    rm -rf "${py_root}";
-  fi;
-
   export PYTHONPATH="${wd}:${PYTHONPATH:-}";
 
   # These variables are defaults for things which might be configured by
@@ -435,6 +429,8 @@
 
   # Extra arguments are processed below, as arguments to './configure'.
 
+  mkdir -p "${dep_sources}";
+
   srcdir="${dep_sources}/${path}";
   # local dstroot="${srcdir}/_root";
   local dstroot="${dev_roots}/${name}";
@@ -577,6 +573,11 @@
 
   # Set up virtual environment
 
+  if "${force_setup}"; then
+    # Nuke the virtual environment first
+    rm -rf "${py_root}";
+  fi;
+
   "${bootstrap_python}" -m virtualenv "${py_root}";
 
   # Make sure setup got called enough to write the version file.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/f648694b/attachment.html>