Import Chromium's dom_perf test

[WebKit-https.git] / Makefile.shared

diff --git a/Makefile.shared b/Makefile.shared
index 04eb75a..56ed978 100644 (file)
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -1,15 +1,18 @@
-XCODE_OPTIONS = `perl -I../WebKitTools/Scripts -Mwebkitdirs -e 'print XcodeOptionString()'`
+SCRIPTS_PATH ?= ../Tools/Scripts
+XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS)
 
 all:
-       xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS)
+       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
 
-debug d development dev develop:
-       ../WebKitTools/Scripts/set-webkit-configuration --debug
-       xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS)
+debug d development dev develop: force
+       $(SCRIPTS_PATH)/set-webkit-configuration --debug
+       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
 
-release r deployment dep deploy:
-       ../WebKitTools/Scripts/set-webkit-configuration --release
-       xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS)
+release r deployment dep deploy: force
+       $(SCRIPTS_PATH)/set-webkit-configuration --release
+       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
 
 clean:
-       xcodebuild -alltargets clean $(XCODE_OPTIONS)
+       ( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
+
+force: ;