Changeset 109036 in webkit
- Timestamp:
- Feb 27, 2012 4:07:01 PM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 10 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r109035 r109036 1 2012-02-27 Kentaro Hara <haraken@chromium.org> 2 3 Rename resolve-supplemental.pl to preprocess-idls.pl 4 https://bugs.webkit.org/show_bug.cgi?id=79660 5 6 Reviewed by Adam Barth. 7 8 Due to r108322, resolve-supplemental.pl not only resolves supplemental 9 dependencies but also runs IDL attribute checker. For clarification, 10 this patch renames resolve-supplemental.pl to preprocess-idls.pl. 11 12 No tests. Confirm that all builds pass. 13 14 * DerivedSources.make: 15 * DerivedSources.pri: 16 * GNUmakefile.am: 17 * UseJSC.cmake: 18 * UseV8.cmake: 19 * WebCore.gyp/WebCore.gyp: 20 * WebCore.vcproj/MigrateScripts: 21 * WebCore.vcproj/WebCore.vcproj: 22 * WebCore.xcodeproj/project.pbxproj: 23 * bindings/scripts/preprocess-idls.pl: Renamed from Source/WebCore/bindings/scripts/resolve-supplemental.pl. 24 1 25 2012-02-27 Kentaro Hara <haraken@chromium.org> 2 26 -
trunk/Source/WebCore/DerivedSources.make
r108930 r109036 894 894 bindings/scripts/preprocessor.pm 895 895 896 RESOLVE_SUPPLEMENTAL_SCRIPTS = \896 PREPROCESS_IDLS_SCRIPTS = \ 897 897 bindings/scripts/IDLParser.pm \ 898 bindings/scripts/ resolve-supplemental.pl898 bindings/scripts/preprocess-idls.pl 899 899 900 900 generator_script = perl $(addprefix -I $(WebCore)/, $(sort $(dir $(1)))) $(WebCore)/bindings/scripts/generate-bindings.pl 901 901 902 resolve_supplemental_script = perl $(addprefix -I $(WebCore)/, $(sort $(dir $(1)))) $(WebCore)/bindings/scripts/resolve-supplemental.pl902 preprocess_idls_script = perl $(addprefix -I $(WebCore)/, $(sort $(dir $(1)))) $(WebCore)/bindings/scripts/preprocess-idls.pl 903 903 904 904 # JS bindings generator … … 928 928 space += 929 929 930 $(SUPPLEMENTAL_DEPENDENCY_FILE) : $( RESOLVE_SUPPLEMENTAL_SCRIPTS) $(BINDING_IDLS) $(ADDITIONAL_IDLS) $(IDL_ATTRIBUTES_FILE)930 $(SUPPLEMENTAL_DEPENDENCY_FILE) : $(PREPROCESS_IDLS_SCRIPTS) $(BINDING_IDLS) $(ADDITIONAL_IDLS) $(IDL_ATTRIBUTES_FILE) 931 931 printf "$(subst $(space),,$(patsubst %,%\n,$(BINDING_IDLS) $(ADDITIONAL_IDLS)))" > $(IDL_FILES_TMP) 932 $(call resolve_supplemental_script, $(RESOLVE_SUPPLEMENTAL_SCRIPTS)) --defines "$(FEATURE_DEFINES) $(ADDITIONAL_IDL_DEFINES) LANGUAGE_JAVASCRIPT" --idlFilesList $(IDL_FILES_TMP) --supplementalDependencyFile $@ --idlAttributesFile $(IDL_ATTRIBUTES_FILE)932 $(call preprocess_idls_script, $(PREPROCESS_IDLS_SCRIPTS)) --defines "$(FEATURE_DEFINES) $(ADDITIONAL_IDL_DEFINES) LANGUAGE_JAVASCRIPT" --idlFilesList $(IDL_FILES_TMP) --supplementalDependencyFile $@ --idlAttributesFile $(IDL_ATTRIBUTES_FILE) 933 933 rm -f $(IDL_FILES_TMP) 934 934 -
trunk/Source/WebCore/DerivedSources.pri
r108930 r109036 666 666 SUPPLEMENTAL_DEPENDENCY_FILE = supplemental_dependency.tmp 667 667 IDL_FILES_TMP = ${QMAKE_FUNC_FILE_OUT_PATH}/idl_files.tmp 668 RESOLVE_SUPPLEMENTAL_SCRIPT = $$PWD/bindings/scripts/resolve-supplemental.pl668 PREPROCESS_IDLS_SCRIPT = $$PWD/bindings/scripts/preprocess-idls.pl 669 669 IDL_ATTRIBUTES_FILE = $$PWD/bindings/scripts/IDLAttributes.txt 670 670 671 resolveSupplemental.input = IDL_ATTRIBUTES_FILE672 resolveSupplemental.script = $$RESOLVE_SUPPLEMENTAL_SCRIPT671 preprocessIdls.input = IDL_ATTRIBUTES_FILE 672 preprocessIdls.script = $$PREPROCESS_IDLS_SCRIPT 673 673 # FIXME : We need to use only perl at some point. 674 resolveSupplemental.commands = echo $$IDL_BINDINGS | tr \' \' \'\\n\' > $$IDL_FILES_TMP && \675 perl -I$$PWD/bindings/scripts $$ resolveSupplemental.script \674 preprocessIdls.commands = echo $$IDL_BINDINGS | tr \' \' \'\\n\' > $$IDL_FILES_TMP && \ 675 perl -I$$PWD/bindings/scripts $$preprocessIdls.script \ 676 676 --defines \"$${FEATURE_DEFINES_JAVASCRIPT}\" \ 677 677 --idlFilesList $$IDL_FILES_TMP \ … … 679 679 --idlAttributesFile $${IDL_ATTRIBUTES_FILE} \ 680 680 --preprocessor \"$${QMAKE_MOC} -E\" 681 resolveSupplemental.output = $$SUPPLEMENTAL_DEPENDENCY_FILE682 resolveSupplemental.add_output_to_sources = false683 resolveSupplemental.depends = $$PWD/bindings/scripts/IDLParser.pm $$IDL_BINDINGS684 GENERATORS += resolveSupplemental681 preprocessIdls.output = $$SUPPLEMENTAL_DEPENDENCY_FILE 682 preprocessIdls.add_output_to_sources = false 683 preprocessIdls.depends = $$PWD/bindings/scripts/IDLParser.pm $$IDL_BINDINGS 684 GENERATORS += preprocessIdls 685 685 686 686 # GENERATOR 1: Generate .h and .cpp from IDLs -
trunk/Source/WebCore/GNUmakefile.am
r108985 r109036 688 688 $(WebCore)/bindings/scripts/preprocessor.pm 689 689 690 SCRIPTS_FOR_ RESOLVE_SUPPLEMENTAL= \690 SCRIPTS_FOR_PREPROCESS_IDLS = \ 691 691 $(WebCore)/bindings/scripts/IDLParser.pm \ 692 $(WebCore)/bindings/scripts/ resolve-supplemental.pl692 $(WebCore)/bindings/scripts/preprocess-idls.pl 693 693 694 694 DerivedSources/WebCore/UserAgentStyleSheetsData.cpp: DerivedSources/WebCore/UserAgentStyleSheets.h … … 793 793 794 794 .SECONDARY: 795 $(supplemental_dependency_file): $(SCRIPTS_FOR_ RESOLVE_SUPPLEMENTAL) $(dom_binding_idls) $(idl_attributes_file)795 $(supplemental_dependency_file): $(SCRIPTS_FOR_PREPROCESS_IDLS) $(dom_binding_idls) $(idl_attributes_file) 796 796 $(AM_V_GEN) 797 797 $(AM_V_at)echo -n > $(idl_files_list) 798 798 $(AM_V_at)($(foreach idl, $(dom_binding_idls), echo $(idl) &&) echo -n) >> $(idl_files_list) 799 $(AM_V_at)$(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/ resolve-supplemental.pl --defines "LANGUAGE_JAVASCRIPT=1 $(FEATURE_DEFINES)" --idlFilesList $(idl_files_list) --supplementalDependencyFile $@ --idlAttributesFile $(idl_attributes_file)799 $(AM_V_at)$(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/preprocess-idls.pl --defines "LANGUAGE_JAVASCRIPT=1 $(FEATURE_DEFINES)" --idlFilesList $(idl_files_list) --supplementalDependencyFile $@ --idlAttributesFile $(idl_attributes_file) 800 800 801 801 # This does not appear to work correctly with gnumake unless … … 936 936 Source/WebCore/bindings/scripts/gobject-generate-headers.pl \ 937 937 Source/WebCore/bindings/scripts/preprocessor.pm \ 938 Source/WebCore/bindings/scripts/ resolve-supplemental.pl \938 Source/WebCore/bindings/scripts/preprocess-idls.pl \ 939 939 Source/WebCore/ChangeLog \ 940 940 Source/WebCore/css/CSSGrammar.y \ -
trunk/Source/WebCore/UseJSC.cmake
r108404 r109036 268 268 ADD_CUSTOM_COMMAND( 269 269 OUTPUT ${SUPPLEMENTAL_DEPENDENCY_FILE} 270 DEPENDS ${WEBCORE_DIR}/bindings/scripts/ resolve-supplemental.pl ${SCRIPTS_RESOLVE_SUPPLEMENTAL} ${WebCore_IDL_FILES} ${IDL_ATTRIBUTES_FILE}271 COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/ resolve-supplemental.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --idlFilesList ${IDL_FILES_TMP} --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --supplementalDependencyFile ${SUPPLEMENTAL_DEPENDENCY_FILE} --idlAttributesFile ${IDL_ATTRIBUTES_FILE}270 DEPENDS ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl ${SCRIPTS_PREPROCESS_IDLS} ${WebCore_IDL_FILES} ${IDL_ATTRIBUTES_FILE} 271 COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --idlFilesList ${IDL_FILES_TMP} --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --supplementalDependencyFile ${SUPPLEMENTAL_DEPENDENCY_FILE} --idlAttributesFile ${IDL_ATTRIBUTES_FILE} 272 272 VERBATIM) 273 273 -
trunk/Source/WebCore/UseV8.cmake
r108404 r109036 254 254 ADD_CUSTOM_COMMAND( 255 255 OUTPUT ${SUPPLEMENTAL_DEPENDENCY_FILE} 256 DEPENDS ${WEBCORE_DIR}/bindings/scripts/ resolve-supplemental.pl ${SCRIPTS_RESOLVE_SUPPLEMENTAL} ${WebCore_IDL_FILES} ${IDL_ATTRIBUTES_FILE}257 COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/ resolve-supplemental.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --idlFilesList ${IDL_FILES_TMP} --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --supplementalDependencyFile ${SUPPLEMENTAL_DEPENDENCY_FILE} --idlAttributesFile ${IDL_ATTRIBUTES_FILE}256 DEPENDS ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl ${SCRIPTS_PREPROCESS_IDLS} ${WebCore_IDL_FILES} ${IDL_ATTRIBUTES_FILE} 257 COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --idlFilesList ${IDL_FILES_TMP} --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --supplementalDependencyFile ${SUPPLEMENTAL_DEPENDENCY_FILE} --idlAttributesFile ${IDL_ATTRIBUTES_FILE} 258 258 VERBATIM) 259 259 -
trunk/Source/WebCore/WebCore.gyp/WebCore.gyp
r108960 r109036 478 478 }, 479 479 'inputs': [ 480 '../bindings/scripts/ resolve-supplemental.pl',480 '../bindings/scripts/preprocess-idls.pl', 481 481 '../bindings/scripts/IDLParser.pm', 482 482 '../bindings/scripts/IDLAttributes.txt', … … 491 491 '-w', 492 492 '-I../bindings/scripts', 493 '../bindings/scripts/ resolve-supplemental.pl',493 '../bindings/scripts/preprocess-idls.pl', 494 494 '--defines', 495 495 '<(feature_defines) LANGUAGE_JAVASCRIPT V8_BINDING', -
trunk/Source/WebCore/WebCore.vcproj/MigrateScripts
r103918 r109036 32 32 $(WEBKIT_OUTPUT)/generate-bindings.pl \ 33 33 $(WEBKIT_OUTPUT)/preprocessor.pm \ 34 $(WEBKIT_OUTPUT)/ resolve-supplemental.pl \34 $(WEBKIT_OUTPUT)/preprocess-idls.pl \ 35 35 # 36 36 -
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
r108997 r109036 69110 69110 </File> 69111 69111 <File 69112 RelativePath="..\bindings\scripts\ resolve-supplemental.pl"69112 RelativePath="..\bindings\scripts\preprocess-idls.pl" 69113 69113 > 69114 69114 </File> -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r108976 r109036 10693 10693 A83B535B14F7413A00720D9D /* DOMWindowWebGL.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DOMWindowWebGL.idl; path = canvas/DOMWindowWebGL.idl; sourceTree = "<group>"; }; 10694 10694 A83B536C14F749E200720D9D /* DOMWindowXML.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DOMWindowXML.idl; sourceTree = "<group>"; }; 10695 A83B538014FBB2EC00720D9D /* preprocess-idls.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; name = "preprocess-idls.pl"; path = "scripts/preprocess-idls.pl"; sourceTree = "<group>"; }; 10695 10696 A83B78F20CCAFF15000B0825 /* JSSVGFontFaceUriElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSVGFontFaceUriElement.h; sourceTree = "<group>"; }; 10696 10697 A83B78F30CCAFF15000B0825 /* JSSVGFontFaceUriElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGFontFaceUriElement.cpp; sourceTree = "<group>"; }; … … 11046 11047 A8EA80050A19516E00A8EF5F /* StyleSheet.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = StyleSheet.cpp; sourceTree = "<group>"; }; 11047 11048 A8EA80060A19516E00A8EF5F /* MediaList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MediaList.h; sourceTree = "<group>"; }; 11048 A8F4578F14B2B004000CEA59 /* resolve-supplemental.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; name = "resolve-supplemental.pl"; path = "scripts/resolve-supplemental.pl"; sourceTree = "<group>"; };11049 11049 A8F4579D14BC13EC000CEA59 /* DOMWindowSQLDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMWindowSQLDatabase.cpp; sourceTree = "<group>"; }; 11050 11050 A8F4579E14BC13EC000CEA59 /* DOMWindowSQLDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMWindowSQLDatabase.h; sourceTree = "<group>"; }; … … 19251 19251 isa = PBXGroup; 19252 19252 children = ( 19253 A83B538014FBB2EC00720D9D /* preprocess-idls.pl */, 19253 19254 B5D31DF711CF60E5009F22B4 /* generic */, 19254 19255 BC1A3793097C6FB10019F3D8 /* js */, … … 19260 19261 93F8B3080A300FEA00F61AB8 /* IDLStructure.pm */, 19261 19262 C0F2A43F13869A280066C534 /* preprocessor.pm */, 19262 A8F4578F14B2B004000CEA59 /* resolve-supplemental.pl */,19263 19263 8C6EA61711EF7E0400FD8EE3 /* RuntimeEnabledFeatures.cpp */, 19264 19264 8C6EA61811EF7E0400FD8EE3 /* RuntimeEnabledFeatures.h */,
Note: See TracChangeset
for help on using the changeset viewer.