[CalendarServer-changes] [13256] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 13256
          http://trac.calendarserver.org//changeset/13256
Author:   wsanchez at apple.com
Date:     2014-04-10 17:05:17 -0700 (Thu, 10 Apr 2014)
Log Message:
-----------
Add pip_download().
Rename ${py_modules} -> ${py_virtualenv}.

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:04:37 UTC (rev 13255)
+++ CalendarServer/trunk/bin/_build.sh	2014-04-11 00:05:17 UTC (rev 13256)
@@ -79,9 +79,9 @@
   dep_packages="${dev_home}/pkg";
    dep_sources="${dev_home}/src";
 
-    py_root="${dev_roots}/py_modules";
-  py_libdir="${py_root}/lib/python";
-  py_bindir="${py_root}/bin";
+  py_virtualenv="${dev_home}/virtualenv";
+      py_libdir="${py_virtualenv}/lib/python";
+      py_bindir="${py_virtualenv}/bin";
 
   python="${py_bindir}/python";
 
@@ -91,8 +91,8 @@
     dep_packages="${TWEXT_PKG_CACHE}";
   fi;
 
-  if [ ! -d "${py_root}" ]; then
-    "${bootstrap_python}" -m virtualenv "${py_root}";
+  if [ ! -d "${py_virtualenv}" ]; then
+    "${bootstrap_python}" -m virtualenv "${py_virtualenv}";
   fi;
 
   project="$(setup_print name)";
@@ -589,7 +589,7 @@
 # Build Python dependencies
 #
 py_dependencies () {
-  export PATH="${py_root}/bin:${PATH}";
+  export PATH="${py_virtualenv}/bin:${PATH}";
   export PYTHON="${python}";
   export PYTHONPATH="${wd}:${PYTHONPATH:-}";
 
@@ -611,10 +611,10 @@
 
   if "${force_setup}"; then
     # Nuke the virtual environment first
-    rm -rf "${py_root}";
+    rm -rf "${py_virtualenv}";
   fi;
 
-  "${bootstrap_python}" -m virtualenv "${py_root}";
+  "${bootstrap_python}" -m virtualenv "${py_virtualenv}";
 
   # Make sure setup got called enough to write the version file.
 
@@ -626,16 +626,14 @@
     pip_install="pip_download_and_install";
   fi;
 
-  local requirements="${wd}/requirements.txt";
-
   ruler "Preparing Python requirements";
   echo "";
-  "${pip_install}" "--requirement=${requirements}";
+  "${pip_install}" --requirement="${wd}/requirements.txt";
 
   for option in $("${python}" -c 'import setup; print "\n".join(setup.extras_requirements.keys())'); do
     ruler "Preparing Python requirements for optional feature: ${option}";
     echo "";
-    if ! "${pip_install}" "--editable=${wd}[${option}]"; then
+    if ! "${pip_install}" --editable="${wd}[${option}]"; then
       echo "Feature ${option} is optional; continuing.";
     fi;
   done;
@@ -644,6 +642,17 @@
 }
 
 
+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"               \
+    "$@";
+}
+
+
 pip_install_from_cache () {
   "${python}" -m pip install                 \
     --find-links="${dev_home}/pip_downloads" \
@@ -655,7 +664,8 @@
 
 pip_download_and_install () {
   "${python}" -m pip install                  \
-    --pre --upgrade                           \
+    --upgrade                                 \
+    --pre --allow-all-external                \
     --download-cache="${dev_home}/pip_cache"  \
     --log="${dev_home}/pip.log"               \
     "$@";

Modified: CalendarServer/trunk/support/Apple.make
===================================================================
--- CalendarServer/trunk/support/Apple.make	2014-04-11 00:04:37 UTC (rev 13255)
+++ CalendarServer/trunk/support/Apple.make	2014-04-11 00:05:17 UTC (rev 13256)
@@ -134,10 +134,10 @@
 #install:: install-ossfiles
 
 install-ossfiles::
-	$(_v) $(INSTALL_DIRECTORY) $(DSTROOT)/$(OSV);
-	$(_v) $(INSTALL_FILE) $(Sources)/$(ProjectName).plist $(DSTROOT)/$(OSV)/$(ProjectName).plist;
-	$(_v) $(INSTALL_DIRECTORY) $(DSTROOT)/$(OSL);
-	$(_v) $(INSTALL_FILE) $(BuildDirectory)/$(Project)/LICENSE $(DSTROOT)/$(OSL)/$(ProjectName).txt;
+	$(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)/$(OSV)";
+	$(_v) $(INSTALL_FILE) "$(Sources)/$(ProjectName).plist" "$(DSTROOT)/$(OSV)/$(ProjectName).plist";
+	$(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)/$(OSL)";
+	$(_v) $(INSTALL_FILE) "$(BuildDirectory)/$(Project)/LICENSE" "$(DSTROOT)/$(OSL)/$(ProjectName).txt";
 
 #
 # B&I Hooey
@@ -145,8 +145,8 @@
 
 cache_deps::
 	@echo "Downloading dependencies...";
-	$(_v) if [ ! -d requirements/cache ]; then ./support/_cache_deps ]; fi;
+	$(_v) if [ ! -d "$(Sources)/requirements/cache" ]; then "$(Sources)/support/_cache_deps" ]; fi;
 
 buildit: cache_deps
 	@echo "Running buildit...";
-	$(_v) sudo ~rc/bin/buildit $(CC_Archs) $(Sources);
+	$(_v) sudo ~rc/bin/buildit $(CC_Archs) "$(Sources)";

Modified: CalendarServer/trunk/support/submit
===================================================================
--- CalendarServer/trunk/support/submit	2014-04-11 00:04:37 UTC (rev 13255)
+++ CalendarServer/trunk/support/submit	2014-04-11 00:05:17 UTC (rev 13256)
@@ -134,7 +134,7 @@
   echo "Copying ${src}...";
   ignores="$(mktemp -t CalendarServer_ignores)";
   svn st --no-ignore | sed -n -e 's|^I...... ||p' > "${ignores}";
-  rsync -av --exclude=".svn" --exclude="_trial_temp" --exclude="*.pyc" --exclude="*.so" --exclude-from="${ignores}" "${src}/" "${wc}";
+  rsync -av --exclude=".svn" --exclude-from="${ignores}" "${src}/" "${wc}";
   rm "${ignores}";
 else
   echo "";
@@ -205,6 +205,7 @@
     fi;
   fi;
 else
+  echo "${wc}"; exit 1;
   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/d05be274/attachment-0001.html>