[CalendarServer-changes] [13260] CalendarServer/trunk/support

[source_changes at macosforge.org]

Revision: 13260
          http://trac.calendarserver.org//changeset/13260
Author:   wsanchez at apple.com
Date:     2014-04-10 18:09:44 -0700 (Thu, 10 Apr 2014)
Log Message:
-----------
install target needs dep falgs for pip install

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

Modified: CalendarServer/trunk/support/Apple.make
===================================================================
--- CalendarServer/trunk/support/Apple.make	2014-04-11 00:38:45 UTC (rev 13259)
+++ CalendarServer/trunk/support/Apple.make	2014-04-11 01:09:44 UTC (rev 13260)
@@ -36,13 +36,13 @@
 endif
 SERVERSETUP = $(SIPP)$(NSSYSTEMDIR)$(NSLIBRARYSUBDIR)/ServerSetup
 
-Cruft += .develop
+# Cruft += .develop
 # Extra_Environment += PATH="$(SIPP)/usr/bin:$$PATH"
 # Extra_Environment += PYTHONPATH="$(CS_PY_LIBS)"
 
 CALDAVDSUBDIR = /caldavd
 
-PYTHON = $(USRBINDIR)/python
+PYTHON = $(USRBINDIR)/python2.7
 CS_SHAREDIR = $(SHAREDIR)$(CALDAVDSUBDIR)
 CS_PY_LIBS = $(CS_SHAREDIR)/lib/python
 CS_LIBEXEC = $(SIPP)$(LIBEXECDIR)$(CALDAVDSUBDIR)
@@ -70,11 +70,14 @@
 	# 	install $(PY_INSTALL_FLAGS) $(CS_INSTALL_FLAGS) \
 	# 	;
 	@echo "Installing Python packages...";
-	$(_v) pip install -e $(BuildDirectory)/$(Project)       \
-		--install-option --root="$(DSTROOT)"                \
-		--install-option --prefix="$(SIPP)"                 \
-		--install-option --install-lib="$(CS_PY_LIBS)"      \
-		--install-option --install-scripts="$(CS_LIBEXEC)"  \
+	$(_v) $(PYTHON) -m pip install                                          \
+   	    --pre --allow-all-external --no-index                               \
+        --find-links "$(Sources)/.develop/pip_downloads"                    \
+	    --editable "$(BuildDirectory)/$(Project)[OpenDirectory,Postgres]"   \
+		--install-option --root="$(DSTROOT)"                                \
+		--install-option --prefix="$(SIPP)"                                 \
+		--install-option --install-lib="$(CS_PY_LIBS)"                      \
+		--install-option --install-scripts="$(CS_LIBEXEC)"                  \
 		;
 	@echo "Cleaning up...";
 	$(_v) for so in $$(find "$(DSTROOT)$(CS_SHAREDIR)/lib" -type f -name '*.so'); do $(STRIP) -Sx "$${so}"; done;

Modified: CalendarServer/trunk/support/_cache_deps
===================================================================
--- CalendarServer/trunk/support/_cache_deps	2014-04-11 00:38:45 UTC (rev 13259)
+++ CalendarServer/trunk/support/_cache_deps	2014-04-11 01:09:44 UTC (rev 13260)
@@ -43,7 +43,8 @@
 c_dependencies;
 
 requirements="${wd}/requirements.txt";
-extra_features="$("${python}" -c 'import setup; print ",".join(sorted(setup.extras_requirements.keys()))' | sed 's|Oracle,||')";
+#extra_features="$("${python}" -c 'import setup; print ",".join(sorted(setup.extras_requirements.keys()))' | sed 's|Oracle,||')";
+extra_features="OpenDirectory,Postgres";
 cs_repos="svn+http://svn.calendarserver.org/repository/calendarserver";
 
 ruler "Downloading Python requirements for .[${extra_features}]";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140410/e567851b/attachment.html>