Changeset 81479 in webkit


Ignore:
Timestamp:
Mar 18, 2011 9:42:55 AM (13 years ago)
Author:
pfeldman@chromium.org
Message:

2011-03-18 Pavel Feldman <pfeldman@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: migrate from Inspector.idl to InspectorAPI.json for protocol schema definition meta bug.
https://bugs.webkit.org/show_bug.cgi?id=56294

  • CMakeLists.txt:
  • CodeGenerators.pri:
  • DerivedSources.make:
  • GNUmakefile.am:
  • WebCore.gyp/WebCore.gyp:
  • inspector/Inspector.idl: Removed.
  • inspector/Inspector.json: Added.
  • inspector/generate-inspector-idl: Added.
Location:
trunk/Source/WebCore
Files:
2 added
1 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/CMakeLists.txt

    r81198 r81479  
    21432143# All Web Inspector generated files are created with this one call to CodeGeneratorInspector.pm
    21442144ADD_CUSTOM_COMMAND(
     2145    OUTPUT ${DERIVED_SOURCES_DIR}/Inspector.idl
     2146    MAIN_DEPENDENCY inspector/Inspector.json
     2147    DEPENDS ${WEBCORE_DIR}/inspector/generate-inspector-idl ${WEBCORE_DIR}/inspector/Inspector.json
     2148    COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/inspector/generate-inspector-idl -o ${DERIVED_SOURCES_DIR}/Inspector.idl ${WEBCORE_DIR}/inspector/Inspector.json
     2149    VERBATIM)
     2150
     2151ADD_CUSTOM_COMMAND(
    21452152    OUTPUT ${DERIVED_SOURCES_DIR}/InspectorBackendDispatcher.cpp ${DERIVED_SOURCES_DIR}/InspectorBackendDispatcher.h ${DERIVED_SOURCES_DIR}/InspectorFrontend.cpp ${DERIVED_SOURCES_DIR}/InspectorFrontend.h
    2146     MAIN_DEPENDENCY inspector/Inspector.idl
    2147     DEPENDS ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl ${SCRIPTS_BINDINGS} ${WEBCORE_DIR}/inspector/CodeGeneratorInspector.pm inspector/Inspector.idl
    2148     COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts -I${WEBCORE_DIR}/inspector ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --generator Inspector ${IDL_INCLUDES} --outputDir "${DERIVED_SOURCES_DIR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" ${WEBCORE_DIR}/inspector/Inspector.idl
     2153    MAIN_DEPENDENCY ${DERIVED_SOURCES_DIR}/Inspector.idl
     2154    DEPENDS ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl ${SCRIPTS_BINDINGS} ${WEBCORE_DIR}/inspector/CodeGeneratorInspector.pm ${DERIVED_SOURCES_DIR}/Inspector.idl
     2155    COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts -I${WEBCORE_DIR}/inspector ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --generator Inspector ${IDL_INCLUDES} --outputDir "${DERIVED_SOURCES_DIR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" ${DERIVED_SOURCES_DIR}/Inspector.idl
    21492156    VERBATIM)
    21502157LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/InspectorBackendDispatcher.cpp ${DERIVED_SOURCES_DIR}/InspectorFrontend.cpp)
  • trunk/Source/WebCore/ChangeLog

    r81470 r81479  
     12011-03-18  Pavel Feldman  <pfeldman@chromium.org>
     2
     3        Reviewed by Yury Semikhatsky.
     4
     5        Web Inspector: migrate from Inspector.idl to InspectorAPI.json for protocol schema definition meta bug.
     6        https://bugs.webkit.org/show_bug.cgi?id=56294
     7
     8        * CMakeLists.txt:
     9        * CodeGenerators.pri:
     10        * DerivedSources.make:
     11        * GNUmakefile.am:
     12        * WebCore.gyp/WebCore.gyp:
     13        * inspector/Inspector.idl: Removed.
     14        * inspector/Inspector.json: Added.
     15        * inspector/generate-inspector-idl: Added.
     16
    1172011-03-18  Pavel Podivilov  <podivilov@chromium.org>
    218
  • trunk/Source/WebCore/CodeGenerators.pri

    r80846 r81479  
    548548
    549549
    550 INSPECTOR_INTERFACES = inspector/Inspector.idl
     550INSPECTOR_JSON = inspector/Inspector.json
     551INSPECTOR_IDL = $${WC_GENERATED_SOURCES_DIR}/Inspector.idl
    551552INSPECTOR_BACKEND_STUB_QRC = inspector/front-end/InspectorBackendStub.qrc
    552553INJECTED_SCRIPT_SOURCE = $$PWD/inspector/InjectedScriptSource.js
     
    646647
    647648# GENERATOR 2: inspector idl compiler
     649inspectorJSON.output = $${WC_GENERATED_SOURCES_DIR}/Inspector.idl
     650inspectorJSON.input = INSPECTOR_JSON
     651inspectorJSON.wkScript = $$PWD/inspector/generate-inspector-idl
     652inspectorJSON.commands = python $$inspectorJSON.wkScript -o $${WC_GENERATED_SOURCES_DIR}/Inspector.idl $$PWD/inspector/Inspector.json
     653inspectorJSON.depends = $$PWD/inspector/generate-inspector-idl
     654inspectorJSON.wkAddOutputToSources = false
     655addExtraCompiler(inspectorJSON)
     656
    648657inspectorIDL.output = $${WC_GENERATED_SOURCES_DIR}/${QMAKE_FILE_BASE}Frontend.cpp $${WC_GENERATED_SOURCES_DIR}/${QMAKE_FILE_BASE}BackendDispatcher.cpp
    649 inspectorIDL.input = INSPECTOR_INTERFACES
     658inspectorIDL.input = INSPECTOR_IDL
    650659inspectorIDL.wkScript = $$PWD/bindings/scripts/generate-bindings.pl
    651660inspectorIDL.commands = perl -I$$PWD/bindings/scripts -I$$PWD/inspector $$inspectorIDL.wkScript --defines \"$${FEATURE_DEFINES_JAVASCRIPT}\" --generator Inspector --outputDir $$WC_GENERATED_SOURCES_DIR --preprocessor \"$${QMAKE_MOC} -E\" ${QMAKE_FILE_NAME}
     
    654663              $$PWD/bindings/scripts/IDLParser.pm \
    655664              $$PWD/bindings/scripts/IDLStructure.pm \
    656               $$PWD/bindings/scripts/InFilesParser.pm
     665              $$PWD/bindings/scripts/InFilesParser.pm \
     666              $$PWD/inspector/Inspector.json \
     667              $$PWD/inspector/generate-inspector-idl
    657668addExtraCompiler(inspectorIDL)
    658669
    659 inspectorBackendStub.wkAddOutputToSources = false
    660670inspectorBackendStub.output = generated/InspectorBackendStub.qrc
    661671inspectorBackendStub.input = INSPECTOR_BACKEND_STUB_QRC
  • trunk/Source/WebCore/DerivedSources.make

    r80846 r81479  
    890890# Inspector interfaces generator
    891891
     892Inspector.idl : Inspector.json inspector/generate-inspector-idl
     893        python $(WebCore)/inspector/generate-inspector-idl -o Inspector.idl $(WebCore)/inspector/Inspector.json
     894
    892895all : InspectorFrontend.h
    893896
  • trunk/Source/WebCore/GNUmakefile.am

    r81198 r81479  
    50015001
    50025002# All Web Inspector generated files are created with this one call to CodeGeneratorInspector.pm
    5003 DerivedSources/WebCore/InspectorBackendDispatcher.cpp: $(WebCore)/inspector/Inspector.idl $(SCRIPTS_BINDINGS) $(WebCore)/inspector/CodeGeneratorInspector.pm
     5003DerivedSources/WebCore/Inspector.idl : $(WebCore)/inspector/Inspector.json $(WebCore)/inspector/generate-inspector-idl
     5004        $(PYTHON) $(WebCore)/inspector/generate-inspector-idl -o $(GENSOURCES_WEBCORE)/Inspector.idl $(WebCore)/inspector/Inspector.json
     5005
     5006DerivedSources/WebCore/InspectorBackendDispatcher.cpp: DerivedSources/WebCore/Inspector.idl $(SCRIPTS_BINDINGS) $(WebCore)/inspector/CodeGeneratorInspector.pm
    50045007        $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts -I$(WebCore)/inspector $(WebCore)/bindings/scripts/generate-bindings.pl $(IDL_PATH:%=--include "%") --outputDir "$(GENSOURCES_WEBCORE)" --defines "LANGUAGE_JAVASCRIPT=1 $(FEATURE_DEFINES)" --generator Inspector $<
    50055008DerivedSources/WebCore/InspectorFrontend.h: DerivedSources/WebCore/InspectorFrontend.cpp
  • trunk/Source/WebCore/WebCore.gyp/WebCore.gyp

    r81424 r81479  
    306306  'targets': [
    307307    {
     308      'target_name': 'inspector_idl',
     309      'type': 'none',
     310      'actions': [
     311        {
     312          'action_name': 'generateInspectorProtocolIDL',
     313          'inputs': [
     314            '../inspector/generate-inspector-idl',
     315            '../inspector/Inspector.json',
     316          ],
     317          'outputs': [
     318            '<(SHARED_INTERMEDIATE_DIR)/webcore/Inspector.idl',
     319          ],
     320          'variables': {
     321            'generator_include_dirs': [
     322            ],
     323          },
     324          'action': [
     325            'python',
     326            '../inspector/generate-inspector-idl',
     327            '-o',
     328            '<@(_outputs)',
     329            '<@(_inputs)'
     330          ],
     331          'message': 'Generating Inspector protocol sources from Inspector.idl',
     332        },
     333      ]
     334    },
     335    {
    308336      'target_name': 'inspector_protocol_sources',
    309337      'type': 'none',
     338      'dependencies': [
     339        'inspector_idl'
     340      ],
    310341      'actions': [
    311342        {
     
    320351            '../bindings/scripts/IDLParser.pm',
    321352            '../bindings/scripts/IDLStructure.pm',
    322             '../inspector/Inspector.idl',
     353            '<(SHARED_INTERMEDIATE_DIR)/webcore/Inspector.idl',
    323354          ],
    324355          'outputs': [
     
    336367            'python',
    337368            'scripts/rule_binding.py',
    338             '../inspector/Inspector.idl',
     369            '<(SHARED_INTERMEDIATE_DIR)/webcore/Inspector.idl',
    339370            '<(SHARED_INTERMEDIATE_DIR)/webcore',
    340371            '<(SHARED_INTERMEDIATE_DIR)/webkit',
Note: See TracChangeset for help on using the changeset viewer.