[CalendarServer-changes] [14309] CalendarServer/trunk/support/Apple.make

[source_changes at macosforge.org]

Revision: 14309
          http://trac.calendarserver.org//changeset/14309
Author:   wsanchez at apple.com
Date:     2015-01-15 10:33:32 -0800 (Thu, 15 Jan 2015)
Log Message:
-----------
Use --find-links to install deps instead of iterating over them, because the order matters.  Note cryptography has a setup_requires and setuptools ignores pip options to avoid PyPI.

Remove install-logdir-omg-hack-ew target.

Modified Paths:
--------------
    CalendarServer/trunk/support/Apple.make

Modified: CalendarServer/trunk/support/Apple.make
===================================================================
--- CalendarServer/trunk/support/Apple.make	2015-01-15 18:32:21 UTC (rev 14308)
+++ CalendarServer/trunk/support/Apple.make	2015-01-15 18:33:32 UTC (rev 14309)
@@ -100,10 +100,18 @@
 	@# It knows about where things go in the virtual environment.
 	@#
 	@echo "Installing Python packages...";
+	@# $(_v) for pkg in $$(find "$(Sources)/.develop/pip_downloads" -type f); do \
+	@#           $(Environment)                                                  \
+	@#               "$(DSTROOT)$(CS_VIRTUALENV)/bin/pip" install                \
+	@#                   --pre --allow-all-external --no-index --no-deps         \
+	@#                   --log=$(OBJROOT)/pip.log                                \
+	@#                   "$${pkg}" || exit 1;                                    \
+	@#       done;
 	$(_v) for pkg in $$(find "$(Sources)/.develop/pip_downloads" -type f); do \
 	          $(Environment)                                                  \
 	              "$(DSTROOT)$(CS_VIRTUALENV)/bin/pip" install                \
-	                  --pre --allow-all-external --no-index --no-deps         \
+	                  --pre --allow-all-external --no-index                   \
+	                  --find-links="file://$(Sources)/.develop/pip_downloads" \
 	                  --log=$(OBJROOT)/pip.log                                \
 	                  "$${pkg}" || exit 1;                                    \
 	      done;
@@ -141,9 +149,9 @@
 	$(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(SIPP)$(ETCDIR)$(CALDAVDSUBDIR)";
 	$(_v) $(INSTALL_FILE) "$(Sources)/conf/caldavd-apple.plist" "$(DSTROOT)$(SIPP)$(ETCDIR)$(CALDAVDSUBDIR)/caldavd-apple.plist";
 
-install:: install-logdir-omg-hack-ew
-install-logdir-omg-hack-ew::
-	$(_v) $(INSTALL_DIRECTORY) -o "$(CS_USER)" -g "$(CS_GROUP)" -m 0755 "$(DSTROOT)$(VARDIR)/log$(CALDAVDSUBDIR)";
+# install:: install-logdir-omg-hack-ew
+# install-logdir-omg-hack-ew::
+# 	$(_v) $(INSTALL_DIRECTORY) -o "$(CS_USER)" -g "$(CS_GROUP)" -m 0755 "$(DSTROOT)$(VARDIR)/log$(CALDAVDSUBDIR)";
 
 install:: install-commands
 install-commands::
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150115/9e88bd79/attachment.html>