Changeset 259617 in webkit


Ignore:
Timestamp:
Apr 6, 2020 5:58:30 PM (4 years ago)
Author:
don.olmstead@sony.com
Message:

[CMake] Use WEBKIT_EXECUTABLE in DumpRenderTree
https://bugs.webkit.org/show_bug.cgi?id=210059

Reviewed by Fujii Hironori.

.:

Add a DumpRenderTree derived sources directory.

  • Source/cmake/WebKitFS.cmake:

Tools:

Modify CMake code to use WEBKIT_EXECUTABLE when creating DumpRenderTree.

  • DumpRenderTree/CMakeLists.txt:
  • DumpRenderTree/PlatformWin.cmake:
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r259606 r259617  
     12020-04-06  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] Use WEBKIT_EXECUTABLE in DumpRenderTree
     4        https://bugs.webkit.org/show_bug.cgi?id=210059
     5
     6        Reviewed by Fujii Hironori.
     7
     8        Add a DumpRenderTree derived sources directory.
     9
     10        * Source/cmake/WebKitFS.cmake:
     11
    1122020-04-06  Ross Kirsling  <ross.kirsling@sony.com>
    213
  • trunk/Source/cmake/WebKitFS.cmake

    r259563 r259617  
    4949set(WebInspectorUI_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
    5050set(MiniBrowser_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/MiniBrowser")
     51set(DumpRenderTree_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/DumpRenderTree")
    5152
    5253set(FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders)
  • trunk/Tools/ChangeLog

    r259616 r259617  
     12020-04-06  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] Use WEBKIT_EXECUTABLE in DumpRenderTree
     4        https://bugs.webkit.org/show_bug.cgi?id=210059
     5
     6        Reviewed by Fujii Hironori.
     7
     8        Modify CMake code to use WEBKIT_EXECUTABLE when creating DumpRenderTree.
     9
     10        * DumpRenderTree/CMakeLists.txt:
     11        * DumpRenderTree/PlatformWin.cmake:
     12
    1132020-04-06  Jonathan Bedard  <jbedard@apple.com>
    214
  • trunk/Tools/DumpRenderTree/CMakeLists.txt

    r246039 r259617  
    1 set(WEBKIT_TESTRUNNER_SHARED_DIR "${TOOLS_DIR}/TestRunnerShared/")
    2 set(WEBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR "${TOOLS_DIR}/TestRunnerShared/UIScriptContext")
    3 set(DUMP_RENDER_TREE_BINDINGS_DIR "${TOOLS_DIR}/DumpRenderTree/Bindings")
     1set(DumpRenderTree_DIR "${TOOLS_DIR}/DumpRenderTree")
     2set(DumpRenderTree_BINDINGS_DIR "${TOOLS_DIR}/DumpRenderTree/Bindings")
     3set(WebKitTestRunner_SHARED_DIR "${TOOLS_DIR}/TestRunnerShared/")
     4set(WebKitTestRunner_UISCRIPTCONTEXT_DIR "${TOOLS_DIR}/TestRunnerShared/UIScriptContext")
    45
    5 file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/DumpRenderTree)
     6file(MAKE_DIRECTORY ${DumpRenderTree_DERIVED_SOURCES_DIR})
    67
    78set(DumpRenderTree_SOURCES
     9    ${WebKitTestRunner_SHARED_DIR}/Bindings/JSWrapper.cpp
     10
     11    ${WebKitTestRunner_UISCRIPTCONTEXT_DIR}/UIScriptContext.cpp
     12    ${WebKitTestRunner_UISCRIPTCONTEXT_DIR}/UIScriptController.cpp
     13
    814    AccessibilityController.cpp
    915    AccessibilityTextMarker.cpp
     
    1723    TestRunner.cpp
    1824    WorkQueue.cpp
    19     ${WEBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR}/UIScriptContext.cpp
    20     ${WEBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR}/UIScriptController.cpp
    21     ${WEBKIT_TESTRUNNER_SHARED_DIR}/Bindings/JSWrapper.cpp
    2225)
    2326
     
    2730)
    2831
    29 set(DumpRenderTree_INCLUDE_DIRECTORIES
     32set(DumpRenderTree_PRIVATE_INCLUDE_DIRECTORIES
     33    ${CMAKE_BINARY_DIR}
     34    ${DumpRenderTree_DERIVED_SOURCES_DIR}
     35    ${DumpRenderTree_DIR}
     36    ${WebKitTestRunner_SHARED_DIR}/Bindings
     37    ${WebKitTestRunner_UISCRIPTCONTEXT_DIR}
     38)
     39
     40list(APPEND DumpRenderTree_PRIVATE_INCLUDE_DIRECTORIES
     41    ${WEBCORE_DIR}/testing/js
     42)
     43
     44list(APPEND DumpRenderTree_PRIVATE_INCLUDE_DIRECTORIES
     45    ${PAL_FRAMEWORK_HEADERS_DIR}
    3046    ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
    3147    ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}
    32     ${DERIVED_SOURCES_DIR}/DumpRenderTree
    33     ${WEBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR}
    34     ${WEBKIT_TESTRUNNER_SHARED_DIR}/Bindings
    35     ${TOOLS_DIR}/DumpRenderTree
    36     ${CMAKE_SOURCE_DIR}/Source
    37     ${WEBCORE_DIR}/testing/js
    3848)
    3949
     
    6777)
    6878
     79set(TestNetscapePlugIn_PRIVATE_INCLUDE_DIRECTORIES
     80    ${CMAKE_BINARY_DIR}
     81    ${DumpRenderTree_DIR}/TestNetscapePlugIn
     82    ${DumpRenderTree_DIR}/TestNetscapePlugIn/ForwardingHeaders
     83    ${DumpRenderTree_DIR}/TestNetscapePlugIn/Tests
     84)
     85
     86list(APPEND TestNetscapePlugIn_PRIVATE_INCLUDE_DIRECTORIES
     87    ${PAL_FRAMEWORK_HEADERS_DIR}
     88    ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
     89    ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}
     90)
     91
    6992set(TestNetscapePlugIn_LIBRARIES
     93    WebCoreTestSupport
    7094    WebKit::JavaScriptCore
    71     WebCoreTestSupport
    7295)
    7396
    7497set(DumpRenderTree_IDL_FILES
    75     "${WEBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR}/Bindings/UIScriptController.idl"
     98    "${WebKitTestRunner_UISCRIPTCONTEXT_DIR}/Bindings/UIScriptController.idl"
    7699)
    77100
     
    79102    OUTPUT_SOURCE DumpRenderTree_SOURCES
    80103    INPUT_FILES ${DumpRenderTree_IDL_FILES}
    81     BASE_DIR ${DUMP_RENDER_TREE_BINDINGS_DIR}
     104    BASE_DIR ${DumpRenderTree_BINDINGS_DIR}
    82105    IDL_INCLUDES Bindings
    83106    FEATURES ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}
    84     DESTINATION ${DERIVED_SOURCES_DIR}/DumpRenderTree
     107    DESTINATION ${DumpRenderTree_DERIVED_SOURCES_DIR}
    85108    GENERATOR DumpRenderTree)
    86109
     110set(DumpRenderTree_DEPENDENCIES DumpRenderTreeBindings)
     111
     112WEBKIT_EXECUTABLE_DECLARE(DumpRenderTree)
    87113WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
    88 
    89 include_directories(${DumpRenderTree_INCLUDE_DIRECTORIES})
    90 
    91 add_executable(DumpRenderTree ${DumpRenderTree_SOURCES})
    92 target_link_libraries(DumpRenderTree ${DumpRenderTree_LIBRARIES})
    93 add_dependencies(DumpRenderTree DumpRenderTreeBindings)
     114WEBKIT_EXECUTABLE(DumpRenderTree)
    94115
    95116if (ENABLE_NETSCAPE_PLUGIN_API)
    96117    add_library(TestNetscapePlugIn SHARED ${TestNetscapePlugIn_SOURCES})
    97     target_link_libraries(TestNetscapePlugIn ${TestNetscapePlugIn_LIBRARIES})
     118    target_include_directories(TestNetscapePlugIn PRIVATE ${TestNetscapePlugIn_PRIVATE_INCLUDE_DIRECTORIES})
     119    target_link_libraries(TestNetscapePlugIn PRIVATE ${TestNetscapePlugIn_LIBRARIES})
    98120endif ()
    99 
    100 if (WIN32)
    101     add_dependencies(DumpRenderTree DumpRenderTreeLib)
    102 endif ()
  • trunk/Tools/DumpRenderTree/PlatformWin.cmake

    r257587 r259617  
    1 set(DumpRenderTreeLib_SOURCES
    2     ${DumpRenderTree_SOURCES}
    3 
     1list(APPEND DumpRenderTree_SOURCES
    42    win/AccessibilityControllerWin.cpp
    53    win/AccessibilityUIElementWin.cpp
     
    2624)
    2725
    28 list(APPEND TestNetscapePlugIn_LIBRARIES
    29     WebKitLegacy
    30 )
    31 
    32 set(DumpRenderTree_SOURCES
    33     ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
    34 )
    35 
    3626list(APPEND TestNetscapePlugIn_SOURCES
    3727    win/TestNetscapePlugin.def
     
    5141)
    5242
    53 if (${WTF_PLATFORM_WIN_CAIRO})
    54     add_definitions(-DWIN_CAIRO)
    55 endif ()
     43set(wrapper_DEFINITIONS USE_CONSOLE_ENTRY_POINT)
    5644
    5745list(APPEND TestNetscapePlugIn_LIBRARIES
     
    6149)
    6250
    63 list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
    64     # FIXME: Remove this when cleaning up dependencies https://bugs.webkit.org/show_bug.cgi?id=196734
    65     ${PAL_FRAMEWORK_HEADERS_DIR}
    66     win
    67     TestNetscapePlugIn
    68     TestNetscapePlugIn/ForwardingHeaders
    69     TestNetscapePlugIn/Tests
    70     TestNetscapePlugIn/win
    71     TestNetscapePlugIn/Tests/win
     51list(APPEND DumpRenderTree_PRIVATE_INCLUDE_DIRECTORIES
     52    ${DumpRenderTree_DIR}/win
    7253)
    7354
    74 set(DumpRenderTreeLib_LIBRARIES
    75     ${DumpRenderTree_LIBRARIES}
     55list(APPEND TestNetscapePlugIn_PRIVATE_INCLUDE_DIRECTORIES
     56    ${DumpRenderTree_DIR}/TestNetscapePlugIn/win
     57    ${DumpRenderTree_DIR}/TestNetscapePlugIn/Tests/win
     58)
     59
     60list(APPEND DumpRenderTree_LIBRARIES
    7661    Comsuppw
    7762    Oleacc
     
    8065)
    8166
    82 set(DumpRenderTree_LIBRARIES
    83     shlwapi
    84 )
    85 
    8667if (${WTF_PLATFORM_WIN_CAIRO})
    87     list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
    88         cairo
     68    list(APPEND wrapper_DEFINITIONS WIN_CAIRO)
     69    list(APPEND DumpRenderTree_PRIVATE_INCLUDE_DIRECTORIES
     70        ${DumpRenderTree_DIR}/cairo
    8971    )
    90     list(APPEND DumpRenderTreeLib_LIBRARIES
     72    list(APPEND DumpRenderTree_LIBRARIES
    9173        Cairo::Cairo
    9274    )
    93     list(APPEND DumpRenderTreeLib_SOURCES
     75    list(APPEND DumpRenderTree_SOURCES
    9476        cairo/PixelDumpSupportCairo.cpp
    9577    )
    9678else ()
    97     list(APPEND DumpRenderTreeLib_LIBRARIES
     79    list(APPEND DumpRenderTree_LIBRARIES
    9880        CFNetwork
    9981        CoreText
    10082    )
    10183    if (${USE_DIRECT2D})
    102         list(APPEND DumpRenderTreeLib_SOURCES
     84        list(APPEND DumpRenderTree_SOURCES
    10385            win/PixelDumpSupportDirect2D.cpp
    10486        )
    105         list(APPEND DumpRenderTreeLib_LIBRARIES
     87        list(APPEND DumpRenderTree_LIBRARIES
    10688            D2d1
    10789        )
    10890    else ()
    109         list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
    110             cg
     91        list(APPEND DumpRenderTree_PRIVATE_INCLUDE_DIRECTORIES
     92            ${DumpRenderTree_DIR}/cg
    11193        )
    112         list(APPEND DumpRenderTreeLib_SOURCES
     94        list(APPEND DumpRenderTree_SOURCES
    11395            cg/PixelDumpSupportCG.cpp
    11496        )
    115         list(APPEND DumpRenderTreeLib_LIBRARIES
     97        list(APPEND DumpRenderTree_LIBRARIES
    11698            CoreGraphics
    11799        )
     
    119101endif ()
    120102
    121 WEBKIT_ADD_PRECOMPILED_HEADER("DumpRenderTreePrefix.h" "win/DumpRenderTreePrefix.cpp" DumpRenderTreeLib_SOURCES)
     103WEBKIT_ADD_PRECOMPILED_HEADER("DumpRenderTreePrefix.h" "win/DumpRenderTreePrefix.cpp" DumpRenderTree_SOURCES)
    122104set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${MSVC_RUNTIME_LINKER_FLAGS}")
    123 add_definitions(-DUSE_CONSOLE_ENTRY_POINT)
    124105
    125 add_library(DumpRenderTreeLib SHARED ${DumpRenderTreeLib_SOURCES})
    126 target_link_libraries(DumpRenderTreeLib ${DumpRenderTreeLib_LIBRARIES})
    127 
    128 add_definitions(-D_UNICODE)
     106WEBKIT_WRAP_EXECUTABLE(DumpRenderTree
     107    SOURCES ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
     108    LIBRARIES shlwapi
     109)
     110target_compile_definitions(DumpRenderTree PRIVATE ${wrapper_DEFINITIONS})
Note: See TracChangeset for help on using the changeset viewer.