[CalendarServer-changes] [13498] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Mon May 19 13:36:39 PDT 2014
Revision: 13498
http://trac.calendarserver.org//changeset/13498
Author: wsanchez at apple.com
Date: 2014-05-19 13:36:39 -0700 (Mon, 19 May 2014)
Log Message:
-----------
write pip.log to OBJROOT
Modified Paths:
--------------
CalendarServer/trunk/requirements-stable.txt
CalendarServer/trunk/support/Apple.make
CalendarServer/trunk/support/_cache_deps
Modified: CalendarServer/trunk/requirements-stable.txt
===================================================================
--- CalendarServer/trunk/requirements-stable.txt 2014-05-19 16:58:42 UTC (rev 13497)
+++ CalendarServer/trunk/requirements-stable.txt 2014-05-19 20:36:39 UTC (rev 13498)
@@ -1,3 +1,7 @@
+# This file should contain everything in the output of:
+# ./bin/python -m pip freeze --local
+# with the exception of any modules obtained via requirements-dev.plist
+
# For CalendarServer development, don't try to get these projects from PyPI; use svn.
-e .
Modified: CalendarServer/trunk/support/Apple.make
===================================================================
--- CalendarServer/trunk/support/Apple.make 2014-05-19 16:58:42 UTC (rev 13497)
+++ CalendarServer/trunk/support/Apple.make 2014-05-19 20:36:39 UTC (rev 13498)
@@ -105,7 +105,7 @@
$(Environment) \
"$(DSTROOT)$(CS_VIRTUALENV)/bin/pip" install \
--pre --allow-all-external --no-index --no-deps \
- --log=/tmp/pip.log \
+ --log=$(OBJROOT)/pip.log \
"$${pkg}"; \
done;
@#
Modified: CalendarServer/trunk/support/_cache_deps
===================================================================
--- CalendarServer/trunk/support/_cache_deps 2014-05-19 16:58:42 UTC (rev 13497)
+++ CalendarServer/trunk/support/_cache_deps 2014-05-19 20:36:39 UTC (rev 13498)
@@ -38,10 +38,10 @@
mkdir -p "${wd}/.develop/tools";
-for pkg in \
- pip-1.5.4 \
- virtualenv-1.11.4 \
- setuptools-3.4.4 \
+for pkg in \
+ pip-1.5.4 \
+ virtualenv-1.11.4 \
+ setuptools-3.4.4 \
; do
name="${pkg%-*}";
version="${pkg#*-}";
@@ -60,9 +60,9 @@
ruler "Downloading Python requirements for .[${extra_features}]";
echo "";
-pip_download \
- --allow-unverified cx-Oracle \
- --requirement="${requirements}" \
+pip_download \
+ --allow-unverified cx-Oracle \
+ --requirement="${requirements}" \
;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140519/407af1d2/attachment.html>
More information about the calendarserver-changes
mailing list