Changeset 83792 in webkit


Ignore:
Timestamp:
Apr 13, 2011 5:44:38 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-04-13 Ryuan Choi <ryuan.choi@samsung.com>

Reviewed by Kenneth Rohde Christiansen.

[CMAKE] Separate DerivedSources.
https://bugs.webkit.org/show_bug.cgi?id=58427

Seperate DerivedSources/ to DerivedSources/WebCore and
DerivedSources/JavaScriptCore.

  • Source/CMakeLists.txt:
  • Source/cmake/OptionsCommon.cmake:
  • Source/cmake/WebKitFS.cmake:
  • Source/cmake/WebKitHelpers.cmake:
  • Source/cmake/WebKitMacros.cmake:

2011-04-13 Ryuan Choi <ryuan.choi@samsung.com>

Reviewed by Kenneth Rohde Christiansen.

[CMAKE] Separate DerivedSources.
https://bugs.webkit.org/show_bug.cgi?id=58427

  • CMakeLists.txt: Change DERIVED_SOURCES_DIR to DERIVED_SOURCES_JAVASCRIPTCORE_DIR.

2011-04-13 Ryuan Choi <ryuan.choi@samsung.com>

Reviewed by Kenneth Rohde Christiansen.

[CMAKE] Separate DerivedSources.
https://bugs.webkit.org/show_bug.cgi?id=58427

No new tests since these are refactoring only.

  • CMakeLists.txt:
  • UseJSC.cmake:

2011-04-13 Ryuan Choi <ryuan.choi@samsung.com>

Reviewed by Kenneth Rohde Christiansen.

[CMAKE] Separate DerivedSources.
https://bugs.webkit.org/show_bug.cgi?id=58427

  • CMakeLists.txt: Change DERIVED_SOURCES_DIR to DERIVED_SOURCES_WEBCORE_DIR
Location:
trunk
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r83789 r83792  
     12011-04-13  Ryuan Choi  <ryuan.choi@samsung.com>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [CMAKE] Separate DerivedSources.
     6        https://bugs.webkit.org/show_bug.cgi?id=58427
     7
     8        Seperate DerivedSources/ to DerivedSources/WebCore and
     9        DerivedSources/JavaScriptCore.
     10
     11        * Source/CMakeLists.txt:
     12        * Source/cmake/OptionsCommon.cmake:
     13        * Source/cmake/WebKitFS.cmake:
     14        * Source/cmake/WebKitHelpers.cmake:
     15        * Source/cmake/WebKitMacros.cmake:
     16
    1172011-04-13  Tony Chang  <tony@chromium.org>
    218
  • trunk/Source/CMakeLists.txt

    r81638 r83792  
    1414SET(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/WebKit")
    1515SET(TOOLS_DIR "${CMAKE_SOURCE_DIR}/../Tools")
    16 SET(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
     16SET(DERIVED_SOURCES_WEBCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore")
     17SET(DERIVED_SOURCES_JAVASCRIPTCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore")
    1718
    1819INCLUDE(WebKitMacros)
  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r83507 r83792  
    196196FOREACH (_file ${JavaScriptCore_LUT_FILES})
    197197    GET_FILENAME_COMPONENT(_name ${_file} NAME_WE)
    198     GENERATE_HASH_LUT(${JAVASCRIPTCORE_DIR}/${_file} ${DERIVED_SOURCES_DIR}/${_name}.lut.h)
    199     LIST(APPEND JavaScriptCore_HEADERS ${DERIVED_SOURCES_DIR}/${_name}.lut.h)
     198    GENERATE_HASH_LUT(${JAVASCRIPTCORE_DIR}/${_file} ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/${_name}.lut.h)
     199    LIST(APPEND JavaScriptCore_HEADERS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/${_name}.lut.h)
    200200ENDFOREACH ()
    201201
    202202
    203203# GENERATOR 1-B: particular LUT creator (for 1 file only)
    204 GENERATE_HASH_LUT(${JAVASCRIPTCORE_DIR}/parser/Keywords.table ${DERIVED_SOURCES_DIR}/Lexer.lut.h MAIN_DEPENDENCY)
    205 LIST(APPEND JavaScriptCore_HEADERS ${DERIVED_SOURCES_DIR}/Lexer.lut.h)
     204GENERATE_HASH_LUT(${JAVASCRIPTCORE_DIR}/parser/Keywords.table ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Lexer.lut.h MAIN_DEPENDENCY)
     205LIST(APPEND JavaScriptCore_HEADERS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Lexer.lut.h)
    206206
    207207#GENERATOR: "RegExpJitTables.h": tables used by Yarr
    208208ADD_CUSTOM_COMMAND(
    209     OUTPUT ${DERIVED_SOURCES_DIR}/RegExpJitTables.h
     209    OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/RegExpJitTables.h
    210210    MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/create_regex_tables
    211     COMMAND ${PYTHON_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/create_regex_tables > ${DERIVED_SOURCES_DIR}/RegExpJitTables.h
     211    COMMAND ${PYTHON_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/create_regex_tables > ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/RegExpJitTables.h
    212212    VERBATIM)
    213 ADD_SOURCE_DEPENDENCIES(${JAVASCRIPTCORE_DIR}/yarr/YarrPattern.cpp ${DERIVED_SOURCES_DIR}/RegExpJitTables.h)
     213ADD_SOURCE_DEPENDENCIES(${JAVASCRIPTCORE_DIR}/yarr/YarrPattern.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/RegExpJitTables.h)
    214214
    215215
  • trunk/Source/JavaScriptCore/ChangeLog

    r83773 r83792  
     12011-04-13  Ryuan Choi  <ryuan.choi@samsung.com>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [CMAKE] Separate DerivedSources.
     6        https://bugs.webkit.org/show_bug.cgi?id=58427
     7
     8        * CMakeLists.txt: Change DERIVED_SOURCES_DIR to DERIVED_SOURCES_JAVASCRIPTCORE_DIR.
     9
    1102011-04-13  Geoffrey Garen  <ggaren@apple.com>
    211
  • trunk/Source/WebCore/CMakeLists.txt

    r83729 r83792  
    7676    "${JAVASCRIPTCORE_DIR}/wtf/unicode"
    7777    "${JAVASCRIPTCORE_DIR}/yarr"
    78     "${DERIVED_SOURCES_DIR}"
     78    "${DERIVED_SOURCES_WEBCORE_DIR}"
    7979    "${CMAKE_SOURCE_DIR}"
    8080    "${CMAKE_BINARY_DIR}"
     
    19841984# All Web Inspector generated files are created with this one call to CodeGeneratorInspector.pm
    19851985ADD_CUSTOM_COMMAND(
    1986     OUTPUT ${DERIVED_SOURCES_DIR}/Inspector.idl
     1986    OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/Inspector.idl
    19871987    MAIN_DEPENDENCY inspector/Inspector.json
    19881988    DEPENDS ${WEBCORE_DIR}/inspector/generate-inspector-idl ${WEBCORE_DIR}/inspector/Inspector.json
    1989     COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/inspector/generate-inspector-idl -o ${DERIVED_SOURCES_DIR}/Inspector.idl ${WEBCORE_DIR}/inspector/Inspector.json
     1989    COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/inspector/generate-inspector-idl -o ${DERIVED_SOURCES_WEBCORE_DIR}/Inspector.idl ${WEBCORE_DIR}/inspector/Inspector.json
    19901990    VERBATIM)
    19911991
    19921992ADD_CUSTOM_COMMAND(
    1993     OUTPUT ${DERIVED_SOURCES_DIR}/InspectorBackendDispatcher.cpp ${DERIVED_SOURCES_DIR}/InspectorBackendDispatcher.h ${DERIVED_SOURCES_DIR}/InspectorFrontend.cpp ${DERIVED_SOURCES_DIR}/InspectorFrontend.h
    1994     MAIN_DEPENDENCY ${DERIVED_SOURCES_DIR}/Inspector.idl
    1995     DEPENDS ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl ${SCRIPTS_BINDINGS} ${WEBCORE_DIR}/inspector/CodeGeneratorInspector.pm ${DERIVED_SOURCES_DIR}/Inspector.idl
    1996     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
     1993    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
     1994    MAIN_DEPENDENCY ${DERIVED_SOURCES_WEBCORE_DIR}/Inspector.idl
     1995    DEPENDS ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl ${SCRIPTS_BINDINGS} ${WEBCORE_DIR}/inspector/CodeGeneratorInspector.pm ${DERIVED_SOURCES_WEBCORE_DIR}/Inspector.idl
     1996    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_WEBCORE_DIR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" ${DERIVED_SOURCES_WEBCORE_DIR}/Inspector.idl
    19971997    VERBATIM)
    1998 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/InspectorBackendDispatcher.cpp ${DERIVED_SOURCES_DIR}/InspectorFrontend.cpp)
     1998LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorBackendDispatcher.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorFrontend.cpp)
    19991999
    20002000
    20012001# Generate InjectedScriptSource.h
    20022002ADD_CUSTOM_COMMAND(
    2003     OUTPUT ${DERIVED_SOURCES_DIR}/InjectedScriptSource.h
     2003    OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedScriptSource.h
    20042004    MAIN_DEPENDENCY inspector/InjectedScriptSource.js
    2005     COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/inspector/xxd.pl InjectedScriptSource_js ${WEBCORE_DIR}/inspector/InjectedScriptSource.js ${DERIVED_SOURCES_DIR}/InjectedScriptSource.h
     2005    COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/inspector/xxd.pl InjectedScriptSource_js ${WEBCORE_DIR}/inspector/InjectedScriptSource.js ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedScriptSource.h
    20062006    VERBATIM)
    2007 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/InjectedScriptSource.h)
     2007LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedScriptSource.h)
    20082008
    20092009
    20102010MAKE_HASH_TOOLS(${WEBCORE_DIR}/platform/ColorData)
    2011 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/ColorData.cpp)
     2011LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/ColorData.cpp)
    20122012
    20132013
    20142014MAKE_HASH_TOOLS(${WEBCORE_DIR}/html/DocTypeStrings)
    2015 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/DocTypeStrings.cpp)
     2015LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/DocTypeStrings.cpp)
    20162016
    20172017
    20182018# Generate XMLViewerCSS.h
    20192019ADD_CUSTOM_COMMAND(
    2020     OUTPUT ${DERIVED_SOURCES_DIR}/XMLViewerCSS.h
     2020    OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerCSS.h
    20212021    MAIN_DEPENDENCY xml/XMLViewer.css
    2022     COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/inspector/xxd.pl XMLViewer_css ${WEBCORE_DIR}/xml/XMLViewer.css ${DERIVED_SOURCES_DIR}/XMLViewerCSS.h
     2022    COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/inspector/xxd.pl XMLViewer_css ${WEBCORE_DIR}/xml/XMLViewer.css ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerCSS.h
    20232023    VERBATIM)
    2024 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/XMLViewerCSS.h)
     2024LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerCSS.h)
    20252025
    20262026
    20272027# Generate XMLViewerJS.h
    20282028ADD_CUSTOM_COMMAND(
    2029     OUTPUT ${DERIVED_SOURCES_DIR}/XMLViewerJS.h
     2029    OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerJS.h
    20302030    MAIN_DEPENDENCY xml/XMLViewer.js
    2031     COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/inspector/xxd.pl XMLViewer_js ${WEBCORE_DIR}/xml/XMLViewer.js ${DERIVED_SOURCES_DIR}/XMLViewerJS.h
     2031    COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/inspector/xxd.pl XMLViewer_js ${WEBCORE_DIR}/xml/XMLViewer.js ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerJS.h
    20322032    VERBATIM)
    2033 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/XMLViewerJS.h)
     2033LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerJS.h)
    20342034
    20352035
    20362036# Generate HTML entity table
    20372037ADD_CUSTOM_COMMAND(
    2038     OUTPUT ${DERIVED_SOURCES_DIR}/HTMLEntityTable.cpp
     2038    OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLEntityTable.cpp
    20392039    MAIN_DEPENDENCY ${WEBCORE_DIR}/html/parser/HTMLEntityNames.in
    20402040    DEPENDS ${WEBCORE_DIR}/html/parser/create-html-entity-table
    2041     COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/html/parser/create-html-entity-table -o ${DERIVED_SOURCES_DIR}/HTMLEntityTable.cpp ${WEBCORE_DIR}/html/parser/HTMLEntityNames.in
     2041    COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/html/parser/create-html-entity-table -o ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLEntityTable.cpp ${WEBCORE_DIR}/html/parser/HTMLEntityNames.in
    20422042    VERBATIM)
    2043 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/HTMLEntityTable.cpp)
     2043LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLEntityTable.cpp)
    20442044
    20452045
     
    20472047FILE(TO_NATIVE_PATH ${PERL_EXECUTABLE} PERL_EXECUTABLE_NATIVE_PATH)
    20482048ADD_CUSTOM_COMMAND(
    2049     OUTPUT ${DERIVED_SOURCES_DIR}/tokenizer.cpp
     2049    OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/tokenizer.cpp
    20502050    MAIN_DEPENDENCY ${WEBCORE_DIR}/css/maketokenizer
    20512051    DEPENDS ${WEBCORE_DIR}/css/tokenizer.flex
    2052     COMMAND ${FLEX_EXECUTABLE} -t ${WEBCORE_DIR}/css/tokenizer.flex | ${PERL_EXECUTABLE_NATIVE_PATH} ${WEBCORE_DIR}/css/maketokenizer > ${DERIVED_SOURCES_DIR}/tokenizer.cpp
     2052    COMMAND ${FLEX_EXECUTABLE} -t ${WEBCORE_DIR}/css/tokenizer.flex | ${PERL_EXECUTABLE_NATIVE_PATH} ${WEBCORE_DIR}/css/maketokenizer > ${DERIVED_SOURCES_WEBCORE_DIR}/tokenizer.cpp
    20532053    VERBATIM)
    2054 ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp tokenizer.cpp)
     2054ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp tokenizer.cpp)
    20552055
    20562056
    20572057# Generate CSS property names
    20582058ADD_CUSTOM_COMMAND (
    2059     OUTPUT ${DERIVED_SOURCES_DIR}/CSSPropertyNames.in ${DERIVED_SOURCES_DIR}/CSSPropertyNames.h ${DERIVED_SOURCES_DIR}/CSSPropertyNames.cpp ${DERIVED_SOURCES_DIR}/CSSPropertyNames.gperf
     2059    OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.in ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.h ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.gperf
    20602060    MAIN_DEPENDENCY ${WEBCORE_DIR}/css/makeprop.pl
    20612061    DEPENDS ${WebCore_CSS_PROPERTY_NAMES}
    2062     WORKING_DIRECTORY ${DERIVED_SOURCES_DIR}
    2063     COMMAND ${PERL_EXECUTABLE} -ne "print" ${WebCore_CSS_PROPERTY_NAMES} > ${DERIVED_SOURCES_DIR}/CSSPropertyNames.in
     2062    WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}
     2063    COMMAND ${PERL_EXECUTABLE} -ne "print" ${WebCore_CSS_PROPERTY_NAMES} > ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.in
    20642064    COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/makeprop.pl
    20652065    VERBATIM)
    2066 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/CSSPropertyNames.cpp)
    2067 ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp CSSValueKeywords.h)
    2068 ADD_SOURCE_DERIVED_DEPENDENCIES(${DERIVED_SOURCES_DIR}/CSSGrammar.cpp CSSPropertyNames.h)
     2066LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.cpp)
     2067ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp CSSValueKeywords.h)
     2068ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp CSSPropertyNames.h)
    20692069
    20702070
    20712071# Generate CSS value keywords
    20722072ADD_CUSTOM_COMMAND (
    2073     OUTPUT ${DERIVED_SOURCES_DIR}/CSSValueKeywords.in ${DERIVED_SOURCES_DIR}/CSSValueKeywords.h ${DERIVED_SOURCES_DIR}/CSSValueKeywords.cpp ${DERIVED_SOURCES_DIR}/CSSValueKeywords.gperf
     2073    OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.in ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.h ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.gperf
    20742074    MAIN_DEPENDENCY ${WEBCORE_DIR}/css/makevalues.pl
    20752075    DEPENDS ${WebCore_CSS_VALUE_KEYWORDS}
    2076     WORKING_DIRECTORY ${DERIVED_SOURCES_DIR}
    2077     COMMAND ${PERL_EXECUTABLE} -ne "print lc" ${WebCore_CSS_VALUE_KEYWORDS} > ${DERIVED_SOURCES_DIR}/CSSValueKeywords.in
     2076    WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}
     2077    COMMAND ${PERL_EXECUTABLE} -ne "print lc" ${WebCore_CSS_VALUE_KEYWORDS} > ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.in
    20782078    COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/makevalues.pl
    20792079    VERBATIM)
    2080 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/CSSValueKeywords.cpp)
    2081 ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp CSSValueKeywords.h)
    2082 ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSPrimitiveValueMappings.h CSSValueKeywords.h)
    2083 ADD_SOURCE_DERIVED_DEPENDENCIES(${DERIVED_SOURCES_DIR}/CSSGrammar.cpp CSSValueKeywords.h)
     2080LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.cpp)
     2081ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp CSSValueKeywords.h)
     2082ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSPrimitiveValueMappings.h CSSValueKeywords.h)
     2083ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp CSSValueKeywords.h)
    20842084
    20852085
    20862086# Generate user agent styles
    20872087ADD_CUSTOM_COMMAND(
    2088     OUTPUT ${DERIVED_SOURCES_DIR}/UserAgentStyleSheetsData.cpp ${DERIVED_SOURCES_DIR}/UserAgentStyleSheets.h
     2088    OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheetsData.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheets.h
    20892089    MAIN_DEPENDENCY ${WEBCORE_DIR}/css/make-css-file-arrays.pl
    20902090    DEPENDS ${WebCore_USER_AGENT_STYLE_SHEETS}
    2091     COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/make-css-file-arrays.pl ${DERIVED_SOURCES_DIR}/UserAgentStyleSheets.h ${DERIVED_SOURCES_DIR}/UserAgentStyleSheetsData.cpp ${WebCore_USER_AGENT_STYLE_SHEETS}
     2091    COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/make-css-file-arrays.pl ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheets.h ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheetsData.cpp ${WebCore_USER_AGENT_STYLE_SHEETS}
    20922092    VERBATIM)
    2093 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/UserAgentStyleSheetsData.cpp)
    2094 ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSStyleSelector.cpp UserAgentStyleSheetsData.cpp UserAgentStyleSheets.h)
    2095 
    2096 
    2097 GENERATE_GRAMMAR(cssyy ${WEBCORE_DIR}/css/CSSGrammar.y ${DERIVED_SOURCES_DIR}/CSSGrammar.h ${DERIVED_SOURCES_DIR}/CSSGrammar.cpp)
    2098 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/CSSGrammar.cpp)
    2099 
    2100 
    2101 GENERATE_GRAMMAR(xpathyy ${WEBCORE_DIR}/xml/XPathGrammar.y ${DERIVED_SOURCES_DIR}/XPathGrammar.h ${DERIVED_SOURCES_DIR}/XPathGrammar.cpp)
    2102 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/XPathGrammar.cpp)
    2103 
    2104 
    2105 
    2106 ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/html/HTMLTreeBuilder.cpp MathMLNames.cpp)
     2093LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheetsData.cpp)
     2094ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSStyleSelector.cpp UserAgentStyleSheetsData.cpp UserAgentStyleSheets.h)
     2095
     2096
     2097GENERATE_GRAMMAR(cssyy ${WEBCORE_DIR}/css/CSSGrammar.y ${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.h ${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp)
     2098LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp)
     2099
     2100
     2101GENERATE_GRAMMAR(xpathyy ${WEBCORE_DIR}/xml/XPathGrammar.y ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.h ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.cpp)
     2102LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.cpp)
     2103
     2104
     2105
     2106ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/html/HTMLTreeBuilder.cpp MathMLNames.cpp)
    21072107
    21082108
    21092109GENERATE_DOM_NAMES(HTML ${WEBCORE_DIR}/html/HTMLAttributeNames.in ${WEBCORE_DIR}/html/HTMLTagNames.in "${HTML_FEATURES}")
    2110 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/HTMLNames.cpp ${DERIVED_SOURCES_DIR}/HTMLElementFactory.cpp ${DERIVED_SOURCES_DIR}/JSHTMLElementWrapperFactory.cpp)
     2110LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLNames.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLElementFactory.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/JSHTMLElementWrapperFactory.cpp)
    21112111
    21122112
    21132113GENERATE_DOM_NAMES(MathML ${WEBCORE_DIR}/mathml/mathattrs.in ${WEBCORE_DIR}/mathml/mathtags.in "${MATHML_FEATURES}")
    2114 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/MathMLNames.cpp)
     2114LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/MathMLNames.cpp)
    21152115IF (ENABLE_MATHML)
    2116     LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/MathMLElementFactory.cpp)
     2116    LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/MathMLElementFactory.cpp)
    21172117ENDIF ()
    21182118
    21192119
    21202120GENERATE_DOM_NAMES(SVG ${WEBCORE_DIR}/svg/svgattrs.in ${WEBCORE_DIR}/svg/svgtags.in "${SVG_FEATURES}")
    2121 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/SVGNames.cpp)
     2121LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/SVGNames.cpp)
    21222122IF (ENABLE_SVG)
    2123     LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/SVGElementFactory.cpp ${DERIVED_SOURCES_DIR}/JSSVGElementWrapperFactory.cpp)
     2123    LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/SVGElementFactory.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/JSSVGElementWrapperFactory.cpp)
    21242124ENDIF ()
    21252125
    21262126
    21272127GENERATE_DOM_NAMES(WML ${WEBCORE_DIR}/wml/WMLAttributeNames.in ${WEBCORE_DIR}/wml/WMLTagNames.in "${WML_FEATURES}")
    2128 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/WMLNames.cpp)
     2128LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/WMLNames.cpp)
    21292129IF (ENABLE_WML)
    2130     LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/WMLElementFactory.cpp)
     2130    LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/WMLElementFactory.cpp)
    21312131ENDIF ()
    21322132
    21332133
    21342134GENERATE_DOM_NAMES(XLink ${WEBCORE_DIR}/svg/xlinkattrs.in)
    2135 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/XLinkNames.cpp)
     2135LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XLinkNames.cpp)
    21362136
    21372137
    21382138GENERATE_DOM_NAMES(XMLNS ${WEBCORE_DIR}/xml/xmlnsattrs.in)
    2139 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/XMLNSNames.cpp)
     2139LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XMLNSNames.cpp)
    21402140
    21412141
    21422142GENERATE_DOM_NAMES(XML ${WEBCORE_DIR}/xml/xmlattrs.in)
    2143 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/XMLNames.cpp)
     2143LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XMLNames.cpp)
    21442144
    21452145
    21462146ADD_CUSTOM_COMMAND(
    2147     OUTPUT ${DERIVED_SOURCES_DIR}/WebKitVersion.h
     2147    OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitVersion.h
    21482148    MAIN_DEPENDENCY ${WEBKIT_DIR}/scripts/generate-webkitversion.pl
    21492149    DEPENDS ${WEBKIT_DIR}/mac/Configurations/Version.xcconfig
    2150     COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/scripts/generate-webkitversion.pl --config ${WEBKIT_DIR}/mac/Configurations/Version.xcconfig --outputDir ${DERIVED_SOURCES_DIR}
     2150    COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/scripts/generate-webkitversion.pl --config ${WEBKIT_DIR}/mac/Configurations/Version.xcconfig --outputDir ${DERIVED_SOURCES_WEBCORE_DIR}
    21512151    VERBATIM)
    2152 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/WebKitVersion.h)
     2152LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitVersion.h)
    21532153
    21542154
  • trunk/Source/WebCore/ChangeLog

    r83790 r83792  
     12011-04-13  Ryuan Choi  <ryuan.choi@samsung.com>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [CMAKE] Separate DerivedSources.
     6        https://bugs.webkit.org/show_bug.cgi?id=58427
     7
     8        No new tests since these are refactoring only.
     9
     10        * CMakeLists.txt:
     11        * UseJSC.cmake:
     12
    1132011-04-13  Noel Gordon  <noel.gordon@gmail.com>
    214
  • trunk/Source/WebCore/UseJSC.cmake

    r82450 r83792  
    195195    GET_FILENAME_COMPONENT (_name ${_file} NAME_WE)
    196196    ADD_CUSTOM_COMMAND(
    197         OUTPUT  ${DERIVED_SOURCES_DIR}/JS${_name}.cpp ${DERIVED_SOURCES_DIR}/JS${_name}.h
     197        OUTPUT  ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_name}.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_name}.h
    198198        MAIN_DEPENDENCY ${_file}
    199199        DEPENDS ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl ${SCRIPTS_BINDINGS} ${WEBCORE_DIR}/bindings/scripts/CodeGeneratorJS.pm ${_file}
    200         COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --generator JS ${IDL_INCLUDES} --outputDir "${DERIVED_SOURCES_DIR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" ${WEBCORE_DIR}/${_file}
     200        COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --generator JS ${IDL_INCLUDES} --outputDir "${DERIVED_SOURCES_WEBCORE_DIR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" ${WEBCORE_DIR}/${_file}
    201201        VERBATIM)
    202     LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/JS${_name}.cpp)
     202    LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_name}.cpp)
    203203ENDFOREACH ()
  • trunk/Source/WebKit/CMakeLists.txt

    r83385 r83792  
    4646    "${JAVASCRIPTCORE_DIR}/wtf"
    4747    "${JAVASCRIPTCORE_DIR}/wtf/unicode"
    48     "${DERIVED_SOURCES_DIR}"
     48    "${DERIVED_SOURCES_WEBCORE_DIR}"
    4949    "${CMAKE_BINARY_DIR}"
    5050)
  • trunk/Source/WebKit/ChangeLog

    r83539 r83792  
     12011-04-13  Ryuan Choi  <ryuan.choi@samsung.com>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [CMAKE] Separate DerivedSources.
     6        https://bugs.webkit.org/show_bug.cgi?id=58427
     7
     8        * CMakeLists.txt: Change DERIVED_SOURCES_DIR to DERIVED_SOURCES_WEBCORE_DIR
     9
    1102011-04-11  Alexis Menard  <alexis.menard@openbossa.org>
    211
  • trunk/Source/cmake/OptionsCommon.cmake

    r77073 r83792  
    66    "${JAVASCRIPTCORE_DIR}/wtf"
    77    "${JAVASCRIPTCORE_DIR}/wtf/unicode"
    8     "${DERIVED_SOURCES_DIR}"
     8    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
    99)
    1010
  • trunk/Source/cmake/WebKitFS.cmake

    r78211 r83792  
    1 SET(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
    2 
    3 FILE(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR})
     1FILE(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR})
     2FILE(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR})
    43FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Source/JavaScriptCore/runtime)
    54FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Programs)
  • trunk/Source/cmake/WebKitHelpers.cmake

    r75067 r83792  
    6666
    6767# Append the given dependencies to the source file
    68 # This one consider the given dependencies are in ${DERIVED_SOURCES_DIR}
     68# This one consider the given dependencies are in ${DERIVED_SOURCES_WEBCORE_DIR}
    6969# and prepends this to every member of dependencies list
    70 MACRO(ADD_SOURCE_DERIVED_DEPENDENCIES _source _deps)
     70MACRO(ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES _source _deps)
    7171  SET(_tmp "")
    7272  FOREACH (f ${_deps})
    73     LIST(APPEND _tmp "${DERIVED_SOURCES_DIR}/${f}")
     73    LIST(APPEND _tmp "${DERIVED_SOURCES_WEBCORE_DIR}/${f}")
    7474  ENDFOREACH ()
    7575
  • trunk/Source/cmake/WebKitMacros.cmake

    r75069 r83792  
    2828    SET(NAMES_GENERATOR ${WEBCORE_DIR}/dom/make_names.pl)
    2929    SET(_arguments  --attrs ${_attrs})
    30     SET(_outputfiles ${DERIVED_SOURCES_DIR}/${_namespace}Names.cpp ${DERIVED_SOURCES_DIR}/${_namespace}Names.h)
     30    SET(_outputfiles ${DERIVED_SOURCES_WEBCORE_DIR}/${_namespace}Names.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/${_namespace}Names.h)
    3131    SET(_extradef)
    3232    SET(_tags)
     
    4242    IF (_tags)
    4343        SET(_arguments "${_arguments}" --tags ${_tags} --factory --wrapperFactory)
    44         SET(_outputfiles "${_outputfiles}" ${DERIVED_SOURCES_DIR}/${_namespace}ElementFactory.cpp ${DERIVED_SOURCES_DIR}/${_namespace}ElementFactory.h ${DERIVED_SOURCES_DIR}/JS${_namespace}ElementWrapperFactory.cpp ${DERIVED_SOURCES_DIR}/JS${_namespace}ElementWrapperFactory.h)
     44        SET(_outputfiles "${_outputfiles}" ${DERIVED_SOURCES_WEBCORE_DIR}/${_namespace}ElementFactory.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/${_namespace}ElementFactory.h ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_namespace}ElementWrapperFactory.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_namespace}ElementWrapperFactory.h)
    4545    ENDIF ()
    4646
     
    5252        OUTPUT  ${_outputfiles}
    5353        DEPENDS ${NAMES_GENERATOR} ${SCRIPTS_BINDINGS} ${_attrs} ${_tags}
    54         COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${NAMES_GENERATOR} --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --outputDir ${DERIVED_SOURCES_DIR} ${_arguments} ${_additionArguments}
     54        COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${NAMES_GENERATOR} --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --outputDir ${DERIVED_SOURCES_WEBCORE_DIR} ${_arguments} ${_additionArguments}
    5555        VERBATIM)
    5656ENDMACRO ()
     
    8989
    9090    IF (${_source} STREQUAL "DocTypeStrings")
    91         SET(_hash_tools_h "${DERIVED_SOURCES_DIR}/HashTools.h")
     91        SET(_hash_tools_h "${DERIVED_SOURCES_WEBCORE_DIR}/HashTools.h")
    9292    ELSE ()
    9393        SET(_hash_tools_h "")
     
    9595
    9696    ADD_CUSTOM_COMMAND(
    97         OUTPUT ${DERIVED_SOURCES_DIR}/${_name}.cpp ${_hash_tools_h}
     97        OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/${_name}.cpp ${_hash_tools_h}
    9898        MAIN_DEPENDENCY ${_source}.gperf
    99         COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/make-hash-tools.pl ${DERIVED_SOURCES_DIR} ${_source}.gperf
     99        COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/make-hash-tools.pl ${DERIVED_SOURCES_WEBCORE_DIR} ${_source}.gperf
    100100        VERBATIM)
    101101
     
    109109        GET_FILENAME_COMPONENT(_path ${_file} PATH)
    110110
    111                 IF (NOT _file MATCHES "${DERIVED_SOURCES_DIR}")
     111                IF (NOT _file MATCHES "${DERIVED_SOURCES_WEBCORE_DIR}")
    112112            STRING(REGEX REPLACE "/" "\\\\\\\\" _sourcegroup "${_path}")
    113113            SOURCE_GROUP("${_sourcegroup}" FILES ${_file})
     
    115115
    116116        IF (WTF_PLATFORM_QT)
    117             SET(_moc_filename ${DERIVED_SOURCES_DIR}/${_basename}.moc)
     117            SET(_moc_filename ${DERIVED_SOURCES_WEBCORE_DIR}/${_basename}.moc)
    118118
    119119            FILE(READ ${_file} _contents)
     
    127127    ENDFOREACH ()
    128128
    129     SOURCE_GROUP("DerivedSources" REGULAR_EXPRESSION "${DERIVED_SOURCES_DIR}")
     129    SOURCE_GROUP("DerivedSources" REGULAR_EXPRESSION "${DERIVED_SOURCES_WEBCORE_DIR}")
    130130ENDMACRO ()
Note: See TracChangeset for help on using the changeset viewer.