[CalendarServer-changes] [13346] CalendarServer/trunk/support/Apple.make
source_changes at macosforge.org
source_changes at macosforge.org
Mon Apr 21 11:29:39 PDT 2014
Revision: 13346
http://trac.calendarserver.org//changeset/13346
Author: wsanchez at apple.com
Date: 2014-04-21 11:29:39 -0700 (Mon, 21 Apr 2014)
Log Message:
-----------
Pass environment to build; add /usr/bin to PATH
Modified Paths:
--------------
CalendarServer/trunk/support/Apple.make
Modified: CalendarServer/trunk/support/Apple.make
===================================================================
--- CalendarServer/trunk/support/Apple.make 2014-04-21 17:03:59 UTC (rev 13345)
+++ CalendarServer/trunk/support/Apple.make 2014-04-21 18:29:39 UTC (rev 13346)
@@ -37,7 +37,7 @@
SERVERSETUP = $(SIPP)$(NSSYSTEMDIR)$(NSLIBRARYSUBDIR)/ServerSetup
# Cruft += .develop
-# Extra_Environment += PATH="$(SIPP)/usr/bin:$$PATH"
+Extra_Environment += PATH="$(SIPP)/usr/bin:$$PATH"
# Extra_Environment += PYTHONPATH="$(CS_PY_LIBS)"
CALDAVDSUBDIR = /caldavd
@@ -45,13 +45,6 @@
PYTHON = $(USRBINDIR)/python2.7
CS_VIRTUALENV = $(SIPP)$(NSLOCALDIR)$(NSLIBRARYSUBDIR)/CalendarServer
-# CS_SHAREDIR = $(SHAREDIR)$(CALDAVDSUBDIR)
-# CS_PY_LIBS = $(CS_SHAREDIR)/lib/python
-# CS_LIBEXEC = $(SIPP)$(LIBEXECDIR)$(CALDAVDSUBDIR)
-# PY_INSTALL_FLAGS = --root="$(DSTROOT)" --prefix="$(SIPP)" --install-lib="$(CS_PY_LIBS)" --install-scripts="$(CS_LIBEXEC)"
-# CS_INSTALL_FLAGS = --install-scripts="$(SIPP)$(USRSBINDIR)" --install-data="$(SIPP)$(ETCDIR)"
-# CS_BUILD_EXT_FLAGS = --include-dirs="$(SIPP)/usr/include" --library-dirs="$(SIPP)/usr/lib"
-
CS_USER = _calendar
CS_GROUP = _calendar
@@ -67,8 +60,14 @@
@echo "Building $(Project)...";
$(_v) cd $(BuildDirectory)/$(Project) && $(Environment) $(PYTHON) setup.py build
+cache_deps: $(Sources)/.develop/pip_downloads
+
+$(Sources)/.develop/pip_downloads: install_source
+ @echo "Caching dependencies...";
+ $(_v) $(Environment) $(Sources)/support/_cache_deps;
+
install:: install-python
-install-python:: build
+install-python:: cache_deps build
@#
@# Set up a virtual environment in Server.app; we'll install into that.
@# Use --system-site-packages so that we use the packages provided by the OS.
@@ -81,7 +80,7 @@
@# It knows about where things go in the virtual environment.
@#
@echo "Installing Python packages...";
- $(_v) "$(DSTROOT)$(CS_VIRTUALENV)/bin/pip" install \
+ $(_v) $(Environment) "$(DSTROOT)$(CS_VIRTUALENV)/bin/pip" install \
--pre --allow-all-external --no-index \
--find-links="$(Sources)/.develop/pip_downloads" \
--requirement="$(BuildDirectory)/$(Project)/requirements-apple.txt" \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140421/bd08a415/attachment-0001.html>
More information about the calendarserver-changes
mailing list