forked from WebKit/WebKit-http
-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
<http://webkit.org/b/77717> Makefile should provide control over outp…
…ut verbosity Allow the filtering of the output of our Makefile to be configured via a user default and overriden via a command-line argument to make. The Makefile takes the verbosity from BuildTranscriptVerbosity default in the org.webkit.BuildConfiguration domain. The supported values are "default", "quiet" and "noisy". "default" maintains the existing behavior of only filtering out the setenv lines from Xcode's shell script build phases. "quiet" filters all output through filter-build-webkit. "noisy" provides unfiltered output. The verbosity can be overriden for a single invocation of make by specifying the VERBOSITY variable on the make command line. To always get full output: defaults write org.webkit.BuildConfiguration BuildTranscriptVerbosity noisy To always get filtered ouptut: defaults write org.webkit.BuildConfiguration BuildTranscriptVerbosity quiet To get full output for a single build: make VERBOSITY=noisy Reviewed by Dan Bernstein. * Makefile.shared: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@106634 268f45cc-cd09-0410-ab3c-d52691b4dbfc
- Loading branch information
Showing
2 changed files
with
45 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -1,18 +1,31 @@ | |||
SCRIPTS_PATH ?= ../Tools/Scripts | SCRIPTS_PATH ?= ../Tools/Scripts | ||
XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS) | XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS) | ||
|
|
||
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 | |||
|
|||
all: | all: | ||
( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) | ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} ) | ||
|
|
||
debug d development dev develop: force | debug d development dev develop: force | ||
$(SCRIPTS_PATH)/set-webkit-configuration --debug | $(SCRIPTS_PATH)/set-webkit-configuration --debug | ||
( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) | ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} ) | ||
|
|
||
release r deployment dep deploy: force | release r deployment dep deploy: force | ||
$(SCRIPTS_PATH)/set-webkit-configuration --release | $(SCRIPTS_PATH)/set-webkit-configuration --release | ||
( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) | ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} ) | ||
|
|
||
clean: | clean: | ||
( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) | ( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} ) | ||
|
|
||
force: ; | force: ; |