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

[source_changes at macosforge.org]

Revision: 15189
          http://trac.calendarserver.org//changeset/15189
Author:   sagen at apple.com
Date:     2015-10-14 10:41:35 -0700 (Wed, 14 Oct 2015)
Log Message:
-----------
Work around distutils' insistence that target OS version matches python's

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

Modified: CalendarServer/trunk/support/Apple.make
===================================================================
--- CalendarServer/trunk/support/Apple.make	2015-10-13 20:30:28 UTC (rev 15188)
+++ CalendarServer/trunk/support/Apple.make	2015-10-14 17:41:35 UTC (rev 15189)
@@ -101,7 +101,15 @@
 	          "$(PYTHON)" -m virtualenv              \
 		          --system-site-packages             \
 		          "$(DSTROOT)$(CS_VIRTUALENV)";
+
 	@#
+	@# Because B&I builds for 10.10 on a 10.11 machine sometimes, work around
+	@# distutils' insistence that deployment target matches the system's version.
+	@#
+	@echo "Patch so distutils will build for 10.10...";
+	sed "s/'MACOSX_DEPLOYMENT_TARGET': '10.11'/'MACOSX_DEPLOYMENT_TARGET': '10.10'/g" /System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/_sysconfigdata.py > "$(DSTROOT)$(CS_VIRTUALENV)/lib/python2.7/_sysconfigdata.py";
+
+	@#
 	@# Use the pip in the virtual environment (as opposed to pip in the OS) to
 	@# install, as it knows about where things go in the virtual environment.
 	@# Use --no-index and --find-links so that we don't use PyPI; we want to

Modified: CalendarServer/trunk/support/submit
===================================================================
--- CalendarServer/trunk/support/submit	2015-10-13 20:30:28 UTC (rev 15188)
+++ CalendarServer/trunk/support/submit	2015-10-14 17:41:35 UTC (rev 15189)
@@ -195,7 +195,7 @@
 
   release_flags="";
   for release in "${releases}"; do
-    release_flags="${release_flags} -release ${release}";
+    release_flags="${release_flags} -update Prevailing${release}";
   done;
   
   if "${build_no_verify_source}"; then
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20151014/bf5fc8a5/attachment.html>