Title: [259617] trunk
- Revision
- 259617
- Author
- don.olmst...@sony.com
- Date
- 2020-04-06 17:58:30 -0700 (Mon, 06 Apr 2020)
Log 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:
Modified Paths
Diff
Modified: trunk/ChangeLog (259616 => 259617)
--- trunk/ChangeLog 2020-04-07 00:26:34 UTC (rev 259616)
+++ trunk/ChangeLog 2020-04-07 00:58:30 UTC (rev 259617)
@@ -1,3 +1,14 @@
+2020-04-06 Don Olmstead <don.olmst...@sony.com>
+
+ [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:
+
2020-04-06 Ross Kirsling <ross.kirsl...@sony.com>
Update minimum ICU version to 60.2
Modified: trunk/Source/cmake/WebKitFS.cmake (259616 => 259617)
--- trunk/Source/cmake/WebKitFS.cmake 2020-04-07 00:26:34 UTC (rev 259616)
+++ trunk/Source/cmake/WebKitFS.cmake 2020-04-07 00:58:30 UTC (rev 259617)
@@ -48,6 +48,7 @@
set(WebKit_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
set(WebInspectorUI_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
set(MiniBrowser_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/MiniBrowser")
+set(DumpRenderTree_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/DumpRenderTree")
set(FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders)
Modified: trunk/Tools/ChangeLog (259616 => 259617)
--- trunk/Tools/ChangeLog 2020-04-07 00:26:34 UTC (rev 259616)
+++ trunk/Tools/ChangeLog 2020-04-07 00:58:30 UTC (rev 259617)
@@ -1,3 +1,15 @@
+2020-04-06 Don Olmstead <don.olmst...@sony.com>
+
+ [CMake] Use WEBKIT_EXECUTABLE in DumpRenderTree
+ https://bugs.webkit.org/show_bug.cgi?id=210059
+
+ Reviewed by Fujii Hironori.
+
+ Modify CMake code to use WEBKIT_EXECUTABLE when creating DumpRenderTree.
+
+ * DumpRenderTree/CMakeLists.txt:
+ * DumpRenderTree/PlatformWin.cmake:
+
2020-04-06 Jonathan Bedard <jbed...@apple.com>
ImageDiff: Don't build with ASan in automation
Modified: trunk/Tools/DumpRenderTree/CMakeLists.txt (259616 => 259617)
--- trunk/Tools/DumpRenderTree/CMakeLists.txt 2020-04-07 00:26:34 UTC (rev 259616)
+++ trunk/Tools/DumpRenderTree/CMakeLists.txt 2020-04-07 00:58:30 UTC (rev 259617)
@@ -1,10 +1,16 @@
-set(WEBKIT_TESTRUNNER_SHARED_DIR "${TOOLS_DIR}/TestRunnerShared/")
-set(WEBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR "${TOOLS_DIR}/TestRunnerShared/UIScriptContext")
-set(DUMP_RENDER_TREE_BINDINGS_DIR "${TOOLS_DIR}/DumpRenderTree/Bindings")
+set(DumpRenderTree_DIR "${TOOLS_DIR}/DumpRenderTree")
+set(DumpRenderTree_BINDINGS_DIR "${TOOLS_DIR}/DumpRenderTree/Bindings")
+set(WebKitTestRunner_SHARED_DIR "${TOOLS_DIR}/TestRunnerShared/")
+set(WebKitTestRunner_UISCRIPTCONTEXT_DIR "${TOOLS_DIR}/TestRunnerShared/UIScriptContext")
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/DumpRenderTree)
+file(MAKE_DIRECTORY ${DumpRenderTree_DERIVED_SOURCES_DIR})
set(DumpRenderTree_SOURCES
+ ${WebKitTestRunner_SHARED_DIR}/Bindings/JSWrapper.cpp
+
+ ${WebKitTestRunner_UISCRIPTCONTEXT_DIR}/UIScriptContext.cpp
+ ${WebKitTestRunner_UISCRIPTCONTEXT_DIR}/UIScriptController.cpp
+
AccessibilityController.cpp
AccessibilityTextMarker.cpp
AccessibilityUIElement.cpp
@@ -16,9 +22,6 @@
TestOptions.cpp
TestRunner.cpp
WorkQueue.cpp
- ${WEBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR}/UIScriptContext.cpp
- ${WEBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR}/UIScriptController.cpp
- ${WEBKIT_TESTRUNNER_SHARED_DIR}/Bindings/JSWrapper.cpp
)
set(DumpRenderTree_LIBRARIES
@@ -26,15 +29,22 @@
WebKit::_javascript_Core
)
-set(DumpRenderTree_INCLUDE_DIRECTORIES
+set(DumpRenderTree_PRIVATE_INCLUDE_DIRECTORIES
+ ${CMAKE_BINARY_DIR}
+ ${DumpRenderTree_DERIVED_SOURCES_DIR}
+ ${DumpRenderTree_DIR}
+ ${WebKitTestRunner_SHARED_DIR}/Bindings
+ ${WebKitTestRunner_UISCRIPTCONTEXT_DIR}
+)
+
+list(APPEND DumpRenderTree_PRIVATE_INCLUDE_DIRECTORIES
+ ${WEBCORE_DIR}/testing/js
+)
+
+list(APPEND DumpRenderTree_PRIVATE_INCLUDE_DIRECTORIES
+ ${PAL_FRAMEWORK_HEADERS_DIR}
${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
${WebKitLegacy_FRAMEWORK_HEADERS_DIR}
- ${DERIVED_SOURCES_DIR}/DumpRenderTree
- ${WEBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR}
- ${WEBKIT_TESTRUNNER_SHARED_DIR}/Bindings
- ${TOOLS_DIR}/DumpRenderTree
- ${CMAKE_SOURCE_DIR}/Source
- ${WEBCORE_DIR}/testing/js
)
set(TestNetscapePlugIn_SOURCES
@@ -66,37 +76,45 @@
TestNetscapePlugIn/Tests/URLRedirect.cpp
)
+set(TestNetscapePlugIn_PRIVATE_INCLUDE_DIRECTORIES
+ ${CMAKE_BINARY_DIR}
+ ${DumpRenderTree_DIR}/TestNetscapePlugIn
+ ${DumpRenderTree_DIR}/TestNetscapePlugIn/ForwardingHeaders
+ ${DumpRenderTree_DIR}/TestNetscapePlugIn/Tests
+)
+
+list(APPEND TestNetscapePlugIn_PRIVATE_INCLUDE_DIRECTORIES
+ ${PAL_FRAMEWORK_HEADERS_DIR}
+ ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
+ ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}
+)
+
set(TestNetscapePlugIn_LIBRARIES
+ WebCoreTestSupport
WebKit::_javascript_Core
- WebCoreTestSupport
)
set(DumpRenderTree_IDL_FILES
- "${WEBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR}/Bindings/UIScriptController.idl"
+ "${WebKitTestRunner_UISCRIPTCONTEXT_DIR}/Bindings/UIScriptController.idl"
)
GENERATE_BINDINGS(DumpRenderTreeBindings
OUTPUT_SOURCE DumpRenderTree_SOURCES
INPUT_FILES ${DumpRenderTree_IDL_FILES}
- BASE_DIR ${DUMP_RENDER_TREE_BINDINGS_DIR}
+ BASE_DIR ${DumpRenderTree_BINDINGS_DIR}
IDL_INCLUDES Bindings
FEATURES ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}
- DESTINATION ${DERIVED_SOURCES_DIR}/DumpRenderTree
+ DESTINATION ${DumpRenderTree_DERIVED_SOURCES_DIR}
GENERATOR DumpRenderTree)
+set(DumpRenderTree_DEPENDENCIES DumpRenderTreeBindings)
+
+WEBKIT_EXECUTABLE_DECLARE(DumpRenderTree)
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
+WEBKIT_EXECUTABLE(DumpRenderTree)
-include_directories(${DumpRenderTree_INCLUDE_DIRECTORIES})
-
-add_executable(DumpRenderTree ${DumpRenderTree_SOURCES})
-target_link_libraries(DumpRenderTree ${DumpRenderTree_LIBRARIES})
-add_dependencies(DumpRenderTree DumpRenderTreeBindings)
-
if (ENABLE_NETSCAPE_PLUGIN_API)
add_library(TestNetscapePlugIn SHARED ${TestNetscapePlugIn_SOURCES})
- target_link_libraries(TestNetscapePlugIn ${TestNetscapePlugIn_LIBRARIES})
+ target_include_directories(TestNetscapePlugIn PRIVATE ${TestNetscapePlugIn_PRIVATE_INCLUDE_DIRECTORIES})
+ target_link_libraries(TestNetscapePlugIn PRIVATE ${TestNetscapePlugIn_LIBRARIES})
endif ()
-
-if (WIN32)
- add_dependencies(DumpRenderTree DumpRenderTreeLib)
-endif ()
Modified: trunk/Tools/DumpRenderTree/PlatformWin.cmake (259616 => 259617)
--- trunk/Tools/DumpRenderTree/PlatformWin.cmake 2020-04-07 00:26:34 UTC (rev 259616)
+++ trunk/Tools/DumpRenderTree/PlatformWin.cmake 2020-04-07 00:58:30 UTC (rev 259617)
@@ -1,6 +1,4 @@
-set(DumpRenderTreeLib_SOURCES
- ${DumpRenderTree_SOURCES}
-
+list(APPEND DumpRenderTree_SOURCES
win/AccessibilityControllerWin.cpp
win/AccessibilityUIElementWin.cpp
win/DRTDataObject.cpp
@@ -25,14 +23,6 @@
win/WorkQueueItemWin.cpp
)
-list(APPEND TestNetscapePlugIn_LIBRARIES
- WebKitLegacy
-)
-
-set(DumpRenderTree_SOURCES
- ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
-)
-
list(APPEND TestNetscapePlugIn_SOURCES
win/TestNetscapePlugin.def
win/TestNetscapePlugin.rc
@@ -50,9 +40,7 @@
TestNetscapePlugIn/win/WindowedPluginTest.cpp
)
-if (${WTF_PLATFORM_WIN_CAIRO})
- add_definitions(-DWIN_CAIRO)
-endif ()
+set(wrapper_DEFINITIONS USE_CONSOLE_ENTRY_POINT)
list(APPEND TestNetscapePlugIn_LIBRARIES
Msimg32
@@ -60,19 +48,16 @@
WebKitLegacy
)
-list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
- # FIXME: Remove this when cleaning up dependencies https://bugs.webkit.org/show_bug.cgi?id=196734
- ${PAL_FRAMEWORK_HEADERS_DIR}
- win
- TestNetscapePlugIn
- TestNetscapePlugIn/ForwardingHeaders
- TestNetscapePlugIn/Tests
- TestNetscapePlugIn/win
- TestNetscapePlugIn/Tests/win
+list(APPEND DumpRenderTree_PRIVATE_INCLUDE_DIRECTORIES
+ ${DumpRenderTree_DIR}/win
)
-set(DumpRenderTreeLib_LIBRARIES
- ${DumpRenderTree_LIBRARIES}
+list(APPEND TestNetscapePlugIn_PRIVATE_INCLUDE_DIRECTORIES
+ ${DumpRenderTree_DIR}/TestNetscapePlugIn/win
+ ${DumpRenderTree_DIR}/TestNetscapePlugIn/Tests/win
+)
+
+list(APPEND DumpRenderTree_LIBRARIES
Comsuppw
Oleacc
WebKitLegacy
@@ -79,50 +64,47 @@
WebKitLegacyGUID
)
-set(DumpRenderTree_LIBRARIES
- shlwapi
-)
-
if (${WTF_PLATFORM_WIN_CAIRO})
- list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
- cairo
+ list(APPEND wrapper_DEFINITIONS WIN_CAIRO)
+ list(APPEND DumpRenderTree_PRIVATE_INCLUDE_DIRECTORIES
+ ${DumpRenderTree_DIR}/cairo
)
- list(APPEND DumpRenderTreeLib_LIBRARIES
+ list(APPEND DumpRenderTree_LIBRARIES
Cairo::Cairo
)
- list(APPEND DumpRenderTreeLib_SOURCES
+ list(APPEND DumpRenderTree_SOURCES
cairo/PixelDumpSupportCairo.cpp
)
else ()
- list(APPEND DumpRenderTreeLib_LIBRARIES
+ list(APPEND DumpRenderTree_LIBRARIES
CFNetwork
CoreText
)
if (${USE_DIRECT2D})
- list(APPEND DumpRenderTreeLib_SOURCES
+ list(APPEND DumpRenderTree_SOURCES
win/PixelDumpSupportDirect2D.cpp
)
- list(APPEND DumpRenderTreeLib_LIBRARIES
+ list(APPEND DumpRenderTree_LIBRARIES
D2d1
)
else ()
- list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
- cg
+ list(APPEND DumpRenderTree_PRIVATE_INCLUDE_DIRECTORIES
+ ${DumpRenderTree_DIR}/cg
)
- list(APPEND DumpRenderTreeLib_SOURCES
+ list(APPEND DumpRenderTree_SOURCES
cg/PixelDumpSupportCG.cpp
)
- list(APPEND DumpRenderTreeLib_LIBRARIES
+ list(APPEND DumpRenderTree_LIBRARIES
CoreGraphics
)
endif ()
endif ()
-WEBKIT_ADD_PRECOMPILED_HEADER("DumpRenderTreePrefix.h" "win/DumpRenderTreePrefix.cpp" DumpRenderTreeLib_SOURCES)
+WEBKIT_ADD_PRECOMPILED_HEADER("DumpRenderTreePrefix.h" "win/DumpRenderTreePrefix.cpp" DumpRenderTree_SOURCES)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${MSVC_RUNTIME_LINKER_FLAGS}")
-add_definitions(-DUSE_CONSOLE_ENTRY_POINT)
-add_library(DumpRenderTreeLib SHARED ${DumpRenderTreeLib_SOURCES})
-target_link_libraries(DumpRenderTreeLib ${DumpRenderTreeLib_LIBRARIES})
-
-add_definitions(-D_UNICODE)
+WEBKIT_WRAP_EXECUTABLE(DumpRenderTree
+ SOURCES ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
+ LIBRARIES shlwapi
+)
+target_compile_definitions(DumpRenderTree PRIVATE ${wrapper_DEFINITIONS})
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
