Log Message
Unreviewed, rolling out r123387. http://trac.webkit.org/changeset/123387 https://bugs.webkit.org/show_bug.cgi?id=92036
Broke chromium win build (Requested by tony^work on #webkit). Patch by Sheriff Bot <[email protected]> on 2012-07-23 * WebCore.gyp/WebCore.gyp: * WebCore.gyp/scripts/rule_bison.py: * bindings/scripts/preprocessor.pm: (applyPreprocessor): * make-hash-tools.pl:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (123391 => 123392)
--- trunk/Source/WebCore/ChangeLog 2012-07-23 22:34:11 UTC (rev 123391)
+++ trunk/Source/WebCore/ChangeLog 2012-07-23 22:36:43 UTC (rev 123392)
@@ -1,3 +1,17 @@
+2012-07-23 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r123387.
+ http://trac.webkit.org/changeset/123387
+ https://bugs.webkit.org/show_bug.cgi?id=92036
+
+ Broke chromium win build (Requested by tony^work on #webkit).
+
+ * WebCore.gyp/WebCore.gyp:
+ * WebCore.gyp/scripts/rule_bison.py:
+ * bindings/scripts/preprocessor.pm:
+ (applyPreprocessor):
+ * make-hash-tools.pl:
+
2012-07-23 Kwang Yul Seo <[email protected]>
Ref-count AtomicHTMLToken
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (123391 => 123392)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-07-23 22:34:11 UTC (rev 123391)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-07-23 22:36:43 UTC (rev 123392)
@@ -224,23 +224,10 @@
'../platform/text/win',
'../platform/win',
],
- # Using native perl rather than cygwin perl cuts execution time of idl
- # preprocessing rules by a bit more than 50%.
- 'perl_exe': '<(DEPTH)/third_party/perl/perl/bin/perl.exe',
- 'gperf_exe': '<(DEPTH)/third_party/gperf/bin/gperf.exe',
- 'bison_exe': '<(DEPTH)/third_party/bison/bin/bison.exe',
- # Using cl instead of cygwin gcc cuts the processing time from
- # 1m58s to 0m52s.
- 'preprocessor': '--preprocessor "cl.exe -nologo -EP -TP"',
},{
# enable -Wall and -Werror, just for Mac and Linux builds for now
# FIXME: Also enable this for Windows after verifying no warnings
'chromium_code': 1,
- 'perl_exe': 'perl',
- 'gperf_exe': 'gperf',
- 'bison_exe': 'bison',
- # Without one specified, the scripts default to 'gcc'.
- 'preprocessor': '',
}],
['use_x11==1 or OS=="android"', {
'webcore_include_dirs': [
@@ -446,9 +433,8 @@
'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/webkit/InjectedScriptSource.h',
],
- 'msvs_cygwin_shell': 0,
'action': [
- '<(perl_exe)',
+ 'perl',
'../inspector/xxd.pl',
'InjectedScriptSource_js',
'<@(_inputs)',
@@ -470,9 +456,8 @@
'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/webkit/InjectedScriptWebGLModuleSource.h',
],
- 'msvs_cygwin_shell': 0,
'action': [
- '<(perl_exe)',
+ 'perl',
'../inspector/xxd.pl',
'InjectedScriptWebGLModuleSource_js',
'<@(_inputs)',
@@ -494,9 +479,8 @@
'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/webkit/DebuggerScriptSource.h',
],
- 'msvs_cygwin_shell': 0,
'action': [
- '<(perl_exe)',
+ 'perl',
'../inspector/xxd.pl',
'DebuggerScriptSource_js',
'<@(_inputs)',
@@ -527,9 +511,19 @@
'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/supplemental_dependency.tmp',
],
- 'msvs_cygwin_shell': 0,
+ 'conditions': [
+ ['OS=="win"', {
+ 'variables': {
+ # Using cl instead of cygwin gcc cuts the processing time from
+ # 1m58s to 0m52s.
+ 'preprocessor': '--preprocessor "cl.exe /nologo /EP /TP"',
+ },
+ }, {
+ 'variables': { 'preprocessor': '', }
+ }],
+ ],
'action': [
- '<(perl_exe)',
+ 'perl',
'-w',
'-I../bindings/scripts',
'../bindings/scripts/preprocess-idls.pl',
@@ -581,9 +575,8 @@
'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/webkit/V8ArrayBufferViewCustomScript.h',
],
- 'msvs_cygwin_shell': 0,
'action': [
- '<(perl_exe)',
+ 'perl',
'../inspector/xxd.pl',
'V8ArrayBufferViewCustomScript_js',
'<@(_inputs)',
@@ -599,9 +592,8 @@
'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/webkit/XMLViewerCSS.h',
],
- 'msvs_cygwin_shell': 0,
'action': [
- '<(perl_exe)',
+ 'perl',
'../inspector/xxd.pl',
'XMLViewer_css',
'<@(_inputs)',
@@ -616,9 +608,8 @@
'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/webkit/XMLViewerJS.h',
],
- 'msvs_cygwin_shell': 0,
'action': [
- '<(perl_exe)',
+ 'perl',
'../inspector/xxd.pl',
'XMLViewer_js',
'<@(_inputs)',
@@ -1026,8 +1017,7 @@
'python',
'scripts/rule_bison.py',
'<(RULE_INPUT_PATH)',
- '<(SHARED_INTERMEDIATE_DIR)/webkit',
- '<(bison_exe)',
+ '<(SHARED_INTERMEDIATE_DIR)/webkit'
],
},
{
@@ -1042,13 +1032,11 @@
'inputs': [
'../make-hash-tools.pl',
],
- 'msvs_cygwin_shell': 0,
'action': [
- '<(perl_exe)',
+ 'perl',
'../make-hash-tools.pl',
'<(SHARED_INTERMEDIATE_DIR)/webkit',
'<(RULE_INPUT_PATH)',
- '<(gperf_exe)',
],
},
# Rule to build generated _javascript_ (V8) bindings from .idl source.
@@ -1096,14 +1084,13 @@
'--include', '../xml',
],
},
- 'msvs_cygwin_shell': 0,
# FIXME: Note that we put the .cpp files in webcore/bindings
# but the .h files in webkit/bindings. This is to work around
# the unfortunate fact that GYP strips duplicate arguments
# from lists. When we have a better GYP way to suppress that
# behavior, change the output location.
'action': [
- '<(perl_exe)',
+ 'perl',
'-w',
'-I../bindings/scripts',
'../bindings/scripts/generate-bindings.pl',
@@ -1121,7 +1108,6 @@
'--additionalIdlFilesList',
'<(additional_idl_files_list)',
'<(RULE_INPUT_PATH)',
- '<@(preprocessor)',
],
'message': 'Generating binding from <(RULE_INPUT_PATH)',
},
Modified: trunk/Source/WebCore/WebCore.gyp/scripts/rule_bison.py (123391 => 123392)
--- trunk/Source/WebCore/WebCore.gyp/scripts/rule_bison.py 2012-07-23 22:34:11 UTC (rev 123391)
+++ trunk/Source/WebCore/WebCore.gyp/scripts/rule_bison.py 2012-07-23 22:36:43 UTC (rev 123392)
@@ -32,7 +32,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-# usage: rule_bison.py INPUT_FILE OUTPUT_DIR [BISON_EXE]
+# usage: rule_bison.py INPUT_FILE OUTPUT_DIR
# INPUT_FILE is a path to either CSSGrammar.y or XPathGrammar.y.
# OUTPUT_DIR is where the bison-generated .cpp and .h files should be placed.
@@ -42,13 +42,10 @@
import subprocess
import sys
-assert len(sys.argv) == 3 or len(sys.argv) == 4
+assert len(sys.argv) == 3
inputFile = sys.argv[1]
outputDir = sys.argv[2]
-bisonExe = 'bison'
-if len(sys.argv) > 3:
- bisonExe = sys.argv[3]
inputName = os.path.basename(inputFile)
assert inputName == 'CSSGrammar.y' or inputName == 'XPathGrammar.y'
@@ -72,7 +69,7 @@
outputCpp = os.path.join(outputDir, inputRoot + '.cpp')
-returnCode = subprocess.call([bisonExe, '-d', '-p', prefix, inputFile, '-o', outputCpp])
+returnCode = subprocess.call(['bison', '-d', '-p', prefix, inputFile, '-o', outputCpp])
assert returnCode == 0
# Find the name that bison used for the generated header file.
Modified: trunk/Source/WebCore/bindings/scripts/preprocessor.pm (123391 => 123392)
--- trunk/Source/WebCore/bindings/scripts/preprocessor.pm 2012-07-23 22:34:11 UTC (rev 123391)
+++ trunk/Source/WebCore/bindings/scripts/preprocessor.pm 2012-07-23 22:36:43 UTC (rev 123392)
@@ -63,7 +63,7 @@
@macros = map { "-D$_" } @macros;
my $pid = 0;
- if ($Config{osname} eq "cygwin" || $Config{osname} eq 'MSWin32') {
+ if ($Config{osname} eq "cygwin") {
# This call can fail if Windows rebases cygwin, so retry a few times until it succeeds.
for (my $tries = 0; !$pid && ($tries < 20); $tries++) {
eval {
Modified: trunk/Source/WebCore/make-hash-tools.pl (123391 => 123392)
--- trunk/Source/WebCore/make-hash-tools.pl 2012-07-23 22:34:11 UTC (rev 123391)
+++ trunk/Source/WebCore/make-hash-tools.pl 2012-07-23 22:36:43 UTC (rev 123392)
@@ -29,10 +29,10 @@
if ($option eq "ColorData") {
my $colorDataGenerated = "$outdir/ColorData.cpp";
- my $colorDataGperf = shift;
- my $customGperf = shift;
+ my $colorDataGperf = $ARGV[0];
+ shift;
- my $gperf = $ENV{GPERF} ? $ENV{GPERF} : ($customGperf ? $customGperf : "gperf");
+ my $gperf = $ENV{GPERF} ? $ENV{GPERF} : "gperf";
system("\"$gperf\" --key-positions=\"*\" -D -s 2 $colorDataGperf --output-file=$colorDataGenerated") == 0 || die "calling gperf failed: $?";
} else {
_______________________________________________ webkit-changes mailing list [email protected] http://lists.webkit.org/mailman/listinfo/webkit-changes
