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

[source_changes at macosforge.org]

Revision: 14583
          http://trac.calendarserver.org//changeset/14583
Author:   wsanchez at apple.com
Date:     2015-03-12 16:08:31 -0700 (Thu, 12 Mar 2015)
Log Message:
-----------
Install Twisted with --ignore-installed so that we don't use the system-provided Twisted.

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

Modified: CalendarServer/trunk/support/Apple.make
===================================================================
--- CalendarServer/trunk/support/Apple.make	2015-03-12 20:00:55 UTC (rev 14582)
+++ CalendarServer/trunk/support/Apple.make	2015-03-12 23:08:31 UTC (rev 14583)
@@ -114,14 +114,26 @@
 	              --pre --allow-all-external --no-index                   \
 	              --find-links="file://$(Sources)/.develop/pip_downloads" \
 	              --log=$(OBJROOT)/pip.log                                \
-	              cffi
-	@echo "Installing Python packages...";
+	              cffi;
+
+	@# Install Twisted with --ignore-installed so that we don't use the
+	@# system-provided Twisted.
+	@echo "Installing Twisted...";
 	$(_v) $(Environment)                                                  \
 	          "$(DSTROOT)$(CS_VIRTUALENV)/bin/pip" install                \
 	              --pre --allow-all-external --no-index                   \
 	              --find-links="file://$(Sources)/.develop/pip_downloads" \
 	              --log=$(OBJROOT)/pip.log                                \
-	              CalendarServer[OpenDirectory,Postgres]
+	              --ignore-installed                                      \
+	              Twisted;
+
+	@echo "Installing CalendarServer and remaining dependancies...";
+	$(_v) $(Environment)                                                  \
+	          "$(DSTROOT)$(CS_VIRTUALENV)/bin/pip" install                \
+	              --pre --allow-all-external --no-index                   \
+	              --find-links="file://$(Sources)/.develop/pip_downloads" \
+	              --log=$(OBJROOT)/pip.log                                \
+	              CalendarServer[OpenDirectory,Postgres];
 	@#
 	@# Make the virtualenv relocatable
 	@#
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150312/59baaeb6/attachment.html>