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

[source_changes at macosforge.org]

Revision: 14268
          http://trac.calendarserver.org//changeset/14268
Author:   wsanchez at apple.com
Date:     2015-01-08 10:21:51 -0800 (Thu, 08 Jan 2015)
Log Message:
-----------
try using --always-copy

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

Modified: CalendarServer/trunk/support/Apple.make
===================================================================
--- CalendarServer/trunk/support/Apple.make	2015-01-08 03:10:51 UTC (rev 14267)
+++ CalendarServer/trunk/support/Apple.make	2015-01-08 18:21:51 UTC (rev 14268)
@@ -89,7 +89,10 @@
 	@echo "Creating virtual environment...";
 	$(_v) $(RMDIR) "$(DSTROOT)$(CS_VIRTUALENV)";
 	$(_v) PYTHONPATH="$(BuildDirectory)/pytools/lib" \
-	          "$(PYTHON)" -m virtualenv --system-site-packages "$(DSTROOT)$(CS_VIRTUALENV)";
+	          "$(PYTHON)" -m virtualenv              \
+		          --system-site-packages             \
+		          --always-copy                      \
+		          "$(DSTROOT)$(CS_VIRTUALENV)";
 	@#
 	@# Use the pip in the virtual environment to install.
 	@# It knows about where things go in the virtual environment.
@@ -118,18 +121,18 @@
 	@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 -aLfv "$${target}" "$${link}" || {                 \
-	                      rm -rfv "$${link}";                               \
-	                      ln -sfv "$${target}" "$${link}";                  \
-	                  }                                                     \
-	              fi;                                                       \
-	          done;
+	# @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 -aLfv "$${target}" "$${link}" || {                 \
+	#                       rm -rfv "$${link}";                               \
+	#                       ln -sfv "$${target}" "$${link}";                  \
+	#                   }                                                     \
+	#               fi;                                                       \
+	#           done;
 
 install:: install-config
 install-config::
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150108/97ffb2af/attachment.html>