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

source_changes at macosforge.org source_changes at macosforge.org
Mon Apr 21 11:39:03 PDT 2014


Revision: 13348
          http://trac.calendarserver.org//changeset/13348
Author:   wsanchez at apple.com
Date:     2014-04-21 11:39:03 -0700 (Mon, 21 Apr 2014)
Log Message:
-----------
try to get path right

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-21 18:30:00 UTC (rev 13347)
+++ CalendarServer/trunk/support/Apple.make	2014-04-21 18:39:03 UTC (rev 13348)
@@ -60,14 +60,14 @@
 	@echo "Building $(Project)...";
 	$(_v) cd $(BuildDirectory)/$(Project) && $(Environment) $(PYTHON) setup.py build
 
-cache_deps: $(Sources)/.develop/pip_downloads
+# cache_deps: $(Sources)/.develop/pip_downloads
 
-$(Sources)/.develop/pip_downloads: install_source
-	@echo "Caching dependencies...";
-	$(_v) $(Environment) $(Sources)/support/_cache_deps;
+# $(Sources)/.develop/pip_downloads: install_source
+# 	@echo "Caching dependencies...";
+# 	$(_v) $(Environment) $(Sources)/support/_cache_deps;
 
 install:: install-python
-install-python:: cache_deps build
+install-python:: 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.
@@ -164,11 +164,3 @@
 	$(_v) $(INSTALL_FILE) "$(Sources)/$(ProjectName).plist" "$(DSTROOT)/$(OSV)/$(ProjectName).plist";
 	$(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)/$(OSL)";
 	$(_v) $(INSTALL_FILE) "$(BuildDirectory)/$(Project)/LICENSE" "$(DSTROOT)/$(OSL)/$(ProjectName).txt";
-
-#
-# B&I Hooey
-#
-
-buildit: cache_deps
-	@echo "Running buildit...";
-	$(_v) sudo ~rc/bin/buildit $(CC_Archs) "$(Sources)";

Modified: CalendarServer/trunk/support/_cache_deps
===================================================================
--- CalendarServer/trunk/support/_cache_deps	2014-04-21 18:30:00 UTC (rev 13347)
+++ CalendarServer/trunk/support/_cache_deps	2014-04-21 18:39:03 UTC (rev 13348)
@@ -24,23 +24,10 @@
 
 . "${wd}/bin/_build.sh";
 
-#
-# It's entirely ridiculous that we have to *build* our C dependencies in order
-# to simply download our Python dependencies, but in order to calculate
-# dependencies, setuptools needs to basically run "setup.py egg_info", and
-# some packages require the C dependencies in order to do this, and several
-# even build stuff in this case.
-#
-# So the caclulation work here is enormous when it should be rather simple.
-#
-# Then, of course, we throw most of that work away, because we don't want build
-# products here, just the source files.
-#
-# Oy.
-#
-
 init_build;
 
+export PATH="/Applications/Server.app/Contents/ServerRoot/usr/bin:${PATH}";
+
 requirements="${wd}/requirements-apple.txt";
 extra_features="OpenDirectory,Postgres";
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140421/53cf2c48/attachment.html>


More information about the calendarserver-changes mailing list