Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (167684 => 167685)
--- trunk/Source/_javascript_Core/ChangeLog 2014-04-22 21:55:59 UTC (rev 167684)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-04-22 21:58:42 UTC (rev 167685)
@@ -1,3 +1,13 @@
+2014-04-22 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Support Python 2.7 in Cygwin
+ https://bugs.webkit.org/show_bug.cgi?id=132023
+
+ Reviewed by Michael Saboff.
+
+ * DerivedSources.make: Use a conditional variable to define
+ the path to Python/Perl.
+
2014-04-22 Filip Pizlo <fpi...@apple.com>
Switch the LLVMForJSC target to using the LLVM in /usr/local rather than /usr/local/LLVMForJavaScriptCore on iOS
Modified: trunk/Source/_javascript_Core/DerivedSources.make (167684 => 167685)
--- trunk/Source/_javascript_Core/DerivedSources.make 2014-04-22 21:55:59 UTC (rev 167684)
+++ trunk/Source/_javascript_Core/DerivedSources.make 2014-04-22 21:58:42 UTC (rev 167685)
@@ -66,9 +66,19 @@
# builtin functions
.PHONY: JSCBuiltins
+# 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
+# --------
+
JSCBuiltins: $(_javascript_Core)/generate-js-builtins JSCBuiltins.h JSCBuiltins.cpp
JSCBuiltins.h: $(_javascript_Core)/generate-js-builtins $(_javascript_Core)/builtins/*.js
- python $^ $@
+ $(PYTHON) $^ $@
JSCBuiltins.cpp: JSCBuiltins.h
@@ -82,23 +92,23 @@
# 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)
# Bytecode files
Bytecodes.h: $(_javascript_Core)/generate-bytecode-files $(_javascript_Core)/bytecode/BytecodeList.json
- python $(_javascript_Core)/generate-bytecode-files --bytecodes_h Bytecodes.h $(_javascript_Core)/bytecode/BytecodeList.json
+ $(PYTHON) $(_javascript_Core)/generate-bytecode-files --bytecodes_h Bytecodes.h $(_javascript_Core)/bytecode/BytecodeList.json
InitBytecodes.asm: $(_javascript_Core)/generate-bytecode-files $(_javascript_Core)/bytecode/BytecodeList.json
- python $(_javascript_Core)/generate-bytecode-files --init_bytecodes_asm InitBytecodes.asm $(_javascript_Core)/bytecode/BytecodeList.json
+ $(PYTHON) $(_javascript_Core)/generate-bytecode-files --init_bytecodes_asm InitBytecodes.asm $(_javascript_Core)/bytecode/BytecodeList.json
# Inspector interfaces
@@ -130,15 +140,15 @@
echo '$(INSPECTOR_DOMAINS)' | cmp -s - $@ || echo '$(INSPECTOR_DOMAINS)' > $@
InspectorJS.json : inspector/scripts/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS) EnabledInspectorDomains
- python $(_javascript_Core)/inspector/scripts/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS) > ./InspectorJS.json
+ $(PYTHON) $(_javascript_Core)/inspector/scripts/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS) > ./InspectorJS.json
# Inspector Backend Dispatchers, Frontend Dispatchers, Type Builders
InspectorJSFrontendDispatchers.h : InspectorJS.json $(INSPECTOR_GENERATOR_SCRIPTS)
- python $(_javascript_Core)/inspector/scripts/CodeGeneratorInspector.py ./InspectorJS.json --output_h_dir . --output_cpp_dir . --output_js_dir . --output_type _javascript_
+ $(PYTHON) $(_javascript_Core)/inspector/scripts/CodeGeneratorInspector.py ./InspectorJS.json --output_h_dir . --output_cpp_dir . --output_js_dir . --output_type _javascript_
InjectedScriptSource.h : inspector/InjectedScriptSource.js $(_javascript_Core)/inspector/scripts/jsmin.py $(_javascript_Core)/inspector/scripts/xxd.pl
- python $(_javascript_Core)/inspector/scripts/jsmin.py < $(_javascript_Core)/inspector/InjectedScriptSource.js > ./InjectedScriptSource.min.js
- perl $(_javascript_Core)/inspector/scripts/xxd.pl InjectedScriptSource_js ./InjectedScriptSource.min.js InjectedScriptSource.h
+ $(PYTHON) $(_javascript_Core)/inspector/scripts/jsmin.py < $(_javascript_Core)/inspector/InjectedScriptSource.js > ./InjectedScriptSource.min.js
+ $(PERL) $(_javascript_Core)/inspector/scripts/xxd.pl InjectedScriptSource_js ./InjectedScriptSource.min.js InjectedScriptSource.h
rm -f ./InjectedScriptSource.min.js
# Web Replay inputs generator
@@ -155,4 +165,4 @@
all : JSReplayInputs.h
JSReplayInputs.h : $(INPUT_GENERATOR_SPECIFICATIONS) $(INPUT_GENERATOR_SCRIPTS)
- python $(_javascript_Core)/replay/scripts/CodeGeneratorReplayInputs.py --outputDir . --framework _javascript_Core $(INPUT_GENERATOR_SPECIFICATIONS)
+ $(PYTHON) $(_javascript_Core)/replay/scripts/CodeGeneratorReplayInputs.py --outputDir . --framework _javascript_Core $(INPUT_GENERATOR_SPECIFICATIONS)
Modified: trunk/Source/WTF/ChangeLog (167684 => 167685)
--- trunk/Source/WTF/ChangeLog 2014-04-22 21:55:59 UTC (rev 167684)
+++ trunk/Source/WTF/ChangeLog 2014-04-22 21:58:42 UTC (rev 167685)
@@ -1,3 +1,12 @@
+2014-04-22 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Support Python 2.7 in Cygwin
+ https://bugs.webkit.org/show_bug.cgi?id=132023
+
+ Reviewed by Michael Saboff.
+
+ * WTF.vcxproj/WTFGenerated.make: Use proper path to Python.
+
2014-04-21 Eric Carlson <eric.carl...@apple.com>
[Mac] implement WebKitDataCue
Modified: trunk/Source/WTF/WTF.vcxproj/WTFGenerated.make (167684 => 167685)
--- trunk/Source/WTF/WTF.vcxproj/WTFGenerated.make 2014-04-22 21:55:59 UTC (rev 167684)
+++ trunk/Source/WTF/WTF.vcxproj/WTFGenerated.make 2014-04-22 21:58:42 UTC (rev 167685)
@@ -2,7 +2,7 @@
touch "%ConfigurationBuildDir%\buildfailed"
bash build-generated-files.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "$(DEBUGSUFFIX)" "%PlatformArchitecture%"
!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: trunk/Source/WebCore/ChangeLog (167684 => 167685)
--- trunk/Source/WebCore/ChangeLog 2014-04-22 21:55:59 UTC (rev 167684)
+++ trunk/Source/WebCore/ChangeLog 2014-04-22 21:58:42 UTC (rev 167685)
@@ -1,3 +1,13 @@
+2014-04-22 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Support Python 2.7 in Cygwin
+ https://bugs.webkit.org/show_bug.cgi?id=132023
+
+ Reviewed by Michael Saboff.
+
+ * DerivedSources.make: Use proper path to Cygwin on
+ all platforms.
+
2014-04-22 Andreas Kling <akl...@apple.com>
REGRESSION (r151839): Subframe keeps getting mousemove events with the same coordinates after hiding a hovered element.
Modified: trunk/Source/WebCore/DerivedSources.make (167684 => 167685)
--- trunk/Source/WebCore/DerivedSources.make 2014-04-22 21:55:59 UTC (rev 167684)
+++ trunk/Source/WebCore/DerivedSources.make 2014-04-22 21:58:42 UTC (rev 167685)
@@ -667,6 +667,16 @@
$(WebCore)/svg/SVGZoomEvent.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
+# --------
+
ifeq ($(OS),MACOS)
FRAMEWORK_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(FRAMEWORK_SEARCH_PATHS) | perl -e 'print "-F " . join(" -F ", split(" ", <>));')
@@ -786,12 +796,12 @@
WEBCORE_CSS_VALUE_KEYWORDS := $(WEBCORE_CSS_VALUE_KEYWORDS) $(WebCore)/css/SVGCSSValueKeywords.in
CSSPropertyNames.h : $(WEBCORE_CSS_PROPERTY_NAMES) css/makeprop.pl bindings/scripts/preprocessor.pm $(PLATFORM_FEATURE_DEFINES)
- perl -pe '' $(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 bindings/scripts/preprocessor.pm $(PLATFORM_FEATURE_DEFINES)
- perl -pe '' $(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)"
# --------
@@ -799,11 +809,11 @@
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)"
+ $(PYTHON) "$(WebCore)/css/makeSelectorPseudoClassAndCompatibilityElementMap.py" $(WEBCORE_CSS_SELECTOR_PSEUDO_TYPE_MAP_KEYWORDS) "$(FEATURE_DEFINES)"
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)"
+ $(PYTHON) "$(WebCore)/css/makeSelectorPseudoElementsMap.py" $(WEBCORE_CSS_SELECTOR_PSEUDO_ELEMENTS_TYPE_MAP_KEYWORDS) "$(FEATURE_DEFINES)"
# --------
@@ -812,8 +822,8 @@
all : XMLViewerCSS.h
XMLViewerCSS.h : xml/XMLViewer.css
- python $(InspectorScripts)/cssmin.py <"$(WebCore)/xml/XMLViewer.css" > ./XMLViewer.min.css
- perl $(InspectorScripts)/xxd.pl XMLViewer_css ./XMLViewer.min.css XMLViewerCSS.h
+ $(PYTHON) $(InspectorScripts)/cssmin.py <"$(WebCore)/xml/XMLViewer.css" > ./XMLViewer.min.css
+ $(PERL) $(InspectorScripts)/xxd.pl XMLViewer_css ./XMLViewer.min.css XMLViewerCSS.h
rm -f ./XMLViewer.min.css
# --------
@@ -823,8 +833,8 @@
all : XMLViewerJS.h
XMLViewerJS.h : xml/XMLViewer.js
- python $(InspectorScripts)/jsmin.py <"$(WebCore)/xml/XMLViewer.js" > ./XMLViewer.min.js
- perl $(InspectorScripts)/xxd.pl XMLViewer_js ./XMLViewer.min.js XMLViewerJS.h
+ $(PYTHON) $(InspectorScripts)/jsmin.py <"$(WebCore)/xml/XMLViewer.js" > ./XMLViewer.min.js
+ $(PERL) $(InspectorScripts)/xxd.pl XMLViewer_js ./XMLViewer.min.js XMLViewerJS.h
rm -f ./XMLViewer.min.js
# --------
@@ -832,14 +842,14 @@
# 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
# --------
@@ -855,13 +865,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 $<
# --------
@@ -891,7 +901,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)
# --------
@@ -907,7 +917,7 @@
all : UserAgentScripts.h
UserAgentScripts.h : Scripts/make-js-file-arrays.py $(USER_AGENT_SCRIPTS)
- PYTHONPATH=$(InspectorScripts) python $< $@ UserAgentScriptsData.cpp $(USER_AGENT_SCRIPTS)
+ PYTHONPATH=$(InspectorScripts) $(PYTHON) $< $@ UserAgentScriptsData.cpp $(USER_AGENT_SCRIPTS)
endif
# --------
@@ -917,12 +927,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
@@ -969,20 +979,20 @@
ifdef HTML_FLAGS
HTMLElementFactory.cpp HTMLNames.cpp JSHTMLElementWrapperFactory.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 JSHTMLElementWrapperFactory.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
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
# --------
@@ -1001,41 +1011,41 @@
ifdef SVG_FLAGS
JSSVGElementWrapperFactory.cpp 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
JSSVGElementWrapperFactory.cpp 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
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
# --------
@@ -1050,9 +1060,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
@@ -1144,25 +1154,25 @@
echo '$(INSPECTOR_DOMAINS)' | cmp -s - $@ || echo '$(INSPECTOR_DOMAINS)' > $@
InspectorWeb.json : $(InspectorScripts)/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS) EnabledInspectorDomains
- python $(InspectorScripts)/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS) > ./InspectorWeb.json
+ $(PYTHON) $(InspectorScripts)/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS) > ./InspectorWeb.json
all : InspectorWebFrontendDispatchers.h
InspectorWebFrontendDispatchers.h : InspectorWeb.json $(InspectorScripts)/InspectorJS.json $(INSPECTOR_GENERATOR_SCRIPTS)
- python $(InspectorScripts)/CodeGeneratorInspector.py ./InspectorWeb.json $(InspectorScripts)/InspectorJS.json --output_h_dir . --output_cpp_dir . --output_js_dir . --output_type Web
+ $(PYTHON) $(InspectorScripts)/CodeGeneratorInspector.py ./InspectorWeb.json $(InspectorScripts)/InspectorJS.json --output_h_dir . --output_cpp_dir . --output_js_dir . --output_type Web
all : InspectorOverlayPage.h
InspectorOverlayPage.h : InspectorOverlayPage.html InspectorOverlayPage.css InspectorOverlayPage.js
- python $(InspectorScripts)/inline-and-minify-stylesheets-and-scripts.py $(WebCore)/inspector/InspectorOverlayPage.html ./InspectorOverlayPage.combined.html
- perl $(InspectorScripts)/xxd.pl InspectorOverlayPage_html ./InspectorOverlayPage.combined.html InspectorOverlayPage.h
+ $(PYTHON) $(InspectorScripts)/inline-and-minify-stylesheets-and-scripts.py $(WebCore)/inspector/InspectorOverlayPage.html ./InspectorOverlayPage.combined.html
+ $(PERL) $(InspectorScripts)/xxd.pl InspectorOverlayPage_html ./InspectorOverlayPage.combined.html InspectorOverlayPage.h
rm -f ./InspectorOverlayPage.combined.html
all : CommandLineAPIModuleSource.h
CommandLineAPIModuleSource.h : CommandLineAPIModuleSource.js
- python $(InspectorScripts)/jsmin.py <$(WebCore)/inspector/CommandLineAPIModuleSource.js > ./CommandLineAPIModuleSource.min.js
- perl $(InspectorScripts)/xxd.pl CommandLineAPIModuleSource_js ./CommandLineAPIModuleSource.min.js CommandLineAPIModuleSource.h
+ $(PYTHON) $(InspectorScripts)/jsmin.py <$(WebCore)/inspector/CommandLineAPIModuleSource.js > ./CommandLineAPIModuleSource.min.js
+ $(PERL) $(InspectorScripts)/xxd.pl CommandLineAPIModuleSource_js ./CommandLineAPIModuleSource.min.js CommandLineAPIModuleSource.h
rm -f ./CommandLineAPIModuleSource.min.js
# Web Replay inputs generator
@@ -1179,7 +1189,7 @@
all : WebReplayInputs.h
WebReplayInputs.h : $(INPUT_GENERATOR_SPECIFICATIONS) $(INPUT_GENERATOR_SCRIPTS)
- python $(WebReplayScripts)/CodeGeneratorReplayInputs.py --outputDir . --framework WebCore $(INPUT_GENERATOR_SPECIFICATIONS)
+ $(PYTHON) $(WebReplayScripts)/CodeGeneratorReplayInputs.py --outputDir . --framework WebCore $(INPUT_GENERATOR_SPECIFICATIONS)
-include $(JS_DOM_HEADERS:.h=.dep)
@@ -1208,7 +1218,7 @@
endif # WTF_PLATFORM_IOS
CharsetData.cpp : platform/text/mac/make-charset-table.pl platform/text/mac/character-sets.txt platform/text/mac/$(ENCODINGS_FILENAME)
- perl $^ kTextEncoding > $@
+ $(PERL) $^ kTextEncoding > $@
# --------
Modified: trunk/Source/WebInspectorUI/ChangeLog (167684 => 167685)
--- trunk/Source/WebInspectorUI/ChangeLog 2014-04-22 21:55:59 UTC (rev 167684)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-04-22 21:58:42 UTC (rev 167685)
@@ -1,3 +1,13 @@
+2014-04-22 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Support Python 2.7 in Cygwin
+ https://bugs.webkit.org/show_bug.cgi?id=132023
+
+ Reviewed by Michael Saboff.
+
+ * WebInspectorUI.vcxproj/build-webinspectorui.sh: use
+ proper path to Python under Cygwin.
+
2014-04-18 Katie Madonna <mado...@gmail.com>
Web Inspector: add entries for probe samples in the JS/Events timeline UI
Modified: trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.sh (167684 => 167685)
--- trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.sh 2014-04-22 21:55:59 UTC (rev 167684)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.sh 2014-04-22 21:58:42 UTC (rev 167685)
@@ -45,4 +45,4 @@
export COMBINE_INSPECTOR_RESOURCES="YES";
fi
-perl "${SRCROOT}/Scripts/copy-user-interface-resources.pl"
+/usr/bin/perl "${SRCROOT}/Scripts/copy-user-interface-resources.pl"
Modified: trunk/Source/WebKit/ChangeLog (167684 => 167685)
--- trunk/Source/WebKit/ChangeLog 2014-04-22 21:55:59 UTC (rev 167684)
+++ trunk/Source/WebKit/ChangeLog 2014-04-22 21:58:42 UTC (rev 167685)
@@ -1,3 +1,13 @@
+2014-04-22 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Support Python 2.7 in Cygwin
+ https://bugs.webkit.org/show_bug.cgi?id=132023
+
+ Reviewed by Michael Saboff.
+
+ * WebKit.vcxproj/WebKit/WebKitVersion.cmd: Use correct
+ path to Python under Cygwin.
+
2014-04-20 Andreas Kling <akl...@apple.com>
Blind Windows build fix. Hope I guessed the 64-bit mangled form right.
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitVersion.cmd (167684 => 167685)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitVersion.cmd 2014-04-22 21:55:59 UTC (rev 167684)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitVersion.cmd 2014-04-22 21:58:42 UTC (rev 167685)
@@ -4,4 +4,4 @@
set WEBKITVERSIONFILE=%WEBKITVERSIONDIR%\WebKitVersion.h
set PATH=%SystemDrive%\cygwin\bin;%PATH%
-bash -c 'perl "%WEBKITVERSIONSCRIPT%" --config "%WEBKITVERSIONCONFIG%" --outputDir "%WEBKITVERSIONDIR%"'
+bash -c '/usr/bin/perl "%WEBKITVERSIONSCRIPT%" --config "%WEBKITVERSIONCONFIG%" --outputDir "%WEBKITVERSIONDIR%"'
Modified: trunk/Tools/ChangeLog (167684 => 167685)
--- trunk/Tools/ChangeLog 2014-04-22 21:55:59 UTC (rev 167684)
+++ trunk/Tools/ChangeLog 2014-04-22 21:58:42 UTC (rev 167685)
@@ -1,3 +1,14 @@
+2014-04-22 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Support Python 2.7 in Cygwin
+ https://bugs.webkit.org/show_bug.cgi?id=132023
+
+ Reviewed by Michael Saboff.
+
+ * Scripts/webkitdirs.pm:
+ (checkInstalledTools): Remove check for Python 2.7, since
+ it now works properly.
+
2014-04-22 Filip Pizlo <fpi...@apple.com>
Switch the LLVMForJSC target to using the LLVM in /usr/local rather than /usr/local/LLVMForJavaScriptCore on iOS
Modified: trunk/Tools/Scripts/webkitdirs.pm (167684 => 167685)
--- trunk/Tools/Scripts/webkitdirs.pm 2014-04-22 21:55:59 UTC (rev 167684)
+++ trunk/Tools/Scripts/webkitdirs.pm 2014-04-22 21:58:42 UTC (rev 167685)
@@ -1413,11 +1413,9 @@
print "svn 1.7.10 is known to be compatible with our servers. You are running $svnVersion,\nwhich may not work properly.\n"
}
- # Python 2.7.3 as shipped by Cygwin prevents the build from completing due to some issue with handling of
# environment variables. Avoid until this is corrected.
my $pythonVer = `python --version 2>&1`;
die "You must have Python installed to build WebKit.\n" if ($?);
- die "Python 2.7.3 is not compatible with the WebKit build. Please downgrade to Python 2.6.8.\n" if ($pythonVer =~ /2\.7\.3/);
# cURL 7.34.0 has a bug that prevents authentication with opensource.apple.com (and other things using SSL3).
my $curlVer = `curl --version | grep "curl"`;
