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

[source_changes at macosforge.org]

Revision: 14469
          http://trac.calendarserver.org//changeset/14469
Author:   wsanchez at apple.com
Date:     2015-02-23 17:10:35 -0800 (Mon, 23 Feb 2015)
Log Message:
-----------
install_name_tool monkey business because virtualenv:
 1- uses relative paths, which we don't want
 2- doesn't update the install of the Python dylib

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

Modified: CalendarServer/trunk/support/Apple.make
===================================================================
--- CalendarServer/trunk/support/Apple.make	2015-02-23 21:25:17 UTC (rev 14468)
+++ CalendarServer/trunk/support/Apple.make	2015-02-24 01:10:35 UTC (rev 14469)
@@ -135,6 +135,10 @@
 	$(_v) perl -i -pe "s|#PATH|export PYTHON=$(CS_VIRTUALENV)/bin/python;|" "$(DSTROOT)$(CS_VIRTUALENV)/bin/caldavd";
 	@echo "Stripping binaries...";
 	$(_v) find "$(DSTROOT)$(CS_VIRTUALENV)" -type f -name "*.so" -print0 | xargs -0 $(STRIP) -Sx;
+	@echo "Updating install location of Python library...";
+	$(_v) find "$(DSTROOT)$(CS_VIRTUALENV)/bin" -type f -name "python*" -print0 | \
+	          xargs -0 -n 1 install_name_tool -change "@executable_path/../.Python" "$(CS_VIRTUALENV)/.Python";
+	$(_v) install_name_tool -id "$(CS_VIRTUALENV)/.Python" "$(DSTROOT)$(CS_VIRTUALENV)/.Python";
 	@echo "Putting comments into empty files...";
 	$(_v) find "$(DSTROOT)$(CS_VIRTUALENV)" -type f -size 0 -name "*.py" -exec sh -c 'printf "# empty\n" > {}' ";";
 	$(_v) find "$(DSTROOT)$(CS_VIRTUALENV)" -type f -size 0 -name "*.h" -exec sh -c 'printf "/* empty */\n" > {}' ";";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150223/a9690690/attachment.html>