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

[source_changes at macosforge.org]

Revision: 14283
          http://trac.calendarserver.org//changeset/14283
Author:   wsanchez at apple.com
Date:     2015-01-12 12:07:47 -0800 (Mon, 12 Jan 2015)
Log Message:
-----------
.SHELLFLAGS = -euc

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

Modified: CalendarServer/trunk/support/Apple.make
===================================================================
--- CalendarServer/trunk/support/Apple.make	2015-01-09 15:49:15 UTC (rev 14282)
+++ CalendarServer/trunk/support/Apple.make	2015-01-12 20:07:47 UTC (rev 14283)
@@ -52,6 +52,8 @@
 # Build
 #
 
+.SHELLFLAGS = -euc
+
 .phony: build install install_source install-ossfiles cache_deps buildit
 
 build:: $(BuildDirectory)/$(Project)
@@ -103,7 +105,7 @@
 	              "$(DSTROOT)$(CS_VIRTUALENV)/bin/pip" install                \
 	                  --pre --allow-all-external --no-index --no-deps         \
 	                  --log=$(OBJROOT)/pip.log                                \
-	                  "$${pkg}";                                              \
+	                  "$${pkg}" || exit 1;                                    \
 	      done;
 	@#
 	@# Make the virtualenv relocatable
@@ -121,18 +123,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/20150112/676b34a9/attachment.html>