[CalendarServer-changes] [13258] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 13258
          http://trac.calendarserver.org//changeset/13258
Author:   wsanchez at apple.com
Date:     2014-04-10 17:24:32 -0700 (Thu, 10 Apr 2014)
Log Message:
-----------
--pre --allow-all-external when installing from cache.

Modified Paths:
--------------
    CalendarServer/trunk/bin/_build.sh
    CalendarServer/trunk/support/Apple.make
    CalendarServer/trunk/support/submit

Modified: CalendarServer/trunk/bin/_build.sh
===================================================================
--- CalendarServer/trunk/bin/_build.sh	2014-04-11 00:09:35 UTC (rev 13257)
+++ CalendarServer/trunk/bin/_build.sh	2014-04-11 00:24:32 UTC (rev 13258)
@@ -655,8 +655,9 @@
 
 pip_install_from_cache () {
   "${python}" -m pip install                 \
+    --pre --allow-all-external               \
+    --no-index                               \
     --find-links="${dev_home}/pip_downloads" \
-    --no-index                               \
     --log="${dev_home}/pip.log"              \
     "$@";
 }

Modified: CalendarServer/trunk/support/Apple.make
===================================================================
--- CalendarServer/trunk/support/Apple.make	2014-04-11 00:09:35 UTC (rev 13257)
+++ CalendarServer/trunk/support/Apple.make	2014-04-11 00:24:32 UTC (rev 13258)
@@ -143,10 +143,6 @@
 # B&I Hooey
 #
 
-cache_deps:: install_source
-	@echo "Downloading dependencies...";
-	$(_v) if [ ! -d "./requirements/cache" ]; then "./support/_cache_deps" ]; fi;
-
 buildit: cache_deps
 	@echo "Running buildit...";
 	$(_v) sudo ~rc/bin/buildit $(CC_Archs) "$(Sources)";

Modified: CalendarServer/trunk/support/submit
===================================================================
--- CalendarServer/trunk/support/submit	2014-04-11 00:09:35 UTC (rev 13257)
+++ CalendarServer/trunk/support/submit	2014-04-11 00:24:32 UTC (rev 13258)
@@ -164,7 +164,7 @@
 
 echo "";
 echo "Preparing sources for ${project_version}...";
-make -C "${wc}" cache_deps;
+"${wc}/support/_cache_deps";
 
 if "${build}"; then
   echo "";
@@ -205,7 +205,9 @@
     fi;
   fi;
 else
-  echo "${wc}"; exit 1;
+  # Clean up after _cache_deps
+  find "${wc}/.develop" -depth 1 ! -name pip_downloads -print0 | xargs -0 rm -r;
+
   echo "";
   echo "Submitting sources for ${project_version}...";
   rm -rf "${wc}/.dependencies";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140410/3b77b2e3/attachment.html>