Changeset 109787 in webkit


Ignore:
Timestamp:
Mar 5, 2012 1:02:31 PM (12 years ago)
Author:
Patrick Gansterer
Message:

[CMake][DRT] Add WebCoreTestSupport.
​https://bugs.webkit.org/show_bug.cgi?id=79896

Patch by Kangil Han <​kangil.han@samsung.com> on 2012-03-05
Reviewed by Daniel Bates.

Add WebCoreTestSupport library for DRT in CMake.
We will use internals object by linking this library on DRT.

.:

  • CMakeLists.txt:

Source/WebCore:

  • CMakeLists.txt:
  • UseJSC.cmake:
  • UseV8.cmake:
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/CMakeLists.txt

    r109197 r109787  
    117117SET(WebKit_LIBRARY_NAME WebKit)
    118118SET(WebKit2_LIBRARY_NAME WebKit2)
     119SET(WebCoreTestSupport_LIBRARY_NAME WebCoreTestSupport)
    119120
    120121# -----------------------------------------------------------------------------
    … …  
    133134SET(WebKit_LIBRARY_TYPE SHARED)
    134135SET(WebKit2_LIBRARY_TYPE SHARED)
     136SET(WebCoreTestSupport_LIBRARY_TYPE STATIC)
    135137
    136138# -----------------------------------------------------------------------------

  • trunk/ChangeLog

    r109760 r109787  
     12012-03-05  Kangil Han  <kangil.han@samsung.com>
     2
     3        [CMake][DRT] Add WebCoreTestSupport.
     4        https://bugs.webkit.org/show_bug.cgi?id=79896
     5
     6        Reviewed by Daniel Bates.
     7
     8        Add WebCoreTestSupport library for DRT in CMake.
     9        We will use internals object by linking this library on DRT.
     10
     11        * CMakeLists.txt:
     12
    1132012-03-05  Martin Robinson  <mrobinson@igalia.com>
    214

  • trunk/Source/WebCore/CMakeLists.txt

    r109695 r109787  
    22912291ENDIF ()
    22922292
     2293SET(WebCoreTestSupport_INCLUDE_DIRECTORIES
     2294    "${WebCore_INCLUDE_DIRECTORIES}"
     2295    "${WEBCORE_DIR}/testing"
     2296)
     2297
     2298SET(WebCoreTestSupport_IDL_INCLUDES
     2299    testing
     2300)
     2301
     2302SET(WebCoreTestSupport_IDL_FILES
     2303    testing/Internals.idl
     2304    testing/InternalSettings.idl
     2305)
     2306
     2307SET(WebCoreTestSupport_SOURCES
     2308    testing/Internals.cpp
     2309    testing/InternalSettings.cpp
     2310)
     2311
    22932312# Modules that the bindings generator scripts may use
    22942313SET(SCRIPTS_RESOLVE_SUPPLEMENTAL
    … …  
    24992518LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitVersion.h)
    25002519
    2501 
    2502 
    25032520WEBKIT_WRAP_SOURCELIST(${WebCore_IDL_FILES} ${WebCore_SOURCES})
     2521WEBKIT_WRAP_SOURCELIST(${WebCoreTestSupport_IDL_FILES} ${WebCoreTestSupport_SOURCES})
     2522
    25042523ADD_DEFINITIONS(-DBUILDING_WebCore)
    2505 INCLUDE_DIRECTORIES(${WebCore_INCLUDE_DIRECTORIES})
     2524INCLUDE_DIRECTORIES(${WebCore_INCLUDE_DIRECTORIES} ${WebCoreTestSupport_INCLUDE_DIRECTORIES})
     2525
    25062526ADD_LIBRARY(${WebCore_LIBRARY_NAME} ${WebCore_LIBRARY_TYPE} ${WebCore_SOURCES})
     2527ADD_LIBRARY(${WebCoreTestSupport_LIBRARY_NAME} ${WebCoreTestSupport_LIBRARY_TYPE} ${WebCoreTestSupport_SOURCES})
     2528
    25072529ADD_DEPENDENCIES(${WebCore_LIBRARY_NAME} ${JavaScriptCore_LIBRARY_NAME})
     2530ADD_DEPENDENCIES(${WebCoreTestSupport_LIBRARY_NAME} ${WebCore_LIBRARY_NAME})
     2531
    25082532TARGET_LINK_LIBRARIES(${WebCore_LIBRARY_NAME} ${WebCore_LIBRARIES})
    25092533
    25102534IF (WebCore_LINK_FLAGS)
    25112535    ADD_TARGET_PROPERTIES(${WebCore_LIBRARY_NAME} LINK_FLAGS "${WebCore_LINK_FLAGS}")
     2536    ADD_TARGET_PROPERTIES(${WebCoreTestSupport_LIBRARY_NAME} LINK_FLAGS "${WebCore_LINK_FLAGS}")
    25122537ENDIF ()
    25132538

  • trunk/Source/WebCore/ChangeLog

    r109785 r109787  
     12012-03-05  Kangil Han  <kangil.han@samsung.com>
     2
     3        [CMake][DRT] Add WebCoreTestSupport.
     4        https://bugs.webkit.org/show_bug.cgi?id=79896
     5
     6        Reviewed by Daniel Bates.
     7
     8        Add WebCoreTestSupport library for DRT in CMake.
     9        We will use internals object by linking this library on DRT.
     10
     11        * CMakeLists.txt:
     12        * UseJSC.cmake:
     13        * UseV8.cmake:
     14
    1152012-03-05  Sheriff Bot  <webkit.review.bot@gmail.com>
    216

  • trunk/Source/WebCore/UseJSC.cmake

    r109036 r109787  
    22    "${WEBCORE_DIR}/bindings/js"
    33    "${WEBCORE_DIR}/bridge/jsc"
     4)
     5
     6LIST(APPEND WebCoreTestSupport_INCLUDE_DIRECTORIES
     7    "${WEBCORE_DIR}/testing/js"
    48)
    59
    … …  
    165169)
    166170
     171LIST(APPEND WebCoreTestSupport_SOURCES
     172    testing/js/JSInternalsCustom.cpp
     173    testing/js/WebCoreTestSupport.cpp
     174)
     175
    167176IF (ENABLE_BLOB)
    168177    LIST(APPEND WebCore_SOURCES
    … …  
    255264ENDFOREACH ()
    256265
     266FOREACH (_include ${WebCoreTestSupport_IDL_INCLUDES})
     267    LIST(APPEND IDL_INCLUDES --include=${WEBCORE_DIR}/${_include})
     268ENDFOREACH ()
     269
    257270SET(FEATURE_DEFINES_JAVASCRIPT "LANGUAGE_JAVASCRIPT=1")
    258271FOREACH (_feature ${FEATURE_DEFINES})
    … …  
    264277    SET(IDL_FILES_LIST "${IDL_FILES_LIST}${WEBCORE_DIR}/${_idl}\n")
    265278ENDFOREACH ()
     279
     280FOREACH (_idl ${WebCoreTestSupport_IDL_FILES})
     281    SET(IDL_FILES_LIST "${IDL_FILES_LIST}${WEBCORE_DIR}/${_idl}\n")
     282ENDFOREACH ()
     283
    266284FILE(WRITE ${IDL_FILES_TMP} ${IDL_FILES_LIST})
    267285
    268286ADD_CUSTOM_COMMAND(
    269287    OUTPUT ${SUPPLEMENTAL_DEPENDENCY_FILE}
    270     DEPENDS ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl ${SCRIPTS_PREPROCESS_IDLS} ${WebCore_IDL_FILES} ${IDL_ATTRIBUTES_FILE}
     288    DEPENDS ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl ${SCRIPTS_PREPROCESS_IDLS} ${WebCore_IDL_FILES} ${WebCoreTestSupport_IDL_FILES} ${IDL_ATTRIBUTES_FILE}
    271289    COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --idlFilesList ${IDL_FILES_TMP} --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --supplementalDependencyFile ${SUPPLEMENTAL_DEPENDENCY_FILE} --idlAttributesFile ${IDL_ATTRIBUTES_FILE}
    272290    VERBATIM)
    … …  
    282300    LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_name}.cpp)
    283301ENDFOREACH ()
     302
     303FOREACH (_file ${WebCoreTestSupport_IDL_FILES})
     304    GET_FILENAME_COMPONENT (_name ${_file} NAME_WE)
     305    ADD_CUSTOM_COMMAND(
     306        OUTPUT  ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_name}.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_name}.h
     307        MAIN_DEPENDENCY ${_file}
     308        DEPENDS ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl ${SCRIPTS_BINDINGS} ${WEBCORE_DIR}/bindings/scripts/CodeGeneratorJS.pm ${SUPPLEMENTAL_DEPENDENCY_FILE}
     309        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}" --supplementalDependencyFile ${SUPPLEMENTAL_DEPENDENCY_FILE} ${WEBCORE_DIR}/${_file}
     310        VERBATIM)
     311    LIST(APPEND WebCoreTestSupport_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_name}.cpp)
     312ENDFOREACH ()

  • trunk/Source/WebCore/UseV8.cmake

    r109036 r109787  
    77    "${WEBCORE_DIR}/bindings/v8/specialization"
    88    "${JAVASCRIPTCORE_DIR}/runtime"
     9)
     10
     11LIST(APPEND WebCoreTestSupport_INCLUDE_DIRECTORIES
     12    "${WEBCORE_DIR}/testing/v8"
    913)
    1014
    … …  
    161165)
    162166
     167LIST(APPEND WebCoreTestSupport_SOURCES
     168    testing/v8/V8InternalsCustom.cpp
     169    testing/v8/WebCoreTestSupport.cpp
     170)
     171
    163172LIST(APPEND WebCore_SOURCES
    164173    ${JAVASCRIPTCORE_DIR}/yarr/YarrInterpreter.cpp
    … …  
    215224ENDFOREACH ()
    216225
     226FOREACH (_include ${WebCoreTestSupport_IDL_INCLUDES})
     227    LIST(APPEND IDL_INCLUDES --include=${WEBCORE_DIR}/${_include})
     228ENDFOREACH ()
     229
    217230SET(FEATURE_DEFINES_JAVASCRIPT "LANGUAGE_JAVASCRIPT=1 V8_BINDING=1")
    218231FOREACH (_feature ${FEATURE_DEFINES})
    … …  
    250263    SET(IDL_FILES_LIST "${IDL_FILES_LIST}${WEBCORE_DIR}/${_idl}\n")
    251264ENDFOREACH ()
     265
     266FOREACH (_idl ${WebCoreTestSupport_IDL_FILES})
     267    SET(IDL_FILES_LIST "${IDL_FILES_LIST}${WEBCORE_DIR}/${_idl}\n")
     268ENDFOREACH ()
     269
    252270FILE(WRITE ${IDL_FILES_TMP} ${IDL_FILES_LIST})
    253271
    254272ADD_CUSTOM_COMMAND(
    255273    OUTPUT ${SUPPLEMENTAL_DEPENDENCY_FILE}
    256     DEPENDS ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl ${SCRIPTS_PREPROCESS_IDLS} ${WebCore_IDL_FILES} ${IDL_ATTRIBUTES_FILE}
     274    DEPENDS ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl ${SCRIPTS_PREPROCESS_IDLS} ${WebCore_IDL_FILES} ${WebCoreTestSupport_IDL_FILES} ${IDL_ATTRIBUTES_FILE}
    257275    COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --idlFilesList ${IDL_FILES_TMP} --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --supplementalDependencyFile ${SUPPLEMENTAL_DEPENDENCY_FILE} --idlAttributesFile ${IDL_ATTRIBUTES_FILE}
    258276    VERBATIM)
    … …  
    268286    LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/V8${_name}.cpp)
    269287ENDFOREACH ()
     288
     289FOREACH (_file ${WebCoreTestSupport_IDL_FILES})
     290    GET_FILENAME_COMPONENT (_name ${_file} NAME_WE)
     291    ADD_CUSTOM_COMMAND(
     292        OUTPUT  ${DERIVED_SOURCES_WEBCORE_DIR}/V8${_name}.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/V8${_name}.h
     293        MAIN_DEPENDENCY ${_file}
     294        DEPENDS ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl ${SCRIPTS_BINDINGS} ${WEBCORE_DIR}/bindings/scripts/CodeGeneratorV8.pm ${SUPPLEMENTAL_DEPENDENCY_FILE}
     295        COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --generator V8 ${IDL_INCLUDES} --outputDir "${DERIVED_SOURCES_WEBCORE_DIR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --supplementalDependencyFile ${SUPPLEMENTAL_DEPENDENCY_FILE} ${WEBCORE_DIR}/${_file}
     296        VERBATIM)
     297    LIST(APPEND WebCoreTestSupport_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/V8${_name}.cpp)
     298ENDFOREACH ()
Note: See TracChangeset for help on using the changeset viewer.