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

[source_changes at macosforge.org]

Revision: 13315
          http://trac.calendarserver.org//changeset/13315
Author:   wsanchez at apple.com
Date:     2014-04-17 15:48:57 -0700 (Thu, 17 Apr 2014)
Log Message:
-----------
cleanup

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

Modified: CalendarServer/trunk/bin/_build.sh
===================================================================
--- CalendarServer/trunk/bin/_build.sh	2014-04-17 22:24:24 UTC (rev 13314)
+++ CalendarServer/trunk/bin/_build.sh	2014-04-17 22:48:57 UTC (rev 13315)
@@ -74,6 +74,14 @@
 init_build () {
   init_py;
 
+  # These variables are defaults for things which might be configured by
+  # environment; only set them if they're un-set.
+  conditional_set wd "$(pwd)";
+  conditional_set do_get "true";
+  conditional_set do_setup "true";
+  conditional_set force_setup "false";
+  conditional_set requirements "${wd}/requirements-dev.txt"
+
       dev_home="${wd}/.develop";
      dev_roots="${dev_home}/roots";
   dep_packages="${dev_home}/pkg";
@@ -98,14 +106,6 @@
 
   export _DEVELOP_PROJECT_="${project}";
 
-  # These variables are defaults for things which might be configured by
-  # environment; only set them if they're un-set.
-
-  conditional_set wd "$(pwd)";
-  conditional_set do_get "true";
-  conditional_set do_setup "true";
-  conditional_set force_setup "false";
-
   # Find some hashing commands
   # sha1() = sha1 hash, if available
   # md5()  = md5 hash, if available
@@ -621,7 +621,7 @@
 
   "${python}" "${wd}/setup.py" check > /dev/null;
 
-  if [ -d "${wd}/requirements/cache" ]; then
+  if [ -d "${dev_home}/pip_downloads" ]; then
     pip_install="pip_install_from_cache";
   else
     pip_install="pip_download_and_install";
@@ -629,7 +629,7 @@
 
   ruler "Preparing Python requirements";
   echo "";
-  "${pip_install}" --requirement="${wd}/requirements-dev.txt";
+  "${pip_install}" --requirement="${requirements}";
 
   for option in $("${python}" -c 'import setup; print "\n".join(setup.extras_requirements.keys())'); do
     ruler "Preparing Python requirements for optional feature: ${option}";
@@ -646,10 +646,10 @@
 pip_download () {
   mkdir -p "${dev_home}/pip_downloads";
 
-  "${python}" -m pip install                  \
-    --download="${dev_home}/pip_downloads"    \
-    --pre --allow-all-external                \
-    --log="${dev_home}/pip.log"               \
+  "${python}" -m pip install               \
+    --download="${dev_home}/pip_downloads" \
+    --pre --allow-all-external             \
+    --log="${dev_home}/pip.log"            \
     "$@";
 }
 
@@ -665,10 +665,10 @@
 
 
 pip_download_and_install () {
-  "${python}" -m pip install                  \
-    --pre --allow-all-external                \
-    --download-cache="${dev_home}/pip_cache"  \
-    --log="${dev_home}/pip.log"               \
+  "${python}" -m pip install                 \
+    --pre --allow-all-external               \
+    --download-cache="${dev_home}/pip_cache" \
+    --log="${dev_home}/pip.log"              \
     "$@";
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140417/c980dc5f/attachment-0001.html>