Changeset 128261 in webkit
- Timestamp:
- Sep 11, 2012 9:24:57 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r128231 r128261 1 2012-09-11 Ryuan Choi <ryuan.choi@samsung.com> 2 3 [CMAKE] Supply feature defines to CodeGeneratorTestRunner. 4 https://bugs.webkit.org/show_bug.cgi?id=96273 5 6 Reviewed by Gyuyoung Kim. 7 8 * Source/cmake/WebKitFeatures.cmake: Generated FEATURE_DEFINES_WITH_SPACE_SEPARATOR. 9 1 10 2012-09-11 Arnaud Renevier <a.renevier@sisa.samsung.com> 2 11 -
trunk/Source/WebCore/CMakeLists.txt
r128191 r128261 2815 2815 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLEntityTable.cpp) 2816 2816 2817 2818 # Replace ";" with "space" in order to recognize feature definition in css files. 2819 SET(FEATURE_DEFINES_WITH_SPACE_SEPARATOR "") 2820 FOREACH(_feature ${FEATURE_DEFINES}) 2817 SET(FEATURE_DEFINES_CSS ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}) 2818 IF (CMAKE_SYSTEM_NAME MATCHES "QNX") 2821 2819 # filter out color input since we have our own solution 2822 IF (NOT CMAKE_SYSTEM_NAME MATCHES "QNX" OR NOT _feature MATCHES "ENABLE_INPUT_TYPE_COLOR") 2823 SET(FEATURE_DEFINES_WITH_SPACE_SEPARATOR "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR} ${_feature}") 2824 ENDIF() 2825 ENDFOREACH() 2826 2820 STRING(REPLACE "ENABLE_INPUT_TYPE_COLOR" "" FEATURE_DEFINES_CSS "${FEATURE_DEFINES_CSS}") 2821 ENDIF() 2827 2822 2828 2823 # Generate CSS property names … … 2833 2828 WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR} 2834 2829 COMMAND ${PERL_EXECUTABLE} -ne "print" ${WebCore_CSS_PROPERTY_NAMES} > ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.in 2835 COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/css/makeprop.pl --defines "${FEATURE_DEFINES_ WITH_SPACE_SEPARATOR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}"2830 COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/css/makeprop.pl --defines "${FEATURE_DEFINES_CSS}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" 2836 2831 VERBATIM) 2837 2832 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.cpp) … … 2847 2842 WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR} 2848 2843 COMMAND ${PERL_EXECUTABLE} -ne "print" ${WebCore_CSS_VALUE_KEYWORDS} > ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.in 2849 COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/css/makevalues.pl --defines "${FEATURE_DEFINES_ WITH_SPACE_SEPARATOR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}"2844 COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/css/makevalues.pl --defines "${FEATURE_DEFINES_CSS}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" 2850 2845 VERBATIM) 2851 2846 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.cpp) … … 2859 2854 MAIN_DEPENDENCY ${WEBCORE_DIR}/css/make-css-file-arrays.pl 2860 2855 DEPENDS ${WebCore_USER_AGENT_STYLE_SHEETS} ${WEBCORE_DIR}/bindings/scripts/preprocessor.pm 2861 COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/css/make-css-file-arrays.pl --defines "${FEATURE_DEFINES_ WITH_SPACE_SEPARATOR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheets.h ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheetsData.cpp ${WebCore_USER_AGENT_STYLE_SHEETS}2856 COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/css/make-css-file-arrays.pl --defines "${FEATURE_DEFINES_CSS}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheets.h ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheetsData.cpp ${WebCore_USER_AGENT_STYLE_SHEETS} 2862 2857 VERBATIM) 2863 2858 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheetsData.cpp) -
trunk/Source/WebCore/ChangeLog
r128258 r128261 1 2012-09-11 Ryuan Choi <ryuan.choi@samsung.com> 2 3 [CMAKE] Supply feature defines to CodeGeneratorTestRunner. 4 https://bugs.webkit.org/show_bug.cgi?id=96273 5 6 Reviewed by Gyuyoung Kim. 7 8 * CMakeLists.txt: Extracted FEATURE_DEFINES with space separator to share. 9 * PlatformBlackBerry.cmake: Ditto. 10 * UseJSC.cmake: Ditto. 11 * UseV8.cmake: Ditto. 12 1 13 2012-09-11 Nico Weber <thakis@chromium.org> 2 14 -
trunk/Source/WebCore/PlatformBlackBerry.cmake
r126230 r128261 315 315 # We define a new list of feature defines that is prefixed with LANGUAGE_CPP=1 so as to avoid the 316 316 # warning "missing whitespace after the macro name" when inlining "LANGUAGE_CPP=1 ${FEATURE_DEFINES}". 317 SET(FEATURE_DEFINES_WEBCORE "LANGUAGE_CPP=1") 318 FOREACH (_feature ${FEATURE_DEFINES}) 319 SET(FEATURE_DEFINES_WEBCORE "${FEATURE_DEFINES_WEBCORE} ${_feature}") 320 ENDFOREACH () 317 SET(FEATURE_DEFINES_WEBCORE "LANGUAGE_CPP=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}") 321 318 322 319 # FIXME: We need to add the IDLs for SQL storage and Web Workers. See PR #123484. -
trunk/Source/WebCore/UseJSC.cmake
r127249 r128261 305 305 ENDFOREACH () 306 306 307 SET(FEATURE_DEFINES_JAVASCRIPT "LANGUAGE_JAVASCRIPT=1") 308 FOREACH (_feature ${FEATURE_DEFINES}) 309 SET(FEATURE_DEFINES_JAVASCRIPT "${FEATURE_DEFINES_JAVASCRIPT} ${_feature}") 310 ENDFOREACH () 307 SET(FEATURE_DEFINES_JAVASCRIPT "LANGUAGE_JAVASCRIPT=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}") 311 308 312 309 # Create JavaScript C++ code given an IDL input -
trunk/Source/WebCore/UseV8.cmake
r128159 r128261 231 231 ENDFOREACH () 232 232 233 SET(FEATURE_DEFINES_JAVASCRIPT "LANGUAGE_JAVASCRIPT=1 V8_BINDING=1") 234 FOREACH (_feature ${FEATURE_DEFINES}) 235 SET(FEATURE_DEFINES_JAVASCRIPT "${FEATURE_DEFINES_JAVASCRIPT} ${_feature}") 236 ENDFOREACH () 233 SET(FEATURE_DEFINES_JAVASCRIPT "LANGUAGE_JAVASCRIPT=1 V8_BINDING=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}") 237 234 238 235 # Generate DebuggerScriptSource.h -
trunk/Source/cmake/WebKitFeatures.cmake
r128065 r128261 158 158 IF (${_name}) 159 159 LIST(APPEND FEATURE_DEFINES ${_name}) 160 SET(FEATURE_DEFINES_WITH_SPACE_SEPARATOR "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR} ${_name}") 160 161 SET(_MESSAGE "${_MESSAGE} ON") 161 162 ELSE () -
trunk/Tools/ChangeLog
r128232 r128261 1 2012-09-11 Ryuan Choi <ryuan.choi@samsung.com> 2 3 [CMAKE] Supply feature defines to CodeGeneratorTestRunner. 4 https://bugs.webkit.org/show_bug.cgi?id=96273 5 6 Reviewed by Gyuyoung Kim. 7 8 Passed FEATURE_DEFINES_WITH_SPACE_SEPARATOR to CodeGeneratorTestRunner 9 in order to distinguish compile time options such as ENABLE(TOUCH_EVENTS). 10 11 * WebKitTestRunner/CMakeLists.txt: 12 1 13 2012-09-11 Dirk Pranke <dpranke@chromium.org> 2 14 -
trunk/Tools/WebKitTestRunner/CMakeLists.txt
r128191 r128261 69 69 "${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/Bindings" 70 70 "--include=${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/Bindings" 71 " "71 "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}" 72 72 ${DERIVED_SOURCES_DIR}/InjectedBundle JS TestRunner 73 73 )
Note: See TracChangeset
for help on using the changeset viewer.