Changeset 109036 in webkit


Ignore:
Timestamp:
Feb 27, 2012 4:07:01 PM (12 years ago)
Author:
haraken@chromium.org
Message:

Rename resolve-supplemental.pl to preprocess-idls.pl
https://bugs.webkit.org/show_bug.cgi?id=79660

Reviewed by Adam Barth.

Due to r108322, resolve-supplemental.pl not only resolves supplemental
dependencies but also runs IDL attribute checker. For clarification,
this patch renames resolve-supplemental.pl to preprocess-idls.pl.

No tests. Confirm that all builds pass.

  • DerivedSources.make:
  • DerivedSources.pri:
  • GNUmakefile.am:
  • UseJSC.cmake:
  • UseV8.cmake:
  • WebCore.gyp/WebCore.gyp:
  • WebCore.vcproj/MigrateScripts:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • bindings/scripts/preprocess-idls.pl: Renamed from Source/WebCore/bindings/scripts/resolve-supplemental.pl.
Location:
trunk/Source/WebCore
Files:
10 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r109035 r109036  
     12012-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
    1252012-02-27  Kentaro Hara  <haraken@chromium.org>
    226
  • trunk/Source/WebCore/DerivedSources.make

    r108930 r109036  
    894894    bindings/scripts/preprocessor.pm
    895895
    896 RESOLVE_SUPPLEMENTAL_SCRIPTS = \
     896PREPROCESS_IDLS_SCRIPTS = \
    897897    bindings/scripts/IDLParser.pm \
    898     bindings/scripts/resolve-supplemental.pl
     898    bindings/scripts/preprocess-idls.pl
    899899
    900900generator_script = perl $(addprefix -I $(WebCore)/, $(sort $(dir $(1)))) $(WebCore)/bindings/scripts/generate-bindings.pl
    901901
    902 resolve_supplemental_script = perl $(addprefix -I $(WebCore)/, $(sort $(dir $(1)))) $(WebCore)/bindings/scripts/resolve-supplemental.pl
     902preprocess_idls_script = perl $(addprefix -I $(WebCore)/, $(sort $(dir $(1)))) $(WebCore)/bindings/scripts/preprocess-idls.pl
    903903
    904904# JS bindings generator
     
    928928space +=
    929929
    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)
    931931        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)
    933933        rm -f $(IDL_FILES_TMP)
    934934
  • trunk/Source/WebCore/DerivedSources.pri

    r108930 r109036  
    666666SUPPLEMENTAL_DEPENDENCY_FILE = supplemental_dependency.tmp
    667667IDL_FILES_TMP = ${QMAKE_FUNC_FILE_OUT_PATH}/idl_files.tmp
    668 RESOLVE_SUPPLEMENTAL_SCRIPT = $$PWD/bindings/scripts/resolve-supplemental.pl
     668PREPROCESS_IDLS_SCRIPT = $$PWD/bindings/scripts/preprocess-idls.pl
    669669IDL_ATTRIBUTES_FILE = $$PWD/bindings/scripts/IDLAttributes.txt
    670670
    671 resolveSupplemental.input = IDL_ATTRIBUTES_FILE
    672 resolveSupplemental.script = $$RESOLVE_SUPPLEMENTAL_SCRIPT
     671preprocessIdls.input = IDL_ATTRIBUTES_FILE
     672preprocessIdls.script = $$PREPROCESS_IDLS_SCRIPT
    673673# 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 \
     674preprocessIdls.commands = echo $$IDL_BINDINGS | tr \' \' \'\\n\' > $$IDL_FILES_TMP && \
     675                               perl -I$$PWD/bindings/scripts $$preprocessIdls.script \
    676676                               --defines \"$${FEATURE_DEFINES_JAVASCRIPT}\" \
    677677                               --idlFilesList $$IDL_FILES_TMP \
     
    679679                               --idlAttributesFile $${IDL_ATTRIBUTES_FILE} \
    680680                               --preprocessor \"$${QMAKE_MOC} -E\"
    681 resolveSupplemental.output = $$SUPPLEMENTAL_DEPENDENCY_FILE
    682 resolveSupplemental.add_output_to_sources = false
    683 resolveSupplemental.depends = $$PWD/bindings/scripts/IDLParser.pm $$IDL_BINDINGS
    684 GENERATORS += resolveSupplemental
     681preprocessIdls.output = $$SUPPLEMENTAL_DEPENDENCY_FILE
     682preprocessIdls.add_output_to_sources = false
     683preprocessIdls.depends = $$PWD/bindings/scripts/IDLParser.pm $$IDL_BINDINGS
     684GENERATORS += preprocessIdls
    685685
    686686# GENERATOR 1: Generate .h and .cpp from IDLs
  • trunk/Source/WebCore/GNUmakefile.am

    r108985 r109036  
    688688        $(WebCore)/bindings/scripts/preprocessor.pm
    689689
    690 SCRIPTS_FOR_RESOLVE_SUPPLEMENTAL = \
     690SCRIPTS_FOR_PREPROCESS_IDLS = \
    691691        $(WebCore)/bindings/scripts/IDLParser.pm \
    692         $(WebCore)/bindings/scripts/resolve-supplemental.pl
     692        $(WebCore)/bindings/scripts/preprocess-idls.pl
    693693
    694694DerivedSources/WebCore/UserAgentStyleSheetsData.cpp: DerivedSources/WebCore/UserAgentStyleSheets.h
     
    793793
    794794.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)
    796796        $(AM_V_GEN)
    797797        $(AM_V_at)echo -n > $(idl_files_list)
    798798        $(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)
    800800
    801801# This does not appear to work correctly with gnumake unless
     
    936936        Source/WebCore/bindings/scripts/gobject-generate-headers.pl \
    937937        Source/WebCore/bindings/scripts/preprocessor.pm \
    938         Source/WebCore/bindings/scripts/resolve-supplemental.pl \
     938        Source/WebCore/bindings/scripts/preprocess-idls.pl \
    939939        Source/WebCore/ChangeLog \
    940940        Source/WebCore/css/CSSGrammar.y \
  • trunk/Source/WebCore/UseJSC.cmake

    r108404 r109036  
    268268ADD_CUSTOM_COMMAND(
    269269    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}
    272272    VERBATIM)
    273273
  • trunk/Source/WebCore/UseV8.cmake

    r108404 r109036  
    254254ADD_CUSTOM_COMMAND(
    255255    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}
    258258    VERBATIM)
    259259
  • trunk/Source/WebCore/WebCore.gyp/WebCore.gyp

    r108960 r109036  
    478478          },
    479479          'inputs': [
    480             '../bindings/scripts/resolve-supplemental.pl',
     480            '../bindings/scripts/preprocess-idls.pl',
    481481            '../bindings/scripts/IDLParser.pm',
    482482            '../bindings/scripts/IDLAttributes.txt',
     
    491491            '-w',
    492492            '-I../bindings/scripts',
    493             '../bindings/scripts/resolve-supplemental.pl',
     493            '../bindings/scripts/preprocess-idls.pl',
    494494            '--defines',
    495495            '<(feature_defines) LANGUAGE_JAVASCRIPT V8_BINDING',
  • trunk/Source/WebCore/WebCore.vcproj/MigrateScripts

    r103918 r109036  
    3232    $(WEBKIT_OUTPUT)/generate-bindings.pl \
    3333    $(WEBKIT_OUTPUT)/preprocessor.pm \
    34     $(WEBKIT_OUTPUT)/resolve-supplemental.pl \
     34    $(WEBKIT_OUTPUT)/preprocess-idls.pl \
    3535#
    3636
  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r108997 r109036  
    6911069110                                </File>
    6911169111                                <File
    69112                                         RelativePath="..\bindings\scripts\resolve-supplemental.pl"
     69112                                        RelativePath="..\bindings\scripts\preprocess-idls.pl"
    6911369113                                        >
    6911469114                                </File>
  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r108976 r109036  
    1069310693                A83B535B14F7413A00720D9D /* DOMWindowWebGL.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DOMWindowWebGL.idl; path = canvas/DOMWindowWebGL.idl; sourceTree = "<group>"; };
    1069410694                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>"; };
    1069510696                A83B78F20CCAFF15000B0825 /* JSSVGFontFaceUriElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSVGFontFaceUriElement.h; sourceTree = "<group>"; };
    1069610697                A83B78F30CCAFF15000B0825 /* JSSVGFontFaceUriElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGFontFaceUriElement.cpp; sourceTree = "<group>"; };
     
    1104611047                A8EA80050A19516E00A8EF5F /* StyleSheet.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = StyleSheet.cpp; sourceTree = "<group>"; };
    1104711048                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>"; };
    1104911049                A8F4579D14BC13EC000CEA59 /* DOMWindowSQLDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMWindowSQLDatabase.cpp; sourceTree = "<group>"; };
    1105011050                A8F4579E14BC13EC000CEA59 /* DOMWindowSQLDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMWindowSQLDatabase.h; sourceTree = "<group>"; };
     
    1925119251                        isa = PBXGroup;
    1925219252                        children = (
     19253                                A83B538014FBB2EC00720D9D /* preprocess-idls.pl */,
    1925319254                                B5D31DF711CF60E5009F22B4 /* generic */,
    1925419255                                BC1A3793097C6FB10019F3D8 /* js */,
     
    1926019261                                93F8B3080A300FEA00F61AB8 /* IDLStructure.pm */,
    1926119262                                C0F2A43F13869A280066C534 /* preprocessor.pm */,
    19262                                 A8F4578F14B2B004000CEA59 /* resolve-supplemental.pl */,
    1926319263                                8C6EA61711EF7E0400FD8EE3 /* RuntimeEnabledFeatures.cpp */,
    1926419264                                8C6EA61811EF7E0400FD8EE3 /* RuntimeEnabledFeatures.h */,
Note: See TracChangeset for help on using the changeset viewer.