Changeset 83792 in webkit
- Timestamp:
- Apr 13, 2011 5:44:38 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r83789 r83792 1 2011-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 1 17 2011-04-13 Tony Chang <tony@chromium.org> 2 18 -
trunk/Source/CMakeLists.txt
r81638 r83792 14 14 SET(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/WebKit") 15 15 SET(TOOLS_DIR "${CMAKE_SOURCE_DIR}/../Tools") 16 SET(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources") 16 SET(DERIVED_SOURCES_WEBCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore") 17 SET(DERIVED_SOURCES_JAVASCRIPTCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore") 17 18 18 19 INCLUDE(WebKitMacros) -
trunk/Source/JavaScriptCore/CMakeLists.txt
r83507 r83792 196 196 FOREACH (_file ${JavaScriptCore_LUT_FILES}) 197 197 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) 200 200 ENDFOREACH () 201 201 202 202 203 203 # 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)204 GENERATE_HASH_LUT(${JAVASCRIPTCORE_DIR}/parser/Keywords.table ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Lexer.lut.h MAIN_DEPENDENCY) 205 LIST(APPEND JavaScriptCore_HEADERS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Lexer.lut.h) 206 206 207 207 #GENERATOR: "RegExpJitTables.h": tables used by Yarr 208 208 ADD_CUSTOM_COMMAND( 209 OUTPUT ${DERIVED_SOURCES_ DIR}/RegExpJitTables.h209 OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/RegExpJitTables.h 210 210 MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/create_regex_tables 211 COMMAND ${PYTHON_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/create_regex_tables > ${DERIVED_SOURCES_ DIR}/RegExpJitTables.h211 COMMAND ${PYTHON_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/create_regex_tables > ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/RegExpJitTables.h 212 212 VERBATIM) 213 ADD_SOURCE_DEPENDENCIES(${JAVASCRIPTCORE_DIR}/yarr/YarrPattern.cpp ${DERIVED_SOURCES_ DIR}/RegExpJitTables.h)213 ADD_SOURCE_DEPENDENCIES(${JAVASCRIPTCORE_DIR}/yarr/YarrPattern.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/RegExpJitTables.h) 214 214 215 215 -
trunk/Source/JavaScriptCore/ChangeLog
r83773 r83792 1 2011-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 1 10 2011-04-13 Geoffrey Garen <ggaren@apple.com> 2 11 -
trunk/Source/WebCore/CMakeLists.txt
r83729 r83792 76 76 "${JAVASCRIPTCORE_DIR}/wtf/unicode" 77 77 "${JAVASCRIPTCORE_DIR}/yarr" 78 "${DERIVED_SOURCES_ DIR}"78 "${DERIVED_SOURCES_WEBCORE_DIR}" 79 79 "${CMAKE_SOURCE_DIR}" 80 80 "${CMAKE_BINARY_DIR}" … … 1984 1984 # All Web Inspector generated files are created with this one call to CodeGeneratorInspector.pm 1985 1985 ADD_CUSTOM_COMMAND( 1986 OUTPUT ${DERIVED_SOURCES_ DIR}/Inspector.idl1986 OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/Inspector.idl 1987 1987 MAIN_DEPENDENCY inspector/Inspector.json 1988 1988 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.json1989 COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/inspector/generate-inspector-idl -o ${DERIVED_SOURCES_WEBCORE_DIR}/Inspector.idl ${WEBCORE_DIR}/inspector/Inspector.json 1990 1990 VERBATIM) 1991 1991 1992 1992 ADD_CUSTOM_COMMAND( 1993 OUTPUT ${DERIVED_SOURCES_ DIR}/InspectorBackendDispatcher.cpp ${DERIVED_SOURCES_DIR}/InspectorBackendDispatcher.h ${DERIVED_SOURCES_DIR}/InspectorFrontend.cpp ${DERIVED_SOURCES_DIR}/InspectorFrontend.h1994 MAIN_DEPENDENCY ${DERIVED_SOURCES_ DIR}/Inspector.idl1995 DEPENDS ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl ${SCRIPTS_BINDINGS} ${WEBCORE_DIR}/inspector/CodeGeneratorInspector.pm ${DERIVED_SOURCES_ DIR}/Inspector.idl1996 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.idl1993 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 1997 1997 VERBATIM) 1998 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_ DIR}/InspectorBackendDispatcher.cpp ${DERIVED_SOURCES_DIR}/InspectorFrontend.cpp)1998 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorBackendDispatcher.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorFrontend.cpp) 1999 1999 2000 2000 2001 2001 # Generate InjectedScriptSource.h 2002 2002 ADD_CUSTOM_COMMAND( 2003 OUTPUT ${DERIVED_SOURCES_ DIR}/InjectedScriptSource.h2003 OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedScriptSource.h 2004 2004 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.h2005 COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/inspector/xxd.pl InjectedScriptSource_js ${WEBCORE_DIR}/inspector/InjectedScriptSource.js ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedScriptSource.h 2006 2006 VERBATIM) 2007 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_ DIR}/InjectedScriptSource.h)2007 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedScriptSource.h) 2008 2008 2009 2009 2010 2010 MAKE_HASH_TOOLS(${WEBCORE_DIR}/platform/ColorData) 2011 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_ DIR}/ColorData.cpp)2011 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/ColorData.cpp) 2012 2012 2013 2013 2014 2014 MAKE_HASH_TOOLS(${WEBCORE_DIR}/html/DocTypeStrings) 2015 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_ DIR}/DocTypeStrings.cpp)2015 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/DocTypeStrings.cpp) 2016 2016 2017 2017 2018 2018 # Generate XMLViewerCSS.h 2019 2019 ADD_CUSTOM_COMMAND( 2020 OUTPUT ${DERIVED_SOURCES_ DIR}/XMLViewerCSS.h2020 OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerCSS.h 2021 2021 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.h2022 COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/inspector/xxd.pl XMLViewer_css ${WEBCORE_DIR}/xml/XMLViewer.css ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerCSS.h 2023 2023 VERBATIM) 2024 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_ DIR}/XMLViewerCSS.h)2024 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerCSS.h) 2025 2025 2026 2026 2027 2027 # Generate XMLViewerJS.h 2028 2028 ADD_CUSTOM_COMMAND( 2029 OUTPUT ${DERIVED_SOURCES_ DIR}/XMLViewerJS.h2029 OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerJS.h 2030 2030 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.h2031 COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/inspector/xxd.pl XMLViewer_js ${WEBCORE_DIR}/xml/XMLViewer.js ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerJS.h 2032 2032 VERBATIM) 2033 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_ DIR}/XMLViewerJS.h)2033 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerJS.h) 2034 2034 2035 2035 2036 2036 # Generate HTML entity table 2037 2037 ADD_CUSTOM_COMMAND( 2038 OUTPUT ${DERIVED_SOURCES_ DIR}/HTMLEntityTable.cpp2038 OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLEntityTable.cpp 2039 2039 MAIN_DEPENDENCY ${WEBCORE_DIR}/html/parser/HTMLEntityNames.in 2040 2040 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.in2041 COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/html/parser/create-html-entity-table -o ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLEntityTable.cpp ${WEBCORE_DIR}/html/parser/HTMLEntityNames.in 2042 2042 VERBATIM) 2043 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_ DIR}/HTMLEntityTable.cpp)2043 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLEntityTable.cpp) 2044 2044 2045 2045 … … 2047 2047 FILE(TO_NATIVE_PATH ${PERL_EXECUTABLE} PERL_EXECUTABLE_NATIVE_PATH) 2048 2048 ADD_CUSTOM_COMMAND( 2049 OUTPUT ${DERIVED_SOURCES_ DIR}/tokenizer.cpp2049 OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/tokenizer.cpp 2050 2050 MAIN_DEPENDENCY ${WEBCORE_DIR}/css/maketokenizer 2051 2051 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.cpp2052 COMMAND ${FLEX_EXECUTABLE} -t ${WEBCORE_DIR}/css/tokenizer.flex | ${PERL_EXECUTABLE_NATIVE_PATH} ${WEBCORE_DIR}/css/maketokenizer > ${DERIVED_SOURCES_WEBCORE_DIR}/tokenizer.cpp 2053 2053 VERBATIM) 2054 ADD_SOURCE_ DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp tokenizer.cpp)2054 ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp tokenizer.cpp) 2055 2055 2056 2056 2057 2057 # Generate CSS property names 2058 2058 ADD_CUSTOM_COMMAND ( 2059 OUTPUT ${DERIVED_SOURCES_ DIR}/CSSPropertyNames.in ${DERIVED_SOURCES_DIR}/CSSPropertyNames.h ${DERIVED_SOURCES_DIR}/CSSPropertyNames.cpp ${DERIVED_SOURCES_DIR}/CSSPropertyNames.gperf2059 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 2060 2060 MAIN_DEPENDENCY ${WEBCORE_DIR}/css/makeprop.pl 2061 2061 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.in2062 WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR} 2063 COMMAND ${PERL_EXECUTABLE} -ne "print" ${WebCore_CSS_PROPERTY_NAMES} > ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.in 2064 2064 COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/makeprop.pl 2065 2065 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)2066 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.cpp) 2067 ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp CSSValueKeywords.h) 2068 ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp CSSPropertyNames.h) 2069 2069 2070 2070 2071 2071 # Generate CSS value keywords 2072 2072 ADD_CUSTOM_COMMAND ( 2073 OUTPUT ${DERIVED_SOURCES_ DIR}/CSSValueKeywords.in ${DERIVED_SOURCES_DIR}/CSSValueKeywords.h ${DERIVED_SOURCES_DIR}/CSSValueKeywords.cpp ${DERIVED_SOURCES_DIR}/CSSValueKeywords.gperf2073 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 2074 2074 MAIN_DEPENDENCY ${WEBCORE_DIR}/css/makevalues.pl 2075 2075 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.in2076 WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR} 2077 COMMAND ${PERL_EXECUTABLE} -ne "print lc" ${WebCore_CSS_VALUE_KEYWORDS} > ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.in 2078 2078 COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/makevalues.pl 2079 2079 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)2080 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.cpp) 2081 ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp CSSValueKeywords.h) 2082 ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSPrimitiveValueMappings.h CSSValueKeywords.h) 2083 ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp CSSValueKeywords.h) 2084 2084 2085 2085 2086 2086 # Generate user agent styles 2087 2087 ADD_CUSTOM_COMMAND( 2088 OUTPUT ${DERIVED_SOURCES_ DIR}/UserAgentStyleSheetsData.cpp ${DERIVED_SOURCES_DIR}/UserAgentStyleSheets.h2088 OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheetsData.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheets.h 2089 2089 MAIN_DEPENDENCY ${WEBCORE_DIR}/css/make-css-file-arrays.pl 2090 2090 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} 2092 2092 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)2093 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheetsData.cpp) 2094 ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSStyleSelector.cpp UserAgentStyleSheetsData.cpp UserAgentStyleSheets.h) 2095 2096 2097 GENERATE_GRAMMAR(cssyy ${WEBCORE_DIR}/css/CSSGrammar.y ${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.h ${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp) 2098 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp) 2099 2100 2101 GENERATE_GRAMMAR(xpathyy ${WEBCORE_DIR}/xml/XPathGrammar.y ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.h ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.cpp) 2102 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.cpp) 2103 2104 2105 2106 ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/html/HTMLTreeBuilder.cpp MathMLNames.cpp) 2107 2107 2108 2108 2109 2109 GENERATE_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)2110 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLNames.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLElementFactory.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/JSHTMLElementWrapperFactory.cpp) 2111 2111 2112 2112 2113 2113 GENERATE_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)2114 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/MathMLNames.cpp) 2115 2115 IF (ENABLE_MATHML) 2116 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_ DIR}/MathMLElementFactory.cpp)2116 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/MathMLElementFactory.cpp) 2117 2117 ENDIF () 2118 2118 2119 2119 2120 2120 GENERATE_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)2121 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/SVGNames.cpp) 2122 2122 IF (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) 2124 2124 ENDIF () 2125 2125 2126 2126 2127 2127 GENERATE_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)2128 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/WMLNames.cpp) 2129 2129 IF (ENABLE_WML) 2130 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_ DIR}/WMLElementFactory.cpp)2130 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/WMLElementFactory.cpp) 2131 2131 ENDIF () 2132 2132 2133 2133 2134 2134 GENERATE_DOM_NAMES(XLink ${WEBCORE_DIR}/svg/xlinkattrs.in) 2135 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_ DIR}/XLinkNames.cpp)2135 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XLinkNames.cpp) 2136 2136 2137 2137 2138 2138 GENERATE_DOM_NAMES(XMLNS ${WEBCORE_DIR}/xml/xmlnsattrs.in) 2139 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_ DIR}/XMLNSNames.cpp)2139 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XMLNSNames.cpp) 2140 2140 2141 2141 2142 2142 GENERATE_DOM_NAMES(XML ${WEBCORE_DIR}/xml/xmlattrs.in) 2143 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_ DIR}/XMLNames.cpp)2143 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XMLNames.cpp) 2144 2144 2145 2145 2146 2146 ADD_CUSTOM_COMMAND( 2147 OUTPUT ${DERIVED_SOURCES_ DIR}/WebKitVersion.h2147 OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitVersion.h 2148 2148 MAIN_DEPENDENCY ${WEBKIT_DIR}/scripts/generate-webkitversion.pl 2149 2149 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} 2151 2151 VERBATIM) 2152 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_ DIR}/WebKitVersion.h)2152 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitVersion.h) 2153 2153 2154 2154 -
trunk/Source/WebCore/ChangeLog
r83790 r83792 1 2011-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 1 13 2011-04-13 Noel Gordon <noel.gordon@gmail.com> 2 14 -
trunk/Source/WebCore/UseJSC.cmake
r82450 r83792 195 195 GET_FILENAME_COMPONENT (_name ${_file} NAME_WE) 196 196 ADD_CUSTOM_COMMAND( 197 OUTPUT ${DERIVED_SOURCES_ DIR}/JS${_name}.cpp ${DERIVED_SOURCES_DIR}/JS${_name}.h197 OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_name}.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_name}.h 198 198 MAIN_DEPENDENCY ${_file} 199 199 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} 201 201 VERBATIM) 202 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_ DIR}/JS${_name}.cpp)202 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_name}.cpp) 203 203 ENDFOREACH () -
trunk/Source/WebKit/CMakeLists.txt
r83385 r83792 46 46 "${JAVASCRIPTCORE_DIR}/wtf" 47 47 "${JAVASCRIPTCORE_DIR}/wtf/unicode" 48 "${DERIVED_SOURCES_ DIR}"48 "${DERIVED_SOURCES_WEBCORE_DIR}" 49 49 "${CMAKE_BINARY_DIR}" 50 50 ) -
trunk/Source/WebKit/ChangeLog
r83539 r83792 1 2011-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 1 10 2011-04-11 Alexis Menard <alexis.menard@openbossa.org> 2 11 -
trunk/Source/cmake/OptionsCommon.cmake
r77073 r83792 6 6 "${JAVASCRIPTCORE_DIR}/wtf" 7 7 "${JAVASCRIPTCORE_DIR}/wtf/unicode" 8 "${DERIVED_SOURCES_ DIR}"8 "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}" 9 9 ) 10 10 -
trunk/Source/cmake/WebKitFS.cmake
r78211 r83792 1 SET(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources") 2 3 FILE(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}) 1 FILE(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}) 2 FILE(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}) 4 3 FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Source/JavaScriptCore/runtime) 5 4 FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Programs) -
trunk/Source/cmake/WebKitHelpers.cmake
r75067 r83792 66 66 67 67 # 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} 69 69 # and prepends this to every member of dependencies list 70 MACRO(ADD_SOURCE_ DERIVED_DEPENDENCIES _source _deps)70 MACRO(ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES _source _deps) 71 71 SET(_tmp "") 72 72 FOREACH (f ${_deps}) 73 LIST(APPEND _tmp "${DERIVED_SOURCES_ DIR}/${f}")73 LIST(APPEND _tmp "${DERIVED_SOURCES_WEBCORE_DIR}/${f}") 74 74 ENDFOREACH () 75 75 -
trunk/Source/cmake/WebKitMacros.cmake
r75069 r83792 28 28 SET(NAMES_GENERATOR ${WEBCORE_DIR}/dom/make_names.pl) 29 29 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) 31 31 SET(_extradef) 32 32 SET(_tags) … … 42 42 IF (_tags) 43 43 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) 45 45 ENDIF () 46 46 … … 52 52 OUTPUT ${_outputfiles} 53 53 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} 55 55 VERBATIM) 56 56 ENDMACRO () … … 89 89 90 90 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") 92 92 ELSE () 93 93 SET(_hash_tools_h "") … … 95 95 96 96 ADD_CUSTOM_COMMAND( 97 OUTPUT ${DERIVED_SOURCES_ DIR}/${_name}.cpp ${_hash_tools_h}97 OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/${_name}.cpp ${_hash_tools_h} 98 98 MAIN_DEPENDENCY ${_source}.gperf 99 COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/make-hash-tools.pl ${DERIVED_SOURCES_ DIR} ${_source}.gperf99 COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/make-hash-tools.pl ${DERIVED_SOURCES_WEBCORE_DIR} ${_source}.gperf 100 100 VERBATIM) 101 101 … … 109 109 GET_FILENAME_COMPONENT(_path ${_file} PATH) 110 110 111 IF (NOT _file MATCHES "${DERIVED_SOURCES_ DIR}")111 IF (NOT _file MATCHES "${DERIVED_SOURCES_WEBCORE_DIR}") 112 112 STRING(REGEX REPLACE "/" "\\\\\\\\" _sourcegroup "${_path}") 113 113 SOURCE_GROUP("${_sourcegroup}" FILES ${_file}) … … 115 115 116 116 IF (WTF_PLATFORM_QT) 117 SET(_moc_filename ${DERIVED_SOURCES_ DIR}/${_basename}.moc)117 SET(_moc_filename ${DERIVED_SOURCES_WEBCORE_DIR}/${_basename}.moc) 118 118 119 119 FILE(READ ${_file} _contents) … … 127 127 ENDFOREACH () 128 128 129 SOURCE_GROUP("DerivedSources" REGULAR_EXPRESSION "${DERIVED_SOURCES_ DIR}")129 SOURCE_GROUP("DerivedSources" REGULAR_EXPRESSION "${DERIVED_SOURCES_WEBCORE_DIR}") 130 130 ENDMACRO ()
Note: See TracChangeset
for help on using the changeset viewer.