<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[195582] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/195582">195582</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-25 22:12:50 -0800 (Mon, 25 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix internal Windows build
https://bugs.webkit.org/show_bug.cgi?id=153469
Patch by Alex Christensen <achristensen@webkit.org> on 2016-01-25
Reviewed by Brent Fulgham.
.:
* Source/cmake/WebKitMacros.cmake:
Pass the GPERF_EXECUTABLE that we found to make-hash-tools.pl.
Source/WebCore:
* CMakeLists.txt:
Pass the GPERF_EXECUTABLE that we found to perl scripts so they can use it instead of just calling gperf.
This is needed for builds where gperf is not in the PATH.
* DerivedSources.make:
Pass "gperf" as the gperf command to retain existing functionality on mac.
* bindings/scripts/preprocess-idls.pl:
(CygwinPathIfNeeded):
* bindings/scripts/preprocessor.pm:
(applyPreprocessor):
Add /cygdrive/c/cygwin/bin to the PATH before calling cygpath.
This is needed for builds where we are using cygwin, but C:/cygwin/bin is not in the PATH.
* css/makeSelectorPseudoClassAndCompatibilityElementMap.py:
* css/makeSelectorPseudoElementsMap.py:
* css/makeprop.pl:
* platform/network/create-http-header-name-table:
Use the gperf executable passed in as a command line parameter if it is given.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptspreprocessidlspl">trunk/Source/WebCore/bindings/scripts/preprocess-idls.pl</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptspreprocessorpm">trunk/Source/WebCore/bindings/scripts/preprocessor.pm</a></li>
<li><a href="#trunkSourceWebCorecssmakeSelectorPseudoClassAndCompatibilityElementMappy">trunk/Source/WebCore/css/makeSelectorPseudoClassAndCompatibilityElementMap.py</a></li>
<li><a href="#trunkSourceWebCorecssmakeSelectorPseudoElementsMappy">trunk/Source/WebCore/css/makeSelectorPseudoElementsMap.py</a></li>
<li><a href="#trunkSourceWebCorecssmakeproppl">trunk/Source/WebCore/css/makeprop.pl</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcreatehttpheadernametable">trunk/Source/WebCore/platform/network/create-http-header-name-table</a></li>
<li><a href="#trunkSourcecmakeWebKitMacroscmake">trunk/Source/cmake/WebKitMacros.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (195581 => 195582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2016-01-26 05:43:11 UTC (rev 195581)
+++ trunk/ChangeLog 2016-01-26 06:12:50 UTC (rev 195582)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-01-25 Alex Christensen <achristensen@webkit.org>
+
+ Fix internal Windows build
+ https://bugs.webkit.org/show_bug.cgi?id=153469
+
+ Reviewed by Brent Fulgham.
+
+ * Source/cmake/WebKitMacros.cmake:
+ Pass the GPERF_EXECUTABLE that we found to make-hash-tools.pl.
+
</ins><span class="cx"> 2016-01-23 Aaron Chu <arona.chu@gmail.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: AXI: node-link-list should be collapsible
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (195581 => 195582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-01-26 05:43:11 UTC (rev 195581)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-01-26 06:12:50 UTC (rev 195582)
</span><span class="lines">@@ -3487,7 +3487,7 @@
</span><span class="cx"> MAIN_DEPENDENCY ${WEBCORE_DIR}/platform/network/HTTPHeaderNames.in
</span><span class="cx"> DEPENDS ${WEBCORE_DIR}/platform/network/create-http-header-name-table
</span><span class="cx"> WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}
</span><del>- COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/platform/network/create-http-header-name-table ${WEBCORE_DIR}/platform/network/HTTPHeaderNames.in
</del><ins>+ COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/platform/network/create-http-header-name-table ${WEBCORE_DIR}/platform/network/HTTPHeaderNames.in "${GPERF_EXECUTABLE}"
</ins><span class="cx"> VERBATIM)
</span><span class="cx"> list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/HTTPHeaderNames.cpp)
</span><span class="cx">
</span><span class="lines">@@ -3498,7 +3498,7 @@
</span><span class="cx"> DEPENDS ${WebCore_CSS_PROPERTY_NAMES}
</span><span class="cx"> WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}
</span><span class="cx"> COMMAND ${PERL_EXECUTABLE} -ne "print" ${WebCore_CSS_PROPERTY_NAMES} > ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.in
</span><del>- COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/css/makeprop.pl --defines "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}"
</del><ins>+ COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/css/makeprop.pl --defines "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --gperf-executable "${GPERF_EXECUTABLE}"
</ins><span class="cx"> VERBATIM)
</span><span class="cx"> list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.cpp)
</span><span class="cx"> list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/StyleBuilder.cpp)
</span><span class="lines">@@ -3526,14 +3526,14 @@
</span><span class="cx"> OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/SelectorPseudoClassAndCompatibilityElementMap.gperf ${DERIVED_SOURCES_WEBCORE_DIR}/SelectorPseudoClassAndCompatibilityElementMap.cpp
</span><span class="cx"> MAIN_DEPENDENCY ${WEBCORE_DIR}/css/makeSelectorPseudoClassAndCompatibilityElementMap.py
</span><span class="cx"> WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}
</span><del>- COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/css/makeSelectorPseudoClassAndCompatibilityElementMap.py ${WEBCORE_DIR}/css/SelectorPseudoClassAndCompatibilityElementMap.in "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}"
</del><ins>+ COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/css/makeSelectorPseudoClassAndCompatibilityElementMap.py ${WEBCORE_DIR}/css/SelectorPseudoClassAndCompatibilityElementMap.in "${GPERF_EXECUTABLE}" "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}"
</ins><span class="cx"> VERBATIM)
</span><span class="cx"> list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/SelectorPseudoClassAndCompatibilityElementMap.cpp)
</span><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/SelectorPseudoElementTypeMap.gperf ${DERIVED_SOURCES_WEBCORE_DIR}/SelectorPseudoElementTypeMap.cpp
</span><span class="cx"> MAIN_DEPENDENCY ${WEBCORE_DIR}/css/makeSelectorPseudoElementsMap.py
</span><span class="cx"> WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}
</span><del>- COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/css/makeSelectorPseudoElementsMap.py ${WEBCORE_DIR}/css/SelectorPseudoElementTypeMap.in "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}"
</del><ins>+ COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/css/makeSelectorPseudoElementsMap.py ${WEBCORE_DIR}/css/SelectorPseudoElementTypeMap.in "${GPERF_EXECUTABLE}" "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}"
</ins><span class="cx"> VERBATIM)
</span><span class="cx"> list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/SelectorPseudoElementTypeMap.cpp)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195581 => 195582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-26 05:43:11 UTC (rev 195581)
+++ trunk/Source/WebCore/ChangeLog 2016-01-26 06:12:50 UTC (rev 195582)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-01-25 Alex Christensen <achristensen@webkit.org>
+
+ Fix internal Windows build
+ https://bugs.webkit.org/show_bug.cgi?id=153469
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ Pass the GPERF_EXECUTABLE that we found to perl scripts so they can use it instead of just calling gperf.
+ This is needed for builds where gperf is not in the PATH.
+ * DerivedSources.make:
+ Pass "gperf" as the gperf command to retain existing functionality on mac.
+ * bindings/scripts/preprocess-idls.pl:
+ (CygwinPathIfNeeded):
+ * bindings/scripts/preprocessor.pm:
+ (applyPreprocessor):
+ Add /cygdrive/c/cygwin/bin to the PATH before calling cygpath.
+ This is needed for builds where we are using cygwin, but C:/cygwin/bin is not in the PATH.
+ * css/makeSelectorPseudoClassAndCompatibilityElementMap.py:
+ * css/makeSelectorPseudoElementsMap.py:
+ * css/makeprop.pl:
+ * platform/network/create-http-header-name-table:
+ Use the gperf executable passed in as a command line parameter if it is given.
+
</ins><span class="cx"> 2016-01-25 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> DisplayList items can log paths now
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (195581 => 195582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2016-01-26 05:43:11 UTC (rev 195581)
+++ trunk/Source/WebCore/DerivedSources.make 2016-01-26 06:12:50 UTC (rev 195582)
</span><span class="lines">@@ -885,13 +885,11 @@
</span><span class="cx">
</span><span class="cx"> # CSS Selector pseudo type name to value map.
</span><span class="cx">
</span><del>-WEBCORE_CSS_SELECTOR_PSEUDO_TYPE_MAP_KEYWORDS := $(WebCore)/css/SelectorPseudoClassAndCompatibilityElementMap.in
-SelectorPseudoClassAndCompatibilityElementMap.cpp : $(WebCore)/css/makeSelectorPseudoClassAndCompatibilityElementMap.py $(WEBCORE_CSS_SELECTOR_PSEUDO_TYPE_MAP_KEYWORDS)
- $(PYTHON) "$(WebCore)/css/makeSelectorPseudoClassAndCompatibilityElementMap.py" $(WEBCORE_CSS_SELECTOR_PSEUDO_TYPE_MAP_KEYWORDS) "$(FEATURE_DEFINES)"
</del><ins>+SelectorPseudoClassAndCompatibilityElementMap.cpp : $(WebCore)/css/makeSelectorPseudoClassAndCompatibilityElementMap.py $(WebCore)/css/SelectorPseudoClassAndCompatibilityElementMap.in
+ $(PYTHON) "$(WebCore)/css/makeSelectorPseudoClassAndCompatibilityElementMap.py" $(WebCore)/css/SelectorPseudoClassAndCompatibilityElementMap.in gperf "$(FEATURE_DEFINES)"
</ins><span class="cx">
</span><del>-WEBCORE_CSS_SELECTOR_PSEUDO_ELEMENTS_TYPE_MAP_KEYWORDS := $(WebCore)/css/SelectorPseudoElementTypeMap.in
-SelectorPseudoElementTypeMap.cpp : $(WebCore)/css/makeSelectorPseudoElementsMap.py $(WEBCORE_CSS_SELECTOR_PSEUDO_ELEMENTS_TYPE_MAP_KEYWORDS)
- $(PYTHON) "$(WebCore)/css/makeSelectorPseudoElementsMap.py" $(WEBCORE_CSS_SELECTOR_PSEUDO_ELEMENTS_TYPE_MAP_KEYWORDS) "$(FEATURE_DEFINES)"
</del><ins>+SelectorPseudoElementTypeMap.cpp : $(WebCore)/css/makeSelectorPseudoElementsMap.py $(WebCore)/css/SelectorPseudoElementTypeMap.in
+ $(PYTHON) "$(WebCore)/css/makeSelectorPseudoElementsMap.py" $(WebCore)/css/SelectorPseudoElementTypeMap.in gperf "$(FEATURE_DEFINES)"
</ins><span class="cx">
</span><span class="cx"> # --------
</span><span class="cx">
</span><span class="lines">@@ -927,7 +925,7 @@
</span><span class="cx"> # HTTP header names
</span><span class="cx">
</span><span class="cx"> HTTPHeaderNames.h : platform/network/HTTPHeaderNames.in $(WebCore)/platform/network/create-http-header-name-table
</span><del>- $(PYTHON) $(WebCore)/platform/network/create-http-header-name-table $(WebCore)/platform/network/HTTPHeaderNames.in
</del><ins>+ $(PYTHON) $(WebCore)/platform/network/create-http-header-name-table $(WebCore)/platform/network/HTTPHeaderNames.in gperf
</ins><span class="cx">
</span><span class="cx"> # --------
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptspreprocessidlspl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/preprocess-idls.pl (195581 => 195582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/preprocess-idls.pl 2016-01-26 05:43:11 UTC (rev 195581)
+++ trunk/Source/WebCore/bindings/scripts/preprocess-idls.pl 2016-01-26 06:12:50 UTC (rev 195582)
</span><span class="lines">@@ -175,10 +175,15 @@
</span><span class="cx"> WriteFileIfChanged($supplementalMakefileDeps, $makefileDeps);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+my $cygwinPathAdded;
</ins><span class="cx"> sub CygwinPathIfNeeded
</span><span class="cx"> {
</span><span class="cx"> my $path = shift;
</span><span class="cx"> if ($path && $Config{osname} eq "cygwin") {
</span><ins>+ if (not $cygwinPathAdded) {
+ $ENV{PATH} = "$ENV{PATH}:/cygdrive/c/cygwin/bin";
+ $cygwinPathAdded = 1;
+ }
</ins><span class="cx"> chomp($path = `cygpath -u '$path'`);
</span><span class="cx"> $path =~ s/[\r\n]//;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptspreprocessorpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/preprocessor.pm (195581 => 195582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/preprocessor.pm 2016-01-26 05:43:11 UTC (rev 195581)
+++ trunk/Source/WebCore/bindings/scripts/preprocessor.pm 2016-01-26 06:12:50 UTC (rev 195582)
</span><span class="lines">@@ -76,6 +76,7 @@
</span><span class="cx">
</span><span class="cx"> my $pid = 0;
</span><span class="cx"> if ($Config{osname} eq "cygwin") {
</span><ins>+ $ENV{PATH} = "$ENV{PATH}:/cygdrive/c/cygwin/bin";
</ins><span class="cx"> my @preprocessorAndFlags;
</span><span class="cx"> if ($preprocessor eq "/usr/bin/gcc") {
</span><span class="cx"> @preprocessorAndFlags = split(' ', $preprocessor);
</span></span></pre></div>
<a id="trunkSourceWebCorecssmakeSelectorPseudoClassAndCompatibilityElementMappy"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/makeSelectorPseudoClassAndCompatibilityElementMap.py (195581 => 195582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/makeSelectorPseudoClassAndCompatibilityElementMap.py 2016-01-26 05:43:11 UTC (rev 195581)
+++ trunk/Source/WebCore/css/makeSelectorPseudoClassAndCompatibilityElementMap.py 2016-01-26 06:12:50 UTC (rev 195582)
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> """)
</span><span class="cx"> output_file.close()
</span><span class="cx">
</span><del>-gperf_command = 'gperf'
</del><ins>+gperf_command = sys.argv[2]
</ins><span class="cx"> if 'GPERF' in os.environ:
</span><span class="cx"> gperf_command = os.environ['GPERF']
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssmakeSelectorPseudoElementsMappy"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/makeSelectorPseudoElementsMap.py (195581 => 195582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/makeSelectorPseudoElementsMap.py 2016-01-26 05:43:11 UTC (rev 195581)
+++ trunk/Source/WebCore/css/makeSelectorPseudoElementsMap.py 2016-01-26 06:12:50 UTC (rev 195582)
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> """)
</span><span class="cx"> output_file.close()
</span><span class="cx">
</span><del>-gperf_command = 'gperf'
</del><ins>+gperf_command = sys.argv[2]
</ins><span class="cx"> if 'GPERF' in os.environ:
</span><span class="cx"> gperf_command = os.environ['GPERF']
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssmakeproppl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/makeprop.pl (195581 => 195582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/makeprop.pl 2016-01-26 05:43:11 UTC (rev 195581)
+++ trunk/Source/WebCore/css/makeprop.pl 2016-01-26 06:12:50 UTC (rev 195582)
</span><span class="lines">@@ -29,8 +29,10 @@
</span><span class="cx">
</span><span class="cx"> my $defines;
</span><span class="cx"> my $preprocessor;
</span><ins>+my $gperf;
</ins><span class="cx"> GetOptions('defines=s' => \$defines,
</span><del>- 'preprocessor=s' => \$preprocessor);
</del><ins>+ 'preprocessor=s' => \$preprocessor,
+ 'gperf-executable=s' => \$gperf);
</ins><span class="cx">
</span><span class="cx"> my @NAMES = applyPreprocessor("CSSPropertyNames.in", $defines, $preprocessor);
</span><span class="cx"> die "We've reached more than 1024 CSS properties, please make sure to update CSSProperty/StylePropertyMetadata accordingly" if (scalar(@NAMES) > 1024);
</span><span class="lines">@@ -1046,5 +1048,7 @@
</span><span class="cx">
</span><span class="cx"> close SHORTHANDS_CPP;
</span><span class="cx">
</span><del>-my $gperf = $ENV{GPERF} ? $ENV{GPERF} : "gperf";
</del><ins>+if (not $gperf) {
+ $gperf = $ENV{GPERF} ? $ENV{GPERF} : "gperf";
+}
</ins><span class="cx"> system("\"$gperf\" --key-positions=\"*\" -D -n -s 2 CSSPropertyNames.gperf --output-file=CSSPropertyNames.cpp") == 0 || die "calling gperf failed: $?";
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcreatehttpheadernametable"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/create-http-header-name-table (195581 => 195582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/create-http-header-name-table 2016-01-26 05:43:11 UTC (rev 195581)
+++ trunk/Source/WebCore/platform/network/create-http-header-name-table 2016-01-26 06:12:50 UTC (rev 195582)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> program_name = os.path.basename(__file__)
</span><span class="cx"> if len(sys.argv) < 2:
</span><del>- sys.stderr.write("Usage: %s INPUT_FILE\n" % program_name)
</del><ins>+ sys.stderr.write("Usage: %s INPUT_FILE GPERF_EXECUTABLE\n" % program_name)
</ins><span class="cx"> exit(1)
</span><span class="cx">
</span><span class="cx"> input_path = sys.argv[1]
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx"> ''')
</span><span class="cx"> header_file.close()
</span><span class="cx">
</span><del>-gperf = os.getenv('GPERF') or 'gperf'
</del><ins>+gperf = os.getenv('GPERF') or sys.argv[2]
</ins><span class="cx">
</span><span class="cx"> if os.system('%s --key-positions="*" -D -n -s 2 HTTPHeaderNames.gperf --output-file=HTTPHeaderNames.cpp' % gperf):
</span><span class="cx"> sys.stderr.write('Failed to run gperf.')
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitMacroscmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitMacros.cmake (195581 => 195582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitMacros.cmake 2016-01-26 05:43:11 UTC (rev 195581)
+++ trunk/Source/cmake/WebKitMacros.cmake 2016-01-26 06:12:50 UTC (rev 195582)
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/${_name}.cpp ${_hash_tools_h}
</span><span class="cx"> MAIN_DEPENDENCY ${_source}.gperf
</span><del>- COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/make-hash-tools.pl ${DERIVED_SOURCES_WEBCORE_DIR} ${_source}.gperf
</del><ins>+ COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/make-hash-tools.pl ${DERIVED_SOURCES_WEBCORE_DIR} ${_source}.gperf ${GPERF_EXECUTABLE}
</ins><span class="cx"> VERBATIM)
</span><span class="cx">
</span><span class="cx"> unset(_name)
</span></span></pre>
</div>
</div>
</body>
</html>