Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

<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...
commit b502f3077d5b9f3ea05b23658f5ce2475006e40e 1 parent c6cc684
Mark Rowe authored
Showing with 45 additions and 4 deletions.
  1. +28 −0 ChangeLog
  2. +17 −4 Makefile.shared
View
28 ChangeLog
@@ -1,3 +1,31 @@
+2012-02-02 Mark Rowe <mrowe@apple.com>
+
+ <http://webkit.org/b/77717> Makefile should provide control over output 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:
+
2012-02-02 Rakesh KN <rakesh.kn@motorola.com>
hidden attribute on <input type=file /> suppresses the file selection dialog
View
21 Makefile.shared
@@ -1,18 +1,31 @@
SCRIPTS_PATH ?= ../Tools/Scripts
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:
- ( 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
$(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
$(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:
- ( 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: ;
Please sign in to comment.
Something went wrong with that request. Please try again.