From 9a14db01b9f3a97b187f020d0056a1384bd1ba28 Mon Sep 17 00:00:00 2001 From: "vsevik@chromium.org" Date: Tue, 24 Jan 2012 17:46:09 +0000 Subject: [PATCH] Web Inspector: CodeGeneratorInspector.py: put TypeBuilder namespace in a separate sources https://bugs.webkit.org/show_bug.cgi?id=76868 Patch by Peter Rybin on 2012-01-24 Reviewed by Yury Semikhatsky. Configurations of (hopefully) all build systems are fixed. * CMakeLists.txt: * DerivedSources.make: * DerivedSources.pri: * GNUmakefile.am: * GNUmakefile.list.am: * WebCore.gyp/WebCore.gyp: * WebCore.gypi: * WebCore.vcproj/WebCore.vcproj: * WebCore.xcodeproj/project.pbxproj: * inspector/CodeGeneratorInspector.py: (dash_to_camelcase): (InspectorFrontend_h): (InspectorBackendDispatcher_h): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@105743 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/CMakeLists.txt | 6 +- Source/WebCore/ChangeLog | 23 +++++ Source/WebCore/DerivedSources.make | 2 +- Source/WebCore/DerivedSources.pri | 4 +- Source/WebCore/GNUmakefile.am | 4 +- Source/WebCore/GNUmakefile.list.am | 2 + Source/WebCore/WebCore.gyp/WebCore.gyp | 4 +- Source/WebCore/WebCore.gypi | 2 + Source/WebCore/WebCore.vcproj/WebCore.vcproj | 8 ++ Source/WebCore/WebCore.xcodeproj/project.pbxproj | 6 ++ Source/WebCore/inspector/CodeGeneratorInspector.py | 102 ++++++++++++--------- 11 files changed, 113 insertions(+), 50 deletions(-) diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt index 7c5c901..366c2a0 100644 --- a/Source/WebCore/CMakeLists.txt +++ b/Source/WebCore/CMakeLists.txt @@ -2273,12 +2273,12 @@ ADD_CUSTOM_COMMAND( LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorProtocolVersion.h) ADD_CUSTOM_COMMAND( - OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorBackendDispatcher.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorBackendDispatcher.h ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorFrontend.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorFrontend.h + OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorBackendDispatcher.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorBackendDispatcher.h ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorFrontend.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorFrontend.h ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorTypeBuilder.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorTypeBuilder.h MAIN_DEPENDENCY inspector/Inspector.json DEPENDS ${WEBCORE_DIR}/inspector/CodeGeneratorInspector.py - COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/inspector/CodeGeneratorInspector.py ${WEBCORE_DIR}/inspector/Inspector.json --output_h_dir "${DERIVED_SOURCES_WEBCORE_DIR}" --output_cpp_dir "${DERIVED_SOURCES_WEBCORE_DIR}" --defines "${FEATURE_DEFINES_JAVASCRIPT}" + COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/inspector/CodeGeneratorInspector.py ${WEBCORE_DIR}/inspector/Inspector.json --output_h_dir "${DERIVED_SOURCES_WEBCORE_DIR}" --output_cpp_dir "${DERIVED_SOURCES_WEBCORE_DIR}" VERBATIM) -LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorBackendDispatcher.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorFrontend.cpp) +LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorBackendDispatcher.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorFrontend.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorTypeBuilder.cpp) # Generate InjectedScriptSource.h diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index fb69b1f..59fdc1d 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,26 @@ +2012-01-24 Peter Rybin + + Web Inspector: CodeGeneratorInspector.py: put TypeBuilder namespace in a separate sources + https://bugs.webkit.org/show_bug.cgi?id=76868 + + Reviewed by Yury Semikhatsky. + + Configurations of (hopefully) all build systems are fixed. + + * CMakeLists.txt: + * DerivedSources.make: + * DerivedSources.pri: + * GNUmakefile.am: + * GNUmakefile.list.am: + * WebCore.gyp/WebCore.gyp: + * WebCore.gypi: + * WebCore.vcproj/WebCore.vcproj: + * WebCore.xcodeproj/project.pbxproj: + * inspector/CodeGeneratorInspector.py: + (dash_to_camelcase): + (InspectorFrontend_h): + (InspectorBackendDispatcher_h): + 2012-01-24 Mario Sanchez Prada [GTK] Refactor GTK's accessibilitity code to be more modular diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make index 17d3cc1..de1c8c5 100644 --- a/Source/WebCore/DerivedSources.make +++ b/Source/WebCore/DerivedSources.make @@ -942,7 +942,7 @@ all : InspectorFrontend.h INSPECTOR_GENERATOR_SCRIPTS = inspector/CodeGeneratorInspector.py InspectorFrontend.h : Inspector.json $(INSPECTOR_GENERATOR_SCRIPTS) - python $(WebCore)/inspector/CodeGeneratorInspector.py $(WebCore)/inspector/Inspector.json --output_h_dir . --output_cpp_dir . --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" + python $(WebCore)/inspector/CodeGeneratorInspector.py $(WebCore)/inspector/Inspector.json --output_h_dir . --output_cpp_dir . all : InjectedScriptSource.h diff --git a/Source/WebCore/DerivedSources.pri b/Source/WebCore/DerivedSources.pri index c76a470..952ee07 100644 --- a/Source/WebCore/DerivedSources.pri +++ b/Source/WebCore/DerivedSources.pri @@ -725,10 +725,10 @@ inspectorValidate.depends = $$PWD/inspector/generate-inspector-protocol-version inspectorValidate.add_output_to_sources = false GENERATORS += inspectorValidate -inspectorJSON.output = InspectorFrontend.cpp InspectorBackendDispatcher.cpp +inspectorJSON.output = InspectorFrontend.cpp InspectorBackendDispatcher.cpp InspectorTypeBuilder.cpp inspectorJSON.input = INSPECTOR_JSON inspectorJSON.script = $$PWD/inspector/CodeGeneratorInspector.py -inspectorJSON.commands = python $$inspectorJSON.script $$PWD/inspector/Inspector.json --output_h_dir ${QMAKE_FUNC_FILE_OUT_PATH} --output_cpp_dir ${QMAKE_FUNC_FILE_OUT_PATH} --defines \"$${FEATURE_DEFINES_JAVASCRIPT}\" +inspectorJSON.commands = python $$inspectorJSON.script $$PWD/inspector/Inspector.json --output_h_dir ${QMAKE_FUNC_FILE_OUT_PATH} --output_cpp_dir ${QMAKE_FUNC_FILE_OUT_PATH} inspectorJSON.depends = $$inspectorJSON.script GENERATORS += inspectorJSON diff --git a/Source/WebCore/GNUmakefile.am b/Source/WebCore/GNUmakefile.am index 24ee74d..24e9de2 100644 --- a/Source/WebCore/GNUmakefile.am +++ b/Source/WebCore/GNUmakefile.am @@ -720,7 +720,9 @@ DerivedSources/WebCore/InspectorProtocolVersion.h : $(WebCore)/inspector/Inspect $(AM_V_GEN)$(PYTHON) $(WebCore)/inspector/generate-inspector-protocol-version -o $(GENSOURCES_WEBCORE)/InspectorProtocolVersion.h $(WebCore)/inspector/Inspector.json DerivedSources/WebCore/InspectorBackendDispatcher.cpp: $(WebCore)/inspector/Inspector.json $(WebCore)/inspector/CodeGeneratorInspector.py - $(AM_V_GEN)$(PYTHON) $(WebCore)/inspector/CodeGeneratorInspector.py $< --output_h_dir $(GENSOURCES_WEBCORE) --output_cpp_dir $(GENSOURCES_WEBCORE) --defines "LANGUAGE_JAVASCRIPT=1 $(FEATURE_DEFINES)" + $(AM_V_GEN)$(PYTHON) $(WebCore)/inspector/CodeGeneratorInspector.py $< --output_h_dir $(GENSOURCES_WEBCORE) --output_cpp_dir $(GENSOURCES_WEBCORE) +DerivedSources/WebCore/InspectorTypeBuilder.h: DerivedSources/WebCore/InspectorTypeBuilder.cpp +DerivedSources/WebCore/InspectorTypeBuilder.cpp: DerivedSources/WebCore/InspectorFrontend.h DerivedSources/WebCore/InspectorFrontend.h: DerivedSources/WebCore/InspectorFrontend.cpp DerivedSources/WebCore/InspectorFrontend.cpp: DerivedSources/WebCore/InspectorBackendStub.js DerivedSources/WebCore/InspectorBackendStub.js: DerivedSources/WebCore/InspectorBackendDispatcher.h diff --git a/Source/WebCore/GNUmakefile.list.am b/Source/WebCore/GNUmakefile.list.am index 6e7a134..e63cea3 100644 --- a/Source/WebCore/GNUmakefile.list.am +++ b/Source/WebCore/GNUmakefile.list.am @@ -27,6 +27,8 @@ webcore_built_sources += \ DerivedSources/WebCore/InspectorBackendDispatcher.h \ DerivedSources/WebCore/InspectorFrontend.cpp \ DerivedSources/WebCore/InspectorFrontend.h \ + DerivedSources/WebCore/InspectorTypeBuilder.cpp \ + DerivedSources/WebCore/InspectorTypeBuilder.h \ DerivedSources/WebCore/InspectorProtocolVersion.h \ DerivedSources/WebCore/JSAbstractWorker.cpp \ DerivedSources/WebCore/JSAbstractWorker.h \ diff --git a/Source/WebCore/WebCore.gyp/WebCore.gyp b/Source/WebCore/WebCore.gyp/WebCore.gyp index 0cfd0e4..819f9dd 100644 --- a/Source/WebCore/WebCore.gyp/WebCore.gyp +++ b/Source/WebCore/WebCore.gyp/WebCore.gyp @@ -378,6 +378,8 @@ '<(SHARED_INTERMEDIATE_DIR)/webkit/InspectorBackendDispatcher.h', '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorFrontend.cpp', '<(SHARED_INTERMEDIATE_DIR)/webkit/InspectorFrontend.h', + '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorTypeBuilder.cpp', + '<(SHARED_INTERMEDIATE_DIR)/webkit/InspectorTypeBuilder.h', '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendStub.js', ], 'variables': { @@ -389,7 +391,6 @@ '<@(_inputs)', '--output_h_dir', '<(SHARED_INTERMEDIATE_DIR)/webkit', '--output_cpp_dir', '<(SHARED_INTERMEDIATE_DIR)/webcore', - '--defines', '<(feature_defines) LANGUAGE_JAVASCRIPT', ], 'message': 'Generating Inspector protocol sources from Inspector.json', }, @@ -1129,6 +1130,7 @@ # Additional .cpp files from the webcore_inspector_sources list. '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorFrontend.cpp', '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendDispatcher.cpp', + '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorTypeBuilder.cpp', ], 'conditions': [ ['inside_chromium_build==1 and OS=="win" and component=="shared_library"', { diff --git a/Source/WebCore/WebCore.gypi b/Source/WebCore/WebCore.gypi index f939786..4c0e76a 100644 --- a/Source/WebCore/WebCore.gypi +++ b/Source/WebCore/WebCore.gypi @@ -6891,6 +6891,8 @@ '<(PRODUCT_DIR)/DerivedSources/WebCore/InspectorBackendStub.js', '<(PRODUCT_DIR)/DerivedSources/WebCore/InspectorFrontend.cpp', '<(PRODUCT_DIR)/DerivedSources/WebCore/InspectorFrontend.h', + '<(PRODUCT_DIR)/DerivedSources/WebCore/InspectorTypeBuilder.cpp', + '<(PRODUCT_DIR)/DerivedSources/WebCore/InspectorTypeBuilder.h', '<(PRODUCT_DIR)/DerivedSources/WebCore/InspectorProtocolVersion.h', '<(PRODUCT_DIR)/DerivedSources/WebCore/JSAbstractView.cpp', '<(PRODUCT_DIR)/DerivedSources/WebCore/JSAbstractView.h', diff --git a/Source/WebCore/WebCore.vcproj/WebCore.vcproj b/Source/WebCore/WebCore.vcproj/WebCore.vcproj index f4e73c4..3936013 100755 --- a/Source/WebCore/WebCore.vcproj/WebCore.vcproj +++ b/Source/WebCore/WebCore.vcproj/WebCore.vcproj @@ -610,6 +610,14 @@ > + + + + Inspector.json --output_h_dir --output_cpp_dir [--defines ]\n") + sys.stderr.write("Usage: