<!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>[169899] branches/safari-537.60-branch/Source</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/169899">169899</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-06-12 09:13:58 -0700 (Thu, 12 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed build fix. (Merge <a href="http://trac.webkit.org/projects/webkit/changeset/167685">r167685</a>)
Source/JavaScriptCore:
* DerivedSources.make: Specify path to Perl/Python to avoid
build failures under Python 2.7+.
Source/WebCore:
* DerivedSources.make: Specify path to Perl/Python to avoid
build failures under Python 2.7+.
Source/WTF:
* WTF.vcxproj/WTFGenerated.make: Specify path to Perl/Python
to avoid build failures under Python 2.7+.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53760branchSourceJavaScriptCoreChangeLog">branches/safari-537.60-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari53760branchSourceJavaScriptCoreDerivedSourcesmake">branches/safari-537.60-branch/Source/JavaScriptCore/DerivedSources.make</a></li>
<li><a href="#branchessafari53760branchSourceWTFChangeLog">branches/safari-537.60-branch/Source/WTF/ChangeLog</a></li>
<li><a href="#branchessafari53760branchSourceWTFWTFvcxprojWTFGeneratedmake">branches/safari-537.60-branch/Source/WTF/WTF.vcxproj/WTFGenerated.make</a></li>
<li><a href="#branchessafari53760branchSourceWebCoreChangeLog">branches/safari-537.60-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53760branchSourceWebCoreDerivedSourcesmake">branches/safari-537.60-branch/Source/WebCore/DerivedSources.make</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53760branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/JavaScriptCore/ChangeLog (169898 => 169899)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/JavaScriptCore/ChangeLog 2014-06-12 14:53:51 UTC (rev 169898)
+++ branches/safari-537.60-branch/Source/JavaScriptCore/ChangeLog 2014-06-12 16:13:58 UTC (rev 169899)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2014-06-12 Brent Fulgham <bfulgham@apple.com>
+
+ Unreviewed build fix. (Merge r167685)
+
+ * DerivedSources.make: Specify path to Perl/Python to avoid
+ build failures under Python 2.7+.
+
</ins><span class="cx"> 2013-11-07 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> Rollout part of r146669 which caused a performance regression.
</span></span></pre></div>
<a id="branchessafari53760branchSourceJavaScriptCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/JavaScriptCore/DerivedSources.make (169898 => 169899)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/JavaScriptCore/DerivedSources.make 2014-06-12 14:53:51 UTC (rev 169898)
+++ branches/safari-537.60-branch/Source/JavaScriptCore/DerivedSources.make 2014-06-12 16:13:58 UTC (rev 169899)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> # 2. Redistributions in binary form must reproduce the above copyright
</span><span class="cx"> # notice, this list of conditions and the following disclaimer in the
</span><span class="cx"> # documentation and/or other materials provided with the distribution.
</span><del>-# 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
</del><ins>+# 3. Neither the name of Apple Inc. ("Apple") nor the names of
</ins><span class="cx"> # its contributors may be used to endorse or promote products derived
</span><span class="cx"> # from this software without specific prior written permission.
</span><span class="cx"> #
</span><span class="lines">@@ -59,6 +59,15 @@
</span><span class="cx"> udis86_itab.h \
</span><span class="cx"> #
</span><span class="cx">
</span><ins>+# Windows has specific needs for specifying the path to its interpreters
+ifeq ($(OS),Windows_NT)
+ PYTHON = /usr/bin/python
+ PERL = /usr/bin/perl
+else
+ PYTHON = python
+ PERL = perl
+endif
+# --------
</ins><span class="cx"> # lookup tables for classes
</span><span class="cx">
</span><span class="cx"> %.lut.h: create_hash_table %.cpp
</span><span class="lines">@@ -67,17 +76,17 @@
</span><span class="cx"> $^ > $@
</span><span class="cx">
</span><span class="cx"> docs/bytecode.html: make-bytecode-docs.pl Interpreter.cpp
</span><del>- perl $^ $@
</del><ins>+ $(PERL) $^ $@
</ins><span class="cx">
</span><span class="cx"> # character tables for Yarr
</span><span class="cx">
</span><span class="cx"> RegExpJitTables.h: create_regex_tables
</span><del>- python $^ > $@
</del><ins>+ $(PYTHON) $^ > $@
</ins><span class="cx">
</span><span class="cx"> KeywordLookup.h: KeywordLookupGenerator.py Keywords.table
</span><del>- python $^ > $@
</del><ins>+ $(PYTHON) $^ > $@
</ins><span class="cx">
</span><span class="cx"> # udis86 instruction tables
</span><span class="cx">
</span><span class="cx"> udis86_itab.h: $(JavaScriptCore)/disassembler/udis86/itab.py $(JavaScriptCore)/disassembler/udis86/optable.xml
</span><del>- (PYTHONPATH=$(JavaScriptCore)/disassembler/udis86 python $(JavaScriptCore)/disassembler/udis86/itab.py $(JavaScriptCore)/disassembler/udis86/optable.xml || exit 1)
</del><ins>+ (PYTHONPATH=$(JavaScriptCore)/disassembler/udis86 $(PYTHON) $(JavaScriptCore)/disassembler/udis86/itab.py $(JavaScriptCore)/disassembler/udis86/optable.xml || exit 1)
</ins></span></pre></div>
<a id="branchessafari53760branchSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WTF/ChangeLog (169898 => 169899)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WTF/ChangeLog 2014-06-12 14:53:51 UTC (rev 169898)
+++ branches/safari-537.60-branch/Source/WTF/ChangeLog 2014-06-12 16:13:58 UTC (rev 169899)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2014-06-12 Brent Fulgham <bfulgham@apple.com>
+
+ Unreviewed build fix. (Merge r167685)
+
+ * WTF.vcxproj/WTFGenerated.make: Specify path to Perl/Python
+ to avoid build failures under Python 2.7+.
+
</ins><span class="cx"> 2014-02-25 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r152973
</span></span></pre></div>
<a id="branchessafari53760branchSourceWTFWTFvcxprojWTFGeneratedmake"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WTF/WTF.vcxproj/WTFGenerated.make (169898 => 169899)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WTF/WTF.vcxproj/WTFGenerated.make 2014-06-12 14:53:51 UTC (rev 169898)
+++ branches/safari-537.60-branch/Source/WTF/WTF.vcxproj/WTFGenerated.make 2014-06-12 16:13:58 UTC (rev 169899)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> touch "%ConfigurationBuildDir%\buildfailed"
</span><span class="cx"> bash build-generated-files.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "$(DEBUGSUFFIX)"
</span><span class="cx"> !IF "$(OFFICIAL_BUILD)"!="1"
</span><del>- bash -c "python work-around-vs-dependency-tracking-bugs.py"
</del><ins>+ bash -c "/usr/bin/python work-around-vs-dependency-tracking-bugs.py"
</ins><span class="cx"> !ENDIF
</span><span class="cx"> copy-files.cmd
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WebCore/ChangeLog (169898 => 169899)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WebCore/ChangeLog 2014-06-12 14:53:51 UTC (rev 169898)
+++ branches/safari-537.60-branch/Source/WebCore/ChangeLog 2014-06-12 16:13:58 UTC (rev 169899)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2014-06-12 Brent Fulgham <bfulgham@apple.com>
+
+ Unreviewed build fix. (Merge r167685)
+
+ * DerivedSources.make: Specify path to Perl/Python to avoid
+ build failures under Python 2.7+.
+
</ins><span class="cx"> 2014-06-11 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r169842.
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WebCore/DerivedSources.make (169898 => 169899)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WebCore/DerivedSources.make 2014-06-12 14:53:51 UTC (rev 169898)
+++ branches/safari-537.60-branch/Source/WebCore/DerivedSources.make 2014-06-12 16:13:58 UTC (rev 169899)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# Copyright (C) 2006, 2007, 2008, 2012 Apple Inc. All rights reserved.
</del><ins>+# Copyright (C) 2006, 2007, 2008, 2012, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> # Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
</span><span class="cx"> # Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
</span><span class="cx"> #
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> # 2. Redistributions in binary form must reproduce the above copyright
</span><span class="cx"> # notice, this list of conditions and the following disclaimer in the
</span><span class="cx"> # documentation and/or other materials provided with the distribution.
</span><del>-# 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
</del><ins>+# 3. Neither the name of Apple Inc. ("Apple") nor the names of
</ins><span class="cx"> # its contributors may be used to endorse or promote products derived
</span><span class="cx"> # from this software without specific prior written permission.
</span><span class="cx"> #
</span><span class="lines">@@ -648,6 +648,16 @@
</span><span class="cx"> InternalSettingsGenerated.idl
</span><span class="cx"> #
</span><span class="cx">
</span><ins>+# Windows has specific needs for specifying the path to its interpreters
+ifeq ($(OS),Windows_NT)
+ PYTHON = /usr/bin/python
+ PERL = /usr/bin/perl
+else
+ PYTHON = python
+ PERL = perl
+endif
+# --------
+
</ins><span class="cx"> .PHONY : all
</span><span class="cx">
</span><span class="cx"> DOM_CLASSES=$(basename $(notdir $(BINDING_IDLS)))
</span><span class="lines">@@ -743,12 +753,12 @@
</span><span class="cx"> endif
</span><span class="cx">
</span><span class="cx"> CSSPropertyNames.h : $(WEBCORE_CSS_PROPERTY_NAMES) css/makeprop.pl $(PLATFORM_FEATURE_DEFINES)
</span><del>- cat $(WEBCORE_CSS_PROPERTY_NAMES) > CSSPropertyNames.in
- perl -I$(WebCore)/bindings/scripts "$(WebCore)/css/makeprop.pl" --defines "$(FEATURE_DEFINES)"
</del><ins>+ $(PERL) -pe '' $(WEBCORE_CSS_PROPERTY_NAMES) > CSSPropertyNames.in
+ $(PERL) -I$(WebCore)/bindings/scripts "$(WebCore)/css/makeprop.pl" --defines "$(FEATURE_DEFINES)"
</ins><span class="cx">
</span><span class="cx"> CSSValueKeywords.h : $(WEBCORE_CSS_VALUE_KEYWORDS) css/makevalues.pl $(PLATFORM_FEATURE_DEFINES)
</span><del>- cat $(WEBCORE_CSS_VALUE_KEYWORDS) > CSSValueKeywords.in
- perl -I$(WebCore)/bindings/scripts "$(WebCore)/css/makevalues.pl" --defines "$(FEATURE_DEFINES)"
</del><ins>+ $(PERL) -pe '' $(WEBCORE_CSS_VALUE_KEYWORDS) > CSSValueKeywords.in
+ $(PERL) -I$(WebCore)/bindings/scripts "$(WebCore)/css/makevalues.pl" --defines "$(FEATURE_DEFINES)"
</ins><span class="cx">
</span><span class="cx"> # --------
</span><span class="cx">
</span><span class="lines">@@ -757,7 +767,7 @@
</span><span class="cx"> all : XMLViewerCSS.h
</span><span class="cx">
</span><span class="cx"> XMLViewerCSS.h : xml/XMLViewer.css
</span><del>- perl $(WebCore)/inspector/xxd.pl XMLViewer_css $(WebCore)/xml/XMLViewer.css XMLViewerCSS.h
</del><ins>+ $(PERL) $(WebCore)/inspector/xxd.pl XMLViewer_css $(WebCore)/xml/XMLViewer.css XMLViewerCSS.h
</ins><span class="cx">
</span><span class="cx"> # --------
</span><span class="cx">
</span><span class="lines">@@ -766,21 +776,21 @@
</span><span class="cx"> all : XMLViewerJS.h
</span><span class="cx">
</span><span class="cx"> XMLViewerJS.h : xml/XMLViewer.js
</span><del>- perl $(WebCore)/inspector/xxd.pl XMLViewer_js $(WebCore)/xml/XMLViewer.js XMLViewerJS.h
</del><ins>+ $(PERL) $(WebCore)/inspector/xxd.pl XMLViewer_js $(WebCore)/xml/XMLViewer.js XMLViewerJS.h
</ins><span class="cx">
</span><span class="cx"> # --------
</span><span class="cx">
</span><span class="cx"> # HTML entity names
</span><span class="cx">
</span><span class="cx"> HTMLEntityTable.cpp : html/parser/HTMLEntityNames.in $(WebCore)/html/parser/create-html-entity-table
</span><del>- python $(WebCore)/html/parser/create-html-entity-table -o HTMLEntityTable.cpp $(WebCore)/html/parser/HTMLEntityNames.in
</del><ins>+ $(PYTHON) $(WebCore)/html/parser/create-html-entity-table -o HTMLEntityTable.cpp $(WebCore)/html/parser/HTMLEntityNames.in
</ins><span class="cx">
</span><span class="cx"> # --------
</span><span class="cx">
</span><span class="cx"> # color names
</span><span class="cx">
</span><span class="cx"> ColorData.cpp : platform/ColorData.gperf $(WebCore)/make-hash-tools.pl
</span><del>- perl $(WebCore)/make-hash-tools.pl . $(WebCore)/platform/ColorData.gperf
</del><ins>+ $(PERL) $(WebCore)/make-hash-tools.pl . $(WebCore)/platform/ColorData.gperf
</ins><span class="cx">
</span><span class="cx"> # --------
</span><span class="cx">
</span><span class="lines">@@ -796,13 +806,13 @@
</span><span class="cx">
</span><span class="cx"> # CSS grammar
</span><span class="cx"> CSSGrammar.cpp : css/CSSGrammar.y.in $(PLATFORM_FEATURE_DEFINES)
</span><del>- perl -I $(WebCore)/bindings/scripts $(WebCore)/css/makegrammar.pl --extraDefines "$(FEATURE_DEFINES)" --outputDir . --bison "$(BISON)" --symbolsPrefix cssyy $<
</del><ins>+ $(PERL) -I $(WebCore)/bindings/scripts $(WebCore)/css/makegrammar.pl --extraDefines "$(FEATURE_DEFINES)" --outputDir . --bison "$(BISON)" --symbolsPrefix cssyy $<
</ins><span class="cx">
</span><span class="cx"> # --------
</span><span class="cx">
</span><span class="cx"> # XPath grammar
</span><span class="cx"> XPathGrammar.cpp : xml/XPathGrammar.y $(PROJECT_FILE)
</span><del>- perl $(WebCore)/css/makegrammar.pl --outputDir . --bison "$(BISON)" --symbolsPrefix xpathyy $<
</del><ins>+ $(PERL) $(WebCore)/css/makegrammar.pl --outputDir . --bison "$(BISON)" --symbolsPrefix xpathyy $<
</ins><span class="cx">
</span><span class="cx"> # --------
</span><span class="cx">
</span><span class="lines">@@ -828,7 +838,7 @@
</span><span class="cx"> endif
</span><span class="cx">
</span><span class="cx"> UserAgentStyleSheets.h : css/make-css-file-arrays.pl bindings/scripts/preprocessor.pm $(USER_AGENT_STYLE_SHEETS) $(PLATFORM_FEATURE_DEFINES)
</span><del>- perl -I$(WebCore)/bindings/scripts $< --defines "$(FEATURE_DEFINES)" $@ UserAgentStyleSheetsData.cpp $(USER_AGENT_STYLE_SHEETS)
</del><ins>+ $(PERL) -I$(WebCore)/bindings/scripts $< --defines "$(FEATURE_DEFINES)" $@ UserAgentStyleSheetsData.cpp $(USER_AGENT_STYLE_SHEETS)
</ins><span class="cx">
</span><span class="cx"> # --------
</span><span class="cx">
</span><span class="lines">@@ -837,12 +847,12 @@
</span><span class="cx"> PLUG_INS_RESOURCES = $(WebCore)/Resources/plugIns.js
</span><span class="cx">
</span><span class="cx"> PlugInsResources.h : css/make-css-file-arrays.pl bindings/scripts/preprocessor.pm $(PLUG_INS_RESOURCES) $(PLATFORM_FEATURE_DEFINES)
</span><del>- perl -I$(WebCore)/bindings/scripts $< --defines "$(FEATURE_DEFINES)" $@ PlugInsResourcesData.cpp $(PLUG_INS_RESOURCES)
</del><ins>+ $(PERL) -I$(WebCore)/bindings/scripts $< --defines "$(FEATURE_DEFINES)" $@ PlugInsResourcesData.cpp $(PLUG_INS_RESOURCES)
</ins><span class="cx">
</span><span class="cx"> # --------
</span><span class="cx">
</span><span class="cx"> WebKitFontFamilyNames.cpp WebKitFontFamilyNames.h : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm css/WebKitFontFamilyNames.in
</span><del>- perl -I $(WebCore)/bindings/scripts $< --fonts $(WebCore)/css/WebKitFontFamilyNames.in
</del><ins>+ $(PERL) -I $(WebCore)/bindings/scripts $< --fonts $(WebCore)/css/WebKitFontFamilyNames.in
</ins><span class="cx">
</span><span class="cx"> # HTML tag and attribute names
</span><span class="cx">
</span><span class="lines">@@ -889,22 +899,22 @@
</span><span class="cx"> ifdef HTML_FLAGS
</span><span class="cx">
</span><span class="cx"> HTMLElementFactory.cpp HTMLNames.cpp : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm html/HTMLTagNames.in html/HTMLAttributeNames.in
</span><del>- perl -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(WebCore)/html/HTMLAttributeNames.in --factory --wrapperFactory --extraDefines "$(HTML_FLAGS)"
</del><ins>+ $(PERL) -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(WebCore)/html/HTMLAttributeNames.in --factory --wrapperFactory --extraDefines "$(HTML_FLAGS)"
</ins><span class="cx">
</span><span class="cx"> else
</span><span class="cx">
</span><span class="cx"> HTMLElementFactory.cpp HTMLNames.cpp : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm html/HTMLTagNames.in html/HTMLAttributeNames.in
</span><del>- perl -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(WebCore)/html/HTMLAttributeNames.in --factory --wrapperFactory
</del><ins>+ $(PERL) -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(WebCore)/html/HTMLAttributeNames.in --factory --wrapperFactory
</ins><span class="cx">
</span><span class="cx"> endif
</span><span class="cx">
</span><span class="cx"> JSHTMLElementWrapperFactory.cpp : HTMLNames.cpp
</span><span class="cx">
</span><span class="cx"> XMLNSNames.cpp : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm xml/xmlnsattrs.in
</span><del>- perl -I $(WebCore)/bindings/scripts $< --attrs $(WebCore)/xml/xmlnsattrs.in
</del><ins>+ $(PERL) -I $(WebCore)/bindings/scripts $< --attrs $(WebCore)/xml/xmlnsattrs.in
</ins><span class="cx">
</span><span class="cx"> XMLNames.cpp : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm xml/xmlattrs.in
</span><del>- perl -I $(WebCore)/bindings/scripts $< --attrs $(WebCore)/xml/xmlattrs.in
</del><ins>+ $(PERL) -I $(WebCore)/bindings/scripts $< --attrs $(WebCore)/xml/xmlattrs.in
</ins><span class="cx">
</span><span class="cx"> # --------
</span><span class="cx">
</span><span class="lines">@@ -923,43 +933,43 @@
</span><span class="cx"> ifdef SVG_FLAGS
</span><span class="cx">
</span><span class="cx"> SVGElementFactory.cpp SVGNames.cpp : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm svg/svgtags.in svg/svgattrs.in
</span><del>- perl -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in --extraDefines "$(SVG_FLAGS)" --factory --wrapperFactory
</del><ins>+ $(PERL) -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in --extraDefines "$(SVG_FLAGS)" --factory --wrapperFactory
</ins><span class="cx"> else
</span><span class="cx">
</span><span class="cx"> SVGElementFactory.cpp SVGNames.cpp : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm svg/svgtags.in svg/svgattrs.in
</span><del>- perl -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in --factory --wrapperFactory
</del><ins>+ $(PERL) -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in --factory --wrapperFactory
</ins><span class="cx">
</span><span class="cx"> endif
</span><span class="cx">
</span><span class="cx"> JSSVGElementWrapperFactory.cpp : SVGNames.cpp
</span><span class="cx">
</span><span class="cx"> XLinkNames.cpp : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm svg/xlinkattrs.in
</span><del>- perl -I $(WebCore)/bindings/scripts $< --attrs $(WebCore)/svg/xlinkattrs.in
</del><ins>+ $(PERL) -I $(WebCore)/bindings/scripts $< --attrs $(WebCore)/svg/xlinkattrs.in
</ins><span class="cx">
</span><span class="cx"> # --------
</span><span class="cx">
</span><span class="cx"> # Register event constructors and targets
</span><span class="cx">
</span><span class="cx"> EventFactory.cpp EventHeaders.h EventInterfaces.h : dom/make_event_factory.pl dom/EventNames.in
</span><del>- perl -I $(WebCore)/bindings/scripts $< --input $(WebCore)/dom/EventNames.in
</del><ins>+ $(PERL) -I $(WebCore)/bindings/scripts $< --input $(WebCore)/dom/EventNames.in
</ins><span class="cx">
</span><span class="cx"> EventTargetHeaders.h EventTargetInterfaces.h : dom/make_event_factory.pl dom/EventTargetFactory.in
</span><del>- perl -I $(WebCore)/bindings/scripts $< --input $(WebCore)/dom/EventTargetFactory.in
</del><ins>+ $(PERL) -I $(WebCore)/bindings/scripts $< --input $(WebCore)/dom/EventTargetFactory.in
</ins><span class="cx">
</span><span class="cx"> ExceptionCodeDescription.cpp ExceptionCodeDescription.h ExceptionHeaders.h ExceptionInterfaces.h : dom/make_dom_exceptions.pl dom/DOMExceptions.in
</span><del>- perl -I $(WebCore)/bindings/scripts $< --input $(WebCore)/dom/DOMExceptions.in
</del><ins>+ $(PERL) -I $(WebCore)/bindings/scripts $< --input $(WebCore)/dom/DOMExceptions.in
</ins><span class="cx">
</span><span class="cx"> # --------
</span><span class="cx">
</span><span class="cx"> # MathML tag and attribute names, and element factory
</span><span class="cx">
</span><span class="cx"> MathMLElementFactory.cpp MathMLNames.cpp : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm mathml/mathtags.in mathml/mathattrs.in
</span><del>- perl -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/mathml/mathtags.in --attrs $(WebCore)/mathml/mathattrs.in --factory --wrapperFactory
</del><ins>+ $(PERL) -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/mathml/mathtags.in --attrs $(WebCore)/mathml/mathattrs.in --factory --wrapperFactory
</ins><span class="cx">
</span><span class="cx"> # --------
</span><span class="cx">
</span><span class="cx"> InternalSettingsGenerated.idl InternalSettingsGenerated.cpp InternalSettingsGenerated.h SettingsMacros.h : page/make_settings.pl page/Settings.in
</span><del>- perl -I $(WebCore)/bindings/scripts $< --input $(WebCore)/page/Settings.in
</del><ins>+ $(PERL) -I $(WebCore)/bindings/scripts $< --input $(WebCore)/page/Settings.in
</ins><span class="cx">
</span><span class="cx"> # --------
</span><span class="cx">
</span><span class="lines">@@ -974,9 +984,9 @@
</span><span class="cx"> PREPROCESS_IDLS_SCRIPTS = \
</span><span class="cx"> bindings/scripts/preprocess-idls.pl
</span><span class="cx">
</span><del>-generator_script = perl $(addprefix -I $(WebCore)/, $(sort $(dir $(1)))) $(WebCore)/bindings/scripts/generate-bindings.pl
</del><ins>+generator_script = $(PERL) $(addprefix -I $(WebCore)/, $(sort $(dir $(1)))) $(WebCore)/bindings/scripts/generate-bindings.pl
</ins><span class="cx">
</span><del>-preprocess_idls_script = perl $(addprefix -I $(WebCore)/, $(sort $(dir $(1)))) $(WebCore)/bindings/scripts/preprocess-idls.pl
</del><ins>+preprocess_idls_script = $(PERL) $(addprefix -I $(WebCore)/, $(sort $(dir $(1)))) $(WebCore)/bindings/scripts/preprocess-idls.pl
</ins><span class="cx">
</span><span class="cx"> # JS bindings generator
</span><span class="cx">
</span><span class="lines">@@ -1023,36 +1033,36 @@
</span><span class="cx"> JS%.h : %.idl $(JS_BINDINGS_SCRIPTS) $(IDL_ATTRIBUTES_FILE) $(WINDOW_CONSTRUCTORS_FILE) $(WORKERCONTEXT_CONSTRUCTORS_FILE) $(PLATFORM_FEATURE_DEFINES)
</span><span class="cx"> $(call generator_script, $(JS_BINDINGS_SCRIPTS)) $(IDL_COMMON_ARGS) --defines "$(FEATURE_DEFINES) $(ADDITIONAL_IDL_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --idlAttributesFile $(IDL_ATTRIBUTES_FILE) --supplementalDependencyFile $(SUPPLEMENTAL_DEPENDENCY_FILE) $<
</span><span class="cx">
</span><del>-include $(SUPPLEMENTAL_MAKEFILE_DEPS)
</del><ins>+-include $(SUPPLEMENTAL_MAKEFILE_DEPS)
</ins><span class="cx">
</span><span class="cx"> # Inspector interfaces generator
</span><span class="cx">
</span><span class="cx"> all : InspectorProtocolVersion.h
</span><span class="cx">
</span><span class="cx"> InspectorProtocolVersion.h : Inspector.json inspector/generate-inspector-protocol-version
</span><del>- python $(WebCore)/inspector/generate-inspector-protocol-version -o InspectorProtocolVersion.h $(WebCore)/inspector/Inspector.json
</del><ins>+ $(PYTHON) $(WebCore)/inspector/generate-inspector-protocol-version -o InspectorProtocolVersion.h $(WebCore)/inspector/Inspector.json
</ins><span class="cx">
</span><span class="cx"> all : InspectorFrontend.h
</span><span class="cx">
</span><span class="cx"> INSPECTOR_GENERATOR_SCRIPTS = inspector/CodeGeneratorInspector.py
</span><span class="cx">
</span><span class="cx"> InspectorFrontend.h : Inspector.json $(INSPECTOR_GENERATOR_SCRIPTS)
</span><del>- python $(WebCore)/inspector/CodeGeneratorInspector.py $(WebCore)/inspector/Inspector.json --output_h_dir . --output_cpp_dir .
</del><ins>+ $(PYTHON) $(WebCore)/inspector/CodeGeneratorInspector.py $(WebCore)/inspector/Inspector.json --output_h_dir . --output_cpp_dir .
</ins><span class="cx">
</span><span class="cx"> all : InspectorOverlayPage.h
</span><span class="cx">
</span><span class="cx"> InspectorOverlayPage.h : InspectorOverlayPage.html
</span><del>- perl $(WebCore)/inspector/xxd.pl InspectorOverlayPage_html $(WebCore)/inspector/InspectorOverlayPage.html InspectorOverlayPage.h
</del><ins>+ $(PERL) $(WebCore)/inspector/xxd.pl InspectorOverlayPage_html $(WebCore)/inspector/InspectorOverlayPage.html InspectorOverlayPage.h
</ins><span class="cx">
</span><span class="cx"> all : InjectedScriptSource.h
</span><span class="cx">
</span><span class="cx"> InjectedScriptSource.h : InjectedScriptSource.js
</span><del>- perl $(WebCore)/inspector/xxd.pl InjectedScriptSource_js $(WebCore)/inspector/InjectedScriptSource.js InjectedScriptSource.h
</del><ins>+ $(PERL) $(WebCore)/inspector/xxd.pl InjectedScriptSource_js $(WebCore)/inspector/InjectedScriptSource.js InjectedScriptSource.h
</ins><span class="cx">
</span><span class="cx"> all : InjectedScriptCanvasModuleSource.h
</span><span class="cx">
</span><span class="cx"> InjectedScriptCanvasModuleSource.h : InjectedScriptCanvasModuleSource.js
</span><del>- perl $(WebCore)/inspector/xxd.pl InjectedScriptCanvasModuleSource_js $(WebCore)/inspector/InjectedScriptCanvasModuleSource.js InjectedScriptCanvasModuleSource.h
</del><ins>+ $(PERL) $(WebCore)/inspector/xxd.pl InjectedScriptCanvasModuleSource_js $(WebCore)/inspector/InjectedScriptCanvasModuleSource.js InjectedScriptCanvasModuleSource.h
</ins><span class="cx">
</span><span class="cx"> -include $(JS_DOM_HEADERS:.h=.dep)
</span><span class="cx">
</span><span class="lines">@@ -1073,7 +1083,7 @@
</span><span class="cx"> # character set name table
</span><span class="cx">
</span><span class="cx"> CharsetData.cpp : platform/text/mac/make-charset-table.pl platform/text/mac/character-sets.txt platform/text/mac/mac-encodings.txt
</span><del>- perl $^ kTextEncoding > $@
</del><ins>+ $(PERL) $^ kTextEncoding > $@
</ins><span class="cx">
</span><span class="cx"> # --------
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>