Factor out the Console text completion and command history into

[WebKit-https.git] / Makefile.shared

diff --git a/Makefile.shared b/Makefile.shared
index 03404cb..096d32e 100644 (file)
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -1,20 +1,27 @@
-XCODE_OPTIONS = `perl -I../WebKitTools/Scripts -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS)
+SCRIPTS_PATH ?= ../WebKitTools/Scripts
+XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS)
 
 all:
-       xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv
+       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
 
 debug d development dev develop: force
-       ../WebKitTools/Scripts/set-webkit-configuration --debug
-       xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv
+       $(SCRIPTS_PATH)/set-webkit-configuration --debug
+       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
 
 release r deployment dep deploy: force
-       ../WebKitTools/Scripts/set-webkit-configuration --release
-       xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv
+       $(SCRIPTS_PATH)/set-webkit-configuration --release
+       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
 
 universal u: force
-       xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386' | grep -v setenv
+       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386' | grep -v setenv && exit $${PIPESTATUS[0]} )
+
+64: force
+       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} )
+
+64u: force
+       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc ppc64 i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} )
 
 clean:
-       xcodebuild -alltargets clean $(XCODE_OPTIONS) | grep -v setenv
+       ( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
 
 force: ;