Make post checkin suggested changes to r174847

[WebKit-https.git] / Makefile.shared

diff --git a/Makefile.shared b/Makefile.shared
index 04eb75a..cf6fe35 100644 (file)
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -1,15 +1,52 @@
-XCODE_OPTIONS = `perl -I../WebKitTools/Scripts -Mwebkitdirs -e 'print XcodeOptionString()'`
+SCRIPTS_PATH ?= ../Tools/Scripts
+
+SET_COLOR_DIAGNOSTICS_ARG = if [[ -t 1 ]]; then COLOR_DIAGNOSTICS_ARG="COLOR_DIAGNOSTICS=YES"; fi
+XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()' -- $(BUILD_WEBKIT_OPTIONS)` $${COLOR_DIAGNOSTICS_ARG} $(ARGS)
+
+ifneq (,$(SDKROOT))
+       XCODE_OPTIONS += SDKROOT=$(SDKROOT)
+endif
+
+ifneq (,$(ARCHS))
+       XCODE_OPTIONS += ARCHS="$(ARCHS)"
+       XCODE_OPTIONS += ONLY_ACTIVE_ARCH=NO
+endif
+
+DEFAULT_VERBOSITY := $(shell defaults read org.webkit.BuildConfiguration BuildTranscriptVerbosity 2>/dev/null || echo "default")
+VERBOSITY ?= $(DEFAULT_VERBOSITY)
+
+ifeq ($(VERBOSITY),default)
+OUTPUT_FILTER = grep -v setenv
+else
+ifeq ($(VERBOSITY),noisy)
+OUTPUT_FILTER = cat
+else
+OUTPUT_FILTER = $(SCRIPTS_PATH)/filter-build-webkit
+endif
+endif
+
+export DSYMUTIL_NUM_THREADS = $(shell sysctl -n hw.activecpu)
 
 all:
-       xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS)
+       ( $(SET_COLOR_DIAGNOSTICS_ARG); xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && 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
+       ( $(SET_COLOR_DIAGNOSTICS_ARG); xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && 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
+       ( $(SET_COLOR_DIAGNOSTICS_ARG); xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} )
+
+analyze:
+       $(SCRIPTS_PATH)/set-webkit-configuration --release
+ifndef PATH_TO_SCAN_BUILD
+       ( $(SET_COLOR_DIAGNOSTICS_ARG); xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) RUN_CLANG_STATIC_ANALYZER=YES | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} )
+else
+       ( $(SET_COLOR_DIAGNOSTICS_ARG); $(PATH_TO_SCAN_BUILD) xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} )
+endif
 
 clean:
-       xcodebuild -alltargets clean $(XCODE_OPTIONS)
+       ( $(SET_COLOR_DIAGNOSTICS_ARG); xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} )
+
+force: ;