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

[source_changes at macosforge.org]

Revision: 13455
          http://trac.calendarserver.org//changeset/13455
Author:   wsanchez at apple.com
Date:     2014-05-07 12:06:11 -0700 (Wed, 07 May 2014)
Log Message:
-----------
Pass -L to cp so that symlinks copy the target.
Don't look for .svn turds to clean up; they shouldn't be in the DSTROOT at this point.

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

Modified: CalendarServer/trunk/support/Apple.make
===================================================================
--- CalendarServer/trunk/support/Apple.make	2014-05-07 18:22:18 UTC (rev 13454)
+++ CalendarServer/trunk/support/Apple.make	2014-05-07 19:06:11 UTC (rev 13455)
@@ -117,18 +117,20 @@
 	@#
 	@# Clean up
 	@#
-	@echo "Cleaning up virtual environment...";
+	@echo "Tweaking caldavd to set PYTHON...";
 	$(_v) perl -i -pe "s|#PATH|export PYTHON=$(CS_VIRTUALENV)/bin/python;|" "$(DSTROOT)$(CS_VIRTUALENV)/bin/caldavd";
-	$(_v) find "$(DSTROOT)$(CS_VIRTUALENV)" -type d -name .svn -print0 | xargs -0 rm -rf;
+	@echo "Stripping binaries...";
 	$(_v) find "$(DSTROOT)$(CS_VIRTUALENV)" -type f -name "*.so" -print0 | xargs -0 $(STRIP) -Sx;
+	@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" > {}' ";";
+	@echo "Replacing symbolic links...";
 	$(_v) find "$(DSTROOT)$(CS_VIRTUALENV)" -type l |                       \
 	          while read link; do                                           \
 	              target="$$(readlink "$${link}")";                         \
 	              if [ "$$(echo $${target} | cut -f 1 -d /)" == "" ]; then  \
 	                  rm -fv "$${link}";                                    \
-	                  cp -afv "$${target}" "$${link}" || {                  \
+	                  cp -aLfv "$${target}" "$${link}" || {                 \
 	                      rm -rfv "$${link}";                               \
 	                      ln -sfv "$${target}" "$${link}";                  \
 	                  }                                                     \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140507/0905d5b7/attachment.html>