Changeset 85412 in webkit


Ignore:
Timestamp:
May 1, 2011 7:12:09 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-05-01 Rafael Brandao <rafael.lobo@openbossa.org>

Reviewed by Csaba Osztrogonác.

[Qt] build-webkit warning Inspector.idl is missing
https://bugs.webkit.org/show_bug.cgi?id=59047

Added variable_out to pipe output from one compiler to another,
and then forced the output to be added to the sources.

  • CodeGenerators.pri:
Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r85411 r85412  
     12011-05-01  Rafael Brandao  <rafael.lobo@openbossa.org>
     2
     3        Reviewed by Csaba Osztrogonác.
     4
     5        [Qt] build-webkit warning Inspector.idl is missing
     6        https://bugs.webkit.org/show_bug.cgi?id=59047
     7       
     8        Added variable_out to pipe output from one compiler to another,
     9        and then forced the output to be added to the sources.
     10
     11        * CodeGenerators.pri:
     12
    1132011-05-01  Dan Bernstein  <mitz@apple.com>
    214
  • trunk/Source/WebCore/CodeGenerators.pri

    r85256 r85412  
    3636
    3737WALDOCSSVALUES = $$PWD/css/CSSValueKeywords.in
     38
     39INSPECTOR_JSON = $$PWD/inspector/Inspector.json
     40
     41INSPECTOR_BACKEND_STUB_QRC = $$PWD/inspector/front-end/InspectorBackendStub.qrc
     42
     43INJECTED_SCRIPT_SOURCE = $$PWD/inspector/InjectedScriptSource.js
    3844
    3945contains(DEFINES, ENABLE_DASHBOARD_SUPPORT=1): DASHBOARDSUPPORTCSSPROPERTIES = $$PWD/css/DashboardSupportCSSPropertyNames.in
     
    545551    xml/XSLTProcessor.idl
    546552
    547 
    548 INSPECTOR_JSON = inspector/Inspector.json
    549 INSPECTOR_IDL = $${WC_GENERATED_SOURCES_DIR}/Inspector.idl
    550 INSPECTOR_BACKEND_STUB_QRC = inspector/front-end/InspectorBackendStub.qrc
    551 INJECTED_SCRIPT_SOURCE = $$PWD/inspector/InjectedScriptSource.js
    552 
    553553v8: wrapperFactoryArg = --wrapperFactoryV8
    554554else: wrapperFactoryArg = --wrapperFactory
     
    643643inspectorJSON.wkAddOutputToSources = false
    644644addExtraCompiler(inspectorJSON)
    645 
    646 inspectorIDL.output = $${WC_GENERATED_SOURCES_DIR}/${QMAKE_FILE_BASE}Frontend.cpp $${WC_GENERATED_SOURCES_DIR}/${QMAKE_FILE_BASE}BackendDispatcher.cpp
    647 inspectorIDL.input = INSPECTOR_IDL
     645inspectorJSON.variable_out = INSPECTOR_JSON_OUTPUT
     646
     647inspectorIDL.output = $${WC_GENERATED_SOURCES_DIR}/InspectorFrontend.cpp $${WC_GENERATED_SOURCES_DIR}/InspectorBackendDispatcher.cpp
     648inspectorIDL.input = INSPECTOR_JSON_OUTPUT
    648649inspectorIDL.wkScript = $$PWD/bindings/scripts/generate-bindings.pl
    649650inspectorIDL.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}
     
    655656              $$PWD/inspector/Inspector.json \
    656657              $$PWD/inspector/generate-inspector-idl
     658inspectorIDL.wkExtraSources = $$inspectorIDL.output
    657659addExtraCompiler(inspectorIDL)
    658660
    659661inspectorBackendStub.output = generated/InspectorBackendStub.qrc
    660662inspectorBackendStub.input = INSPECTOR_BACKEND_STUB_QRC
    661 inspectorBackendStub.tempNames = $$PWD/$$INSPECTOR_BACKEND_STUB_QRC $${WC_GENERATED_SOURCES_DIR}/InspectorBackendStub.qrc
     663inspectorBackendStub.tempNames = $$INSPECTOR_BACKEND_STUB_QRC $${WC_GENERATED_SOURCES_DIR}/InspectorBackendStub.qrc
    662664inspectorBackendStub.commands = $$QMAKE_COPY $$replace(inspectorBackendStub.tempNames, "/", $$QMAKE_DIR_SEP)
    663665inspectorBackendStub.wkAddOutputToSources = false
Note: See TracChangeset for help on using the changeset viewer.