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