X-Git-Url: http://git.webkit.org/?p=WebKit-https.git;a=blobdiff_plain;f=Makefile.shared;h=dfad6fb54c727e07b21585cb3385ee9ca52dd6a9;hp=718439a0ac3eb2de9c625a65fe7068c18a06e658;hb=3af69e99612875ed4f08638e68f93cae0dcaf737;hpb=8b9f7c81596014cd29848039a3a5eca9257a9952

diff --git a/Makefile.shared b/Makefile.shared
index 718439a..dfad6fb 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -1,16 +1,30 @@
-XCODE_OPTIONS = `perl -I../WebKitTools/Scripts -Mwebkitdirs -e 'print XcodeOptionString()'`
-XCODE_OPTIONS_NO_CONFIG = `perl -I../WebKitTools/Scripts -Mwebkitdirs -e 'print XcodeOptionStringNoConfig()'`
+SCRIPTS_PATH ?= ../WebKitTools/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 --development
-	xcodebuild $(OTHER_OPTIONS) -configuration Development $(XCODE_OPTIONS_NO_CONFIG)
+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 --deployment
-	xcodebuild $(OTHER_OPTIONS) -configuration Deployment $(XCODE_OPTIONS_NO_CONFIG)
+release r deployment dep deploy: force
+	$(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 && exit $${PIPESTATUS[0]} )
+
+x86_64: force
+	( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=x86_64' | 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)
+	( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
+
+force: ;