Changeset 167685 in webkit


Ignore:
Timestamp:
Apr 22, 2014 2:58:42 PM (10 years ago)
Author:
Brent Fulgham
Message:

[Win] Support Python 2.7 in Cygwin
​https://bugs.webkit.org/show_bug.cgi?id=132023

Reviewed by Michael Saboff.

Source/JavaScriptCore:

  • DerivedSources.make: Use a conditional variable to define

the path to Python/Perl.

Source/WebCore:

  • DerivedSources.make: Use proper path to Cygwin on

all platforms.

Source/WebInspectorUI:

  • WebInspectorUI.vcxproj/build-webinspectorui.sh: use

proper path to Python under Cygwin.

Source/WebKit:

  • WebKit.vcxproj/WebKit/WebKitVersion.cmd: Use correct

path to Python under Cygwin.

Source/WTF:

  • WTF.vcxproj/WTFGenerated.make: Use proper path to Python.

Tools:

  • Scripts/webkitdirs.pm:

(checkInstalledTools): Remove check for Python 2.7, since
it now works properly.

Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r167671 r167685  
     12014-04-22  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Win] Support Python 2.7 in Cygwin
     4        https://bugs.webkit.org/show_bug.cgi?id=132023
     5
     6        Reviewed by Michael Saboff.
     7
     8        * DerivedSources.make: Use a conditional variable to define
     9        the path to Python/Perl.
     10
    1112014-04-22  Filip Pizlo  <fpizlo@apple.com>
    212

  • trunk/Source/JavaScriptCore/DerivedSources.make

    r167530 r167685  
    6767.PHONY: JSCBuiltins
    6868
     69# Windows has specific needs for specifying the path to its interpreters
     70ifeq ($(OS),Windows_NT)
     71    PYTHON = /usr/bin/python
     72    PERL = /usr/bin/perl
     73else
     74    PYTHON = python
     75    PERL = perl
     76endif
     77# --------
     78
    6979JSCBuiltins: $(JavaScriptCore)/generate-js-builtins JSCBuiltins.h JSCBuiltins.cpp
    7080JSCBuiltins.h: $(JavaScriptCore)/generate-js-builtins $(JavaScriptCore)/builtins/*.js
    71         python $^ $@
     81        $(PYTHON) $^ $@
    7282                                                                                                                                                                 
    7383JSCBuiltins.cpp: JSCBuiltins.h
    … …  
    8393
    8494RegExpJitTables.h: create_regex_tables
    85         python $^ > $@
     95        $(PYTHON) $^ > $@
    8696
    8797KeywordLookup.h: KeywordLookupGenerator.py Keywords.table
    88         python $^ > $@
     98        $(PYTHON) $^ > $@
    8999
    90100# udis86 instruction tables
    91101
    92102udis86_itab.h: $(JavaScriptCore)/disassembler/udis86/itab.py $(JavaScriptCore)/disassembler/udis86/optable.xml
    93         (PYTHONPATH=$(JavaScriptCore)/disassembler/udis86 python $(JavaScriptCore)/disassembler/udis86/itab.py $(JavaScriptCore)/disassembler/udis86/optable.xml || exit 1)
     103        (PYTHONPATH=$(JavaScriptCore)/disassembler/udis86 $(PYTHON) $(JavaScriptCore)/disassembler/udis86/itab.py $(JavaScriptCore)/disassembler/udis86/optable.xml || exit 1)
    94104
    95105# Bytecode files
    96106
    97107Bytecodes.h: $(JavaScriptCore)/generate-bytecode-files $(JavaScriptCore)/bytecode/BytecodeList.json
    98         python $(JavaScriptCore)/generate-bytecode-files --bytecodes_h Bytecodes.h $(JavaScriptCore)/bytecode/BytecodeList.json
     108        $(PYTHON) $(JavaScriptCore)/generate-bytecode-files --bytecodes_h Bytecodes.h $(JavaScriptCore)/bytecode/BytecodeList.json
    99109
    100110InitBytecodes.asm: $(JavaScriptCore)/generate-bytecode-files $(JavaScriptCore)/bytecode/BytecodeList.json
    101         python $(JavaScriptCore)/generate-bytecode-files --init_bytecodes_asm InitBytecodes.asm $(JavaScriptCore)/bytecode/BytecodeList.json
     111        $(PYTHON) $(JavaScriptCore)/generate-bytecode-files --init_bytecodes_asm InitBytecodes.asm $(JavaScriptCore)/bytecode/BytecodeList.json
    102112
    103113# Inspector interfaces
    … …  
    131141
    132142InspectorJS.json : inspector/scripts/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS) EnabledInspectorDomains
    133         python $(JavaScriptCore)/inspector/scripts/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS) > ./InspectorJS.json
     143        $(PYTHON) $(JavaScriptCore)/inspector/scripts/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS) > ./InspectorJS.json
    134144
    135145# Inspector Backend Dispatchers, Frontend Dispatchers, Type Builders
    136146InspectorJSFrontendDispatchers.h : InspectorJS.json $(INSPECTOR_GENERATOR_SCRIPTS)
    137         python $(JavaScriptCore)/inspector/scripts/CodeGeneratorInspector.py ./InspectorJS.json --output_h_dir . --output_cpp_dir . --output_js_dir . --output_type JavaScript
     147        $(PYTHON) $(JavaScriptCore)/inspector/scripts/CodeGeneratorInspector.py ./InspectorJS.json --output_h_dir . --output_cpp_dir . --output_js_dir . --output_type JavaScript
    138148
    139149InjectedScriptSource.h : inspector/InjectedScriptSource.js $(JavaScriptCore)/inspector/scripts/jsmin.py $(JavaScriptCore)/inspector/scripts/xxd.pl
    140         python $(JavaScriptCore)/inspector/scripts/jsmin.py < $(JavaScriptCore)/inspector/InjectedScriptSource.js > ./InjectedScriptSource.min.js
    141         perl $(JavaScriptCore)/inspector/scripts/xxd.pl InjectedScriptSource_js ./InjectedScriptSource.min.js InjectedScriptSource.h
     150        $(PYTHON) $(JavaScriptCore)/inspector/scripts/jsmin.py < $(JavaScriptCore)/inspector/InjectedScriptSource.js > ./InjectedScriptSource.min.js
     151        $(PERL) $(JavaScriptCore)/inspector/scripts/xxd.pl InjectedScriptSource_js ./InjectedScriptSource.min.js InjectedScriptSource.h
    142152        rm -f ./InjectedScriptSource.min.js
    143153
    … …  
    156166
    157167JSReplayInputs.h : $(INPUT_GENERATOR_SPECIFICATIONS) $(INPUT_GENERATOR_SCRIPTS)
    158         python $(JavaScriptCore)/replay/scripts/CodeGeneratorReplayInputs.py --outputDir . --framework JavaScriptCore $(INPUT_GENERATOR_SPECIFICATIONS)
     168        $(PYTHON) $(JavaScriptCore)/replay/scripts/CodeGeneratorReplayInputs.py --outputDir . --framework JavaScriptCore $(INPUT_GENERATOR_SPECIFICATIONS)

  • trunk/Source/WTF/ChangeLog

    r167632 r167685  
     12014-04-22  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Win] Support Python 2.7 in Cygwin
     4        https://bugs.webkit.org/show_bug.cgi?id=132023
     5
     6        Reviewed by Michael Saboff.
     7
     8        * WTF.vcxproj/WTFGenerated.make: Use proper path to Python.
     9
    1102014-04-21  Eric Carlson  <eric.carlson@apple.com>
    211

  • trunk/Source/WTF/WTF.vcxproj/WTFGenerated.make

    r154513 r167685  
    33    bash build-generated-files.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "$(DEBUGSUFFIX)" "%PlatformArchitecture%"
    44!IF "$(OFFICIAL_BUILD)"!="1"
    5     bash -c "python work-around-vs-dependency-tracking-bugs.py"
     5    bash -c "/usr/bin/python work-around-vs-dependency-tracking-bugs.py"
    66!ENDIF
    77    copy-files.cmd

  • trunk/Source/WebCore/ChangeLog

    r167684 r167685  
     12014-04-22  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Win] Support Python 2.7 in Cygwin
     4        https://bugs.webkit.org/show_bug.cgi?id=132023
     5
     6        Reviewed by Michael Saboff.
     7
     8        * DerivedSources.make: Use proper path to Cygwin on
     9        all platforms.
     10
    1112014-04-22  Andreas Kling  <akling@apple.com>
    212

  • trunk/Source/WebCore/DerivedSources.make

    r167632 r167685  
    668668#
    669669
     670# Windows has specific needs for specifying the path to its interpreters
     671ifeq ($(OS),Windows_NT)
     672    PYTHON = /usr/bin/python
     673    PERL = /usr/bin/perl
     674else
     675    PYTHON = python
     676    PERL = perl
     677endif
     678# --------
     679
    670680ifeq ($(OS),MACOS)
    671681
    … …  
    787797
    788798CSSPropertyNames.h : $(WEBCORE_CSS_PROPERTY_NAMES) css/makeprop.pl bindings/scripts/preprocessor.pm $(PLATFORM_FEATURE_DEFINES)
    789         perl -pe '' $(WEBCORE_CSS_PROPERTY_NAMES) > CSSPropertyNames.in
    790         perl -I$(WebCore)/bindings/scripts "$(WebCore)/css/makeprop.pl" --defines "$(FEATURE_DEFINES)"
     799        $(PERL) -pe '' $(WEBCORE_CSS_PROPERTY_NAMES) > CSSPropertyNames.in
     800        $(PERL) -I$(WebCore)/bindings/scripts "$(WebCore)/css/makeprop.pl" --defines "$(FEATURE_DEFINES)"
    791801
    792802CSSValueKeywords.h : $(WEBCORE_CSS_VALUE_KEYWORDS) css/makevalues.pl bindings/scripts/preprocessor.pm $(PLATFORM_FEATURE_DEFINES)
    793         perl -pe '' $(WEBCORE_CSS_VALUE_KEYWORDS) > CSSValueKeywords.in
    794         perl -I$(WebCore)/bindings/scripts "$(WebCore)/css/makevalues.pl" --defines "$(FEATURE_DEFINES)"
     803        $(PERL) -pe '' $(WEBCORE_CSS_VALUE_KEYWORDS) > CSSValueKeywords.in
     804        $(PERL) -I$(WebCore)/bindings/scripts "$(WebCore)/css/makevalues.pl" --defines "$(FEATURE_DEFINES)"
    795805
    796806# --------
    … …  
    800810WEBCORE_CSS_SELECTOR_PSEUDO_TYPE_MAP_KEYWORDS := $(WebCore)/css/SelectorPseudoClassAndCompatibilityElementMap.in
    801811SelectorPseudoClassAndCompatibilityElementMap.cpp : $(WebCore)/css/makeSelectorPseudoClassAndCompatibilityElementMap.py $(WEBCORE_CSS_SELECTOR_PSEUDO_TYPE_MAP_KEYWORDS)
    802         python "$(WebCore)/css/makeSelectorPseudoClassAndCompatibilityElementMap.py" $(WEBCORE_CSS_SELECTOR_PSEUDO_TYPE_MAP_KEYWORDS) "$(FEATURE_DEFINES)"
     812        $(PYTHON) "$(WebCore)/css/makeSelectorPseudoClassAndCompatibilityElementMap.py" $(WEBCORE_CSS_SELECTOR_PSEUDO_TYPE_MAP_KEYWORDS) "$(FEATURE_DEFINES)"
    803813
    804814WEBCORE_CSS_SELECTOR_PSEUDO_ELEMENTS_TYPE_MAP_KEYWORDS := $(WebCore)/css/SelectorPseudoElementTypeMap.in
    805815SelectorPseudoElementTypeMap.cpp : $(WebCore)/css/makeSelectorPseudoElementsMap.py $(WEBCORE_CSS_SELECTOR_PSEUDO_ELEMENTS_TYPE_MAP_KEYWORDS)
    806         python "$(WebCore)/css/makeSelectorPseudoElementsMap.py" $(WEBCORE_CSS_SELECTOR_PSEUDO_ELEMENTS_TYPE_MAP_KEYWORDS) "$(FEATURE_DEFINES)"
     816        $(PYTHON) "$(WebCore)/css/makeSelectorPseudoElementsMap.py" $(WEBCORE_CSS_SELECTOR_PSEUDO_ELEMENTS_TYPE_MAP_KEYWORDS) "$(FEATURE_DEFINES)"
    807817
    808818# --------
    … …  
    813823
    814824XMLViewerCSS.h : xml/XMLViewer.css
    815         python $(InspectorScripts)/cssmin.py <"$(WebCore)/xml/XMLViewer.css" > ./XMLViewer.min.css
    816         perl $(InspectorScripts)/xxd.pl XMLViewer_css ./XMLViewer.min.css XMLViewerCSS.h
     825        $(PYTHON) $(InspectorScripts)/cssmin.py <"$(WebCore)/xml/XMLViewer.css" > ./XMLViewer.min.css
     826        $(PERL) $(InspectorScripts)/xxd.pl XMLViewer_css ./XMLViewer.min.css XMLViewerCSS.h
    817827        rm -f ./XMLViewer.min.css
    818828
    … …  
    824834
    825835XMLViewerJS.h : xml/XMLViewer.js
    826         python $(InspectorScripts)/jsmin.py <"$(WebCore)/xml/XMLViewer.js" > ./XMLViewer.min.js
    827         perl $(InspectorScripts)/xxd.pl XMLViewer_js ./XMLViewer.min.js XMLViewerJS.h
     836        $(PYTHON) $(InspectorScripts)/jsmin.py <"$(WebCore)/xml/XMLViewer.js" > ./XMLViewer.min.js
     837        $(PERL) $(InspectorScripts)/xxd.pl XMLViewer_js ./XMLViewer.min.js XMLViewerJS.h
    828838        rm -f ./XMLViewer.min.js
    829839
    … …  
    833843
    834844HTMLEntityTable.cpp : html/parser/HTMLEntityNames.in $(WebCore)/html/parser/create-html-entity-table
    835         python $(WebCore)/html/parser/create-html-entity-table -o HTMLEntityTable.cpp $(WebCore)/html/parser/HTMLEntityNames.in
     845        $(PYTHON) $(WebCore)/html/parser/create-html-entity-table -o HTMLEntityTable.cpp $(WebCore)/html/parser/HTMLEntityNames.in
    836846
    837847# --------
    … …  
    840850
    841851ColorData.cpp : platform/ColorData.gperf $(WebCore)/make-hash-tools.pl
    842         perl $(WebCore)/make-hash-tools.pl . $(WebCore)/platform/ColorData.gperf
     852        $(PERL) $(WebCore)/make-hash-tools.pl . $(WebCore)/platform/ColorData.gperf
    843853
    844854# --------
    … …  
    856866# CSS grammar
    857867CSSGrammar.cpp : css/CSSGrammar.y.in $(PLATFORM_FEATURE_DEFINES)
    858         perl -I $(WebCore)/bindings/scripts $(WebCore)/css/makegrammar.pl --extraDefines "$(FEATURE_DEFINES)" --outputDir . --bison "$(BISON)" --symbolsPrefix cssyy $<
     868        $(PERL) -I $(WebCore)/bindings/scripts $(WebCore)/css/makegrammar.pl --extraDefines "$(FEATURE_DEFINES)" --outputDir . --bison "$(BISON)" --symbolsPrefix cssyy $<
    859869
    860870# --------
    … …  
    862872# XPath grammar
    863873XPathGrammar.cpp : xml/XPathGrammar.y $(PROJECT_FILE)
    864         perl $(WebCore)/css/makegrammar.pl --outputDir . --bison "$(BISON)" --symbolsPrefix xpathyy $<
     874        $(PERL) $(WebCore)/css/makegrammar.pl --outputDir . --bison "$(BISON)" --symbolsPrefix xpathyy $<
    865875
    866876# --------
    … …  
    892902
    893903UserAgentStyleSheets.h : css/make-css-file-arrays.pl bindings/scripts/preprocessor.pm $(USER_AGENT_STYLE_SHEETS) $(PLATFORM_FEATURE_DEFINES)
    894         perl -I$(WebCore)/bindings/scripts $< --defines "$(FEATURE_DEFINES)" $@ UserAgentStyleSheetsData.cpp $(USER_AGENT_STYLE_SHEETS)
     904        $(PERL) -I$(WebCore)/bindings/scripts $< --defines "$(FEATURE_DEFINES)" $@ UserAgentStyleSheetsData.cpp $(USER_AGENT_STYLE_SHEETS)
    895905
    896906# --------
    … …  
    908918
    909919UserAgentScripts.h : Scripts/make-js-file-arrays.py $(USER_AGENT_SCRIPTS)
    910         PYTHONPATH=$(InspectorScripts) python $< $@ UserAgentScriptsData.cpp $(USER_AGENT_SCRIPTS)
     920        PYTHONPATH=$(InspectorScripts) $(PYTHON) $< $@ UserAgentScriptsData.cpp $(USER_AGENT_SCRIPTS)
    911921endif
    912922
    … …  
    918928
    919929PlugInsResources.h : css/make-css-file-arrays.pl bindings/scripts/preprocessor.pm $(PLUG_INS_RESOURCES) $(PLATFORM_FEATURE_DEFINES)
    920         perl -I$(WebCore)/bindings/scripts $< --defines "$(FEATURE_DEFINES)" $@ PlugInsResourcesData.cpp $(PLUG_INS_RESOURCES)
     930        $(PERL) -I$(WebCore)/bindings/scripts $< --defines "$(FEATURE_DEFINES)" $@ PlugInsResourcesData.cpp $(PLUG_INS_RESOURCES)
    921931
    922932# --------
    923933
    924934WebKitFontFamilyNames.cpp WebKitFontFamilyNames.h : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm css/WebKitFontFamilyNames.in
    925         perl -I $(WebCore)/bindings/scripts $< --fonts $(WebCore)/css/WebKitFontFamilyNames.in
     935        $(PERL) -I $(WebCore)/bindings/scripts $< --fonts $(WebCore)/css/WebKitFontFamilyNames.in
    926936
    927937# HTML tag and attribute names
    … …  
    970980
    971981HTMLElementFactory.cpp HTMLNames.cpp JSHTMLElementWrapperFactory.cpp : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm html/HTMLTagNames.in html/HTMLAttributeNames.in
    972         perl -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(WebCore)/html/HTMLAttributeNames.in --factory --wrapperFactory --extraDefines "$(HTML_FLAGS)"
     982        $(PERL) -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(WebCore)/html/HTMLAttributeNames.in --factory --wrapperFactory --extraDefines "$(HTML_FLAGS)"
    973983
    974984else
    975985
    976986HTMLElementFactory.cpp HTMLNames.cpp JSHTMLElementWrapperFactory.cpp : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm html/HTMLTagNames.in html/HTMLAttributeNames.in
    977         perl -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(WebCore)/html/HTMLAttributeNames.in --factory --wrapperFactory
     987        $(PERL) -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(WebCore)/html/HTMLAttributeNames.in --factory --wrapperFactory
    978988
    979989endif
    980990
    981991XMLNSNames.cpp : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm xml/xmlnsattrs.in
    982         perl -I $(WebCore)/bindings/scripts $< --attrs $(WebCore)/xml/xmlnsattrs.in
     992        $(PERL) -I $(WebCore)/bindings/scripts $< --attrs $(WebCore)/xml/xmlnsattrs.in
    983993
    984994XMLNames.cpp : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm xml/xmlattrs.in
    985         perl -I $(WebCore)/bindings/scripts $< --attrs $(WebCore)/xml/xmlattrs.in
     995        $(PERL) -I $(WebCore)/bindings/scripts $< --attrs $(WebCore)/xml/xmlattrs.in
    986996
    987997# --------
    … …  
    10021012
    10031013JSSVGElementWrapperFactory.cpp SVGElementFactory.cpp SVGNames.cpp : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm svg/svgtags.in svg/svgattrs.in
    1004         perl -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in --extraDefines "$(SVG_FLAGS)" --factory --wrapperFactory
     1014        $(PERL) -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in --extraDefines "$(SVG_FLAGS)" --factory --wrapperFactory
    10051015else
    10061016
    10071017JSSVGElementWrapperFactory.cpp SVGElementFactory.cpp SVGNames.cpp : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm svg/svgtags.in svg/svgattrs.in
    1008         perl -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in --factory --wrapperFactory
     1018        $(PERL) -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in --factory --wrapperFactory
    10091019
    10101020endif
    10111021
    10121022XLinkNames.cpp : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm svg/xlinkattrs.in
    1013         perl -I $(WebCore)/bindings/scripts $< --attrs $(WebCore)/svg/xlinkattrs.in
     1023        $(PERL) -I $(WebCore)/bindings/scripts $< --attrs $(WebCore)/svg/xlinkattrs.in
    10141024
    10151025# --------
    … …  
    10181028
    10191029EventFactory.cpp EventHeaders.h EventInterfaces.h : dom/make_event_factory.pl dom/EventNames.in
    1020         perl -I $(WebCore)/bindings/scripts $< --input $(WebCore)/dom/EventNames.in
     1030        $(PERL) -I $(WebCore)/bindings/scripts $< --input $(WebCore)/dom/EventNames.in
    10211031
    10221032EventTargetHeaders.h EventTargetInterfaces.h : dom/make_event_factory.pl dom/EventTargetFactory.in
    1023         perl -I $(WebCore)/bindings/scripts $< --input $(WebCore)/dom/EventTargetFactory.in
     1033        $(PERL) -I $(WebCore)/bindings/scripts $< --input $(WebCore)/dom/EventTargetFactory.in
    10241034
    10251035ExceptionCodeDescription.cpp ExceptionCodeDescription.h ExceptionHeaders.h ExceptionInterfaces.h : dom/make_dom_exceptions.pl dom/DOMExceptions.in
    1026         perl -I $(WebCore)/bindings/scripts $< --input $(WebCore)/dom/DOMExceptions.in
     1036        $(PERL) -I $(WebCore)/bindings/scripts $< --input $(WebCore)/dom/DOMExceptions.in
    10271037
    10281038# --------
    … …  
    10311041
    10321042MathMLElementFactory.cpp MathMLNames.cpp : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm mathml/mathtags.in mathml/mathattrs.in
    1033         perl -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/mathml/mathtags.in --attrs $(WebCore)/mathml/mathattrs.in --factory --wrapperFactory
     1043        $(PERL) -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/mathml/mathtags.in --attrs $(WebCore)/mathml/mathattrs.in --factory --wrapperFactory
    10341044
    10351045# --------
    10361046
    10371047InternalSettingsGenerated.idl InternalSettingsGenerated.cpp InternalSettingsGenerated.h SettingsMacros.h : page/make_settings.pl page/Settings.in
    1038         perl -I $(WebCore)/bindings/scripts $< --input $(WebCore)/page/Settings.in
     1048        $(PERL) -I $(WebCore)/bindings/scripts $< --input $(WebCore)/page/Settings.in
    10391049
    10401050# --------
    … …  
    10511061    bindings/scripts/preprocess-idls.pl
    10521062
    1053 generator_script = perl $(addprefix -I $(WebCore)/, $(sort $(dir $(1)))) $(WebCore)/bindings/scripts/generate-bindings.pl
    1054 
    1055 preprocess_idls_script = perl $(addprefix -I $(WebCore)/, $(sort $(dir $(1)))) $(WebCore)/bindings/scripts/preprocess-idls.pl
     1063generator_script = $(PERL) $(addprefix -I $(WebCore)/, $(sort $(dir $(1)))) $(WebCore)/bindings/scripts/generate-bindings.pl
     1064
     1065preprocess_idls_script = $(PERL) $(addprefix -I $(WebCore)/, $(sort $(dir $(1)))) $(WebCore)/bindings/scripts/preprocess-idls.pl
    10561066
    10571067# JS bindings generator
    … …  
    11451155
    11461156InspectorWeb.json : $(InspectorScripts)/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS) EnabledInspectorDomains
    1147         python $(InspectorScripts)/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS) > ./InspectorWeb.json
     1157        $(PYTHON) $(InspectorScripts)/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS) > ./InspectorWeb.json
    11481158
    11491159all : InspectorWebFrontendDispatchers.h
    11501160
    11511161InspectorWebFrontendDispatchers.h : InspectorWeb.json $(InspectorScripts)/InspectorJS.json $(INSPECTOR_GENERATOR_SCRIPTS)
    1152         python $(InspectorScripts)/CodeGeneratorInspector.py ./InspectorWeb.json $(InspectorScripts)/InspectorJS.json --output_h_dir . --output_cpp_dir . --output_js_dir . --output_type Web
     1162        $(PYTHON) $(InspectorScripts)/CodeGeneratorInspector.py ./InspectorWeb.json $(InspectorScripts)/InspectorJS.json --output_h_dir . --output_cpp_dir . --output_js_dir . --output_type Web
    11531163
    11541164all : InspectorOverlayPage.h
    11551165
    11561166InspectorOverlayPage.h : InspectorOverlayPage.html InspectorOverlayPage.css InspectorOverlayPage.js
    1157         python $(InspectorScripts)/inline-and-minify-stylesheets-and-scripts.py $(WebCore)/inspector/InspectorOverlayPage.html ./InspectorOverlayPage.combined.html
    1158         perl $(InspectorScripts)/xxd.pl InspectorOverlayPage_html ./InspectorOverlayPage.combined.html InspectorOverlayPage.h
     1167        $(PYTHON) $(InspectorScripts)/inline-and-minify-stylesheets-and-scripts.py $(WebCore)/inspector/InspectorOverlayPage.html ./InspectorOverlayPage.combined.html
     1168        $(PERL) $(InspectorScripts)/xxd.pl InspectorOverlayPage_html ./InspectorOverlayPage.combined.html InspectorOverlayPage.h
    11591169        rm -f ./InspectorOverlayPage.combined.html
    11601170
    … …  
    11621172
    11631173CommandLineAPIModuleSource.h : CommandLineAPIModuleSource.js
    1164         python $(InspectorScripts)/jsmin.py <$(WebCore)/inspector/CommandLineAPIModuleSource.js > ./CommandLineAPIModuleSource.min.js
    1165         perl $(InspectorScripts)/xxd.pl CommandLineAPIModuleSource_js ./CommandLineAPIModuleSource.min.js CommandLineAPIModuleSource.h
     1174        $(PYTHON) $(InspectorScripts)/jsmin.py <$(WebCore)/inspector/CommandLineAPIModuleSource.js > ./CommandLineAPIModuleSource.min.js
     1175        $(PERL) $(InspectorScripts)/xxd.pl CommandLineAPIModuleSource_js ./CommandLineAPIModuleSource.min.js CommandLineAPIModuleSource.h
    11661176        rm -f ./CommandLineAPIModuleSource.min.js
    11671177
    … …  
    11801190
    11811191WebReplayInputs.h : $(INPUT_GENERATOR_SPECIFICATIONS) $(INPUT_GENERATOR_SCRIPTS)
    1182         python $(WebReplayScripts)/CodeGeneratorReplayInputs.py --outputDir . --framework WebCore $(INPUT_GENERATOR_SPECIFICATIONS)
     1192        $(PYTHON) $(WebReplayScripts)/CodeGeneratorReplayInputs.py --outputDir . --framework WebCore $(INPUT_GENERATOR_SPECIFICATIONS)
    11831193
    11841194-include $(JS_DOM_HEADERS:.h=.dep)
    … …  
    12091219
    12101220CharsetData.cpp : platform/text/mac/make-charset-table.pl platform/text/mac/character-sets.txt platform/text/mac/$(ENCODINGS_FILENAME)
    1211         perl $^ kTextEncoding > $@
     1221        $(PERL) $^ kTextEncoding > $@
    12121222
    12131223# --------

  • trunk/Source/WebInspectorUI/ChangeLog

    r167509 r167685  
     12014-04-22  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Win] Support Python 2.7 in Cygwin
     4        https://bugs.webkit.org/show_bug.cgi?id=132023
     5
     6        Reviewed by Michael Saboff.
     7
     8        * WebInspectorUI.vcxproj/build-webinspectorui.sh: use
     9        proper path to Python under Cygwin.
     10
    1112014-04-18  Katie Madonna  <madonnk@gmail.com>
    212

  • trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.sh

    r166962 r167685  
    4646fi
    4747
    48 perl "${SRCROOT}/Scripts/copy-user-interface-resources.pl"
     48/usr/bin/perl "${SRCROOT}/Scripts/copy-user-interface-resources.pl"

  • trunk/Source/WebKit/ChangeLog

    r167587 r167685  
     12014-04-22  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Win] Support Python 2.7 in Cygwin
     4        https://bugs.webkit.org/show_bug.cgi?id=132023
     5
     6        Reviewed by Michael Saboff.
     7
     8        * WebKit.vcxproj/WebKit/WebKitVersion.cmd: Use correct
     9        path to Python under Cygwin.
     10
    1112014-04-20  Andreas Kling  <akling@apple.com>
    212

  • trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitVersion.cmd

    r160465 r167685  
    55set PATH=%SystemDrive%\cygwin\bin;%PATH%
    66
    7 bash -c 'perl "%WEBKITVERSIONSCRIPT%" --config "%WEBKITVERSIONCONFIG%"  --outputDir "%WEBKITVERSIONDIR%"'
     7bash -c '/usr/bin/perl "%WEBKITVERSIONSCRIPT%" --config "%WEBKITVERSIONCONFIG%"  --outputDir "%WEBKITVERSIONDIR%"'

  • trunk/Tools/ChangeLog

    r167671 r167685  
     12014-04-22  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Win] Support Python 2.7 in Cygwin
     4        https://bugs.webkit.org/show_bug.cgi?id=132023
     5
     6        Reviewed by Michael Saboff.
     7
     8        * Scripts/webkitdirs.pm:
     9        (checkInstalledTools): Remove check for Python 2.7, since
     10        it now works properly.
     11
    1122014-04-22  Filip Pizlo  <fpizlo@apple.com>
    213

  • trunk/Tools/Scripts/webkitdirs.pm

    r167482 r167685  
    14141414    }
    14151415
    1416     # Python 2.7.3 as shipped by Cygwin prevents the build from completing due to some issue with handling of
    14171416    # environment variables. Avoid until this is corrected.
    14181417    my $pythonVer = `python --version 2>&1`;
    14191418    die "You must have Python installed to build WebKit.\n" if ($?);
    1420     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/);
    14211419
    14221420    # cURL 7.34.0 has a bug that prevents authentication with opensource.apple.com (and other things using SSL3).
Note: See TracChangeset for help on using the changeset viewer.