Changeset 128261 in webkit


Ignore:
Timestamp:
Sep 11, 2012 9:24:57 PM (12 years ago)
Author:
ryuan.choi@samsung.com
Message:

[CMAKE] Supply feature defines to CodeGeneratorTestRunner.
​https://bugs.webkit.org/show_bug.cgi?id=96273

Reviewed by Gyuyoung Kim.

.:

  • Source/cmake/WebKitFeatures.cmake: Generated FEATURE_DEFINES_WITH_SPACE_SEPARATOR.

Source/WebCore:

  • CMakeLists.txt: Extracted FEATURE_DEFINES with space separator to share.
  • PlatformBlackBerry.cmake: Ditto.
  • UseJSC.cmake: Ditto.
  • UseV8.cmake: Ditto.

Tools:

Passed FEATURE_DEFINES_WITH_SPACE_SEPARATOR to CodeGeneratorTestRunner
in order to distinguish compile time options such as ENABLE(TOUCH_EVENTS).

  • WebKitTestRunner/CMakeLists.txt:
Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r128231 r128261  
     12012-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
    1102012-09-11  Arnaud Renevier  <a.renevier@sisa.samsung.com>
    211

  • trunk/Source/WebCore/CMakeLists.txt

    r128191 r128261  
    28152815LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLEntityTable.cpp)
    28162816
    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})
     2817SET(FEATURE_DEFINES_CSS ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR})
     2818IF (CMAKE_SYSTEM_NAME MATCHES "QNX")
    28212819    # 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}")
     2821ENDIF()
    28272822
    28282823# Generate CSS property names
    … …  
    28332828    WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}
    28342829    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}"
    28362831    VERBATIM)
    28372832LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.cpp)
    … …  
    28472842    WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}
    28482843    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}"
    28502845    VERBATIM)
    28512846LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.cpp)
    … …  
    28592854    MAIN_DEPENDENCY ${WEBCORE_DIR}/css/make-css-file-arrays.pl
    28602855    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}
    28622857    VERBATIM)
    28632858LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheetsData.cpp)

  • trunk/Source/WebCore/ChangeLog

    r128258 r128261  
     12012-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
    1132012-09-11  Nico Weber  <thakis@chromium.org>
    214

  • trunk/Source/WebCore/PlatformBlackBerry.cmake

    r126230 r128261  
    315315# We define a new list of feature defines that is prefixed with LANGUAGE_CPP=1 so as to avoid the
    316316# 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 ()
     317SET(FEATURE_DEFINES_WEBCORE "LANGUAGE_CPP=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
    321318
    322319# FIXME: We need to add the IDLs for SQL storage and Web Workers. See PR #123484.

  • trunk/Source/WebCore/UseJSC.cmake

    r127249 r128261  
    305305ENDFOREACH ()
    306306
    307 SET(FEATURE_DEFINES_JAVASCRIPT "LANGUAGE_JAVASCRIPT=1")
    308 FOREACH (_feature ${FEATURE_DEFINES})
    309     SET(FEATURE_DEFINES_JAVASCRIPT "${FEATURE_DEFINES_JAVASCRIPT} ${_feature}")
    310 ENDFOREACH ()
     307SET(FEATURE_DEFINES_JAVASCRIPT "LANGUAGE_JAVASCRIPT=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
    311308
    312309# Create JavaScript C++ code given an IDL input

  • trunk/Source/WebCore/UseV8.cmake

    r128159 r128261  
    231231ENDFOREACH ()
    232232
    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 ()
     233SET(FEATURE_DEFINES_JAVASCRIPT "LANGUAGE_JAVASCRIPT=1 V8_BINDING=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
    237234
    238235# Generate DebuggerScriptSource.h

  • trunk/Source/cmake/WebKitFeatures.cmake

    r128065 r128261  
    158158        IF (${_name})
    159159            LIST(APPEND FEATURE_DEFINES ${_name})
     160            SET(FEATURE_DEFINES_WITH_SPACE_SEPARATOR "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR} ${_name}")
    160161            SET(_MESSAGE "${_MESSAGE} ON")
    161162        ELSE ()

  • trunk/Tools/ChangeLog

    r128232 r128261  
     12012-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
    1132012-09-11  Dirk Pranke  <dpranke@chromium.org>
    214

  • trunk/Tools/WebKitTestRunner/CMakeLists.txt

    r128191 r128261  
    6969    "${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/Bindings"
    7070    "--include=${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/Bindings"
    71     ""
     71    "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}"
    7272    ${DERIVED_SOURCES_DIR}/InjectedBundle JS TestRunner
    7373    )
Note: See TracChangeset for help on using the changeset viewer.