Title: [160934] trunk/Tools
- Revision
- 160934
- Author
- mrobin...@webkit.org
- Date
- 2013-12-20 15:24:43 -0800 (Fri, 20 Dec 2013)
Log Message
[GTK] [CMake] Add support for building WebKitTestRunner
https://bugs.webkit.org/show_bug.cgi?id=125768
Reviewed by Gustavo Noronha Silva.
* CMakeLists.txt: Compile WebKitTestRunner for GTK+ when WebKit2 is enabled.
* WebKitTestRunner/CMakeLists.txt: Remove some EFL specific flags from the common
build file.
* WebKitTestRunner/PlatformEfl.cmake: Move the flags here.
* WebKitTestRunner/PlatformGTK.cmake: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/CMakeLists.txt (160933 => 160934)
--- trunk/Tools/CMakeLists.txt 2013-12-20 23:09:04 UTC (rev 160933)
+++ trunk/Tools/CMakeLists.txt 2013-12-20 23:24:43 UTC (rev 160934)
@@ -1,4 +1,4 @@
-if (ENABLE_WEBKIT2 AND NOT("${PORT}" STREQUAL "GTK"))
+if (ENABLE_WEBKIT2)
add_subdirectory(WebKitTestRunner)
endif ()
@@ -22,6 +22,7 @@
if (ENABLE_WEBKIT)
add_subdirectory(GtkLauncher)
endif ()
+ add_subdirectory(DumpRenderTree/TestNetscapePlugIn)
elseif ("${PORT}" STREQUAL "WinCE")
add_subdirectory(WinCELauncher)
endif ()
Modified: trunk/Tools/ChangeLog (160933 => 160934)
--- trunk/Tools/ChangeLog 2013-12-20 23:09:04 UTC (rev 160933)
+++ trunk/Tools/ChangeLog 2013-12-20 23:24:43 UTC (rev 160934)
@@ -1,3 +1,16 @@
+2013-12-20 Martin Robinson <mrobin...@igalia.com>
+
+ [GTK] [CMake] Add support for building WebKitTestRunner
+ https://bugs.webkit.org/show_bug.cgi?id=125768
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * CMakeLists.txt: Compile WebKitTestRunner for GTK+ when WebKit2 is enabled.
+ * WebKitTestRunner/CMakeLists.txt: Remove some EFL specific flags from the common
+ build file.
+ * WebKitTestRunner/PlatformEfl.cmake: Move the flags here.
+ * WebKitTestRunner/PlatformGTK.cmake: Added.
+
2013-12-20 Myles C. Maxfield <mmaxfi...@apple.com>
Myles C. Maxfield is a committer now
Modified: trunk/Tools/WebKitTestRunner/CMakeLists.txt (160933 => 160934)
--- trunk/Tools/WebKitTestRunner/CMakeLists.txt 2013-12-20 23:09:04 UTC (rev 160933)
+++ trunk/Tools/WebKitTestRunner/CMakeLists.txt 2013-12-20 23:24:43 UTC (rev 160934)
@@ -41,7 +41,6 @@
${WEBKIT2_DIR}/Shared/API/c
${WEBKIT2_DIR}/Shared/Plugins
${WEBKIT2_DIR}/UIProcess
- ${WEBKIT2_DIR}/UIProcess/API/C/efl
${WEBKIT2_DIR}/UIProcess/API/C/soup
${WEBKIT2_DIR}/WebProcess/InjectedBundle
${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c
@@ -84,12 +83,6 @@
set(WebKitTestRunnerInjectedBundle_LIBRARIES
${WebKitTestRunner_LIBRARIES}
- ${ATK_LIBRARIES}
- ${ECORE_LIBRARIES}
- ${ECORE_FILE_LIBRARIES}
- ${FONTCONFIG_LIBRARIES}
- ${GLIB_LIBRARIES}
- ${GLIB_GOBJECT_LIBRARIES}
)
GENERATE_BINDINGS(WebKitTestRunnerInjectedBundle_SOURCES
Modified: trunk/Tools/WebKitTestRunner/PlatformEfl.cmake (160933 => 160934)
--- trunk/Tools/WebKitTestRunner/PlatformEfl.cmake 2013-12-20 23:09:04 UTC (rev 160933)
+++ trunk/Tools/WebKitTestRunner/PlatformEfl.cmake 2013-12-20 23:24:43 UTC (rev 160934)
@@ -18,6 +18,8 @@
)
list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
+ ${WEBKIT2_DIR}/UIProcess/API/C/efl
+
${TOOLS_DIR}/DumpRenderTree/efl/
${WEBKIT2_DIR}/UIProcess/API/efl
"${WTF_DIR}/wtf/gobject"
@@ -38,11 +40,18 @@
${EINA_LIBRARIES}
${EO_LIBRARIES}
${EVAS_LIBRARIES}
- ${GLIB_LIBRARIES}
${OPENGL_LIBRARIES}
WTF
)
+list(APPEND WebKitTestRunnerInjectedBundle_LIBRARIES
+ ${ATK_LIBRARIES}
+ ${ECORE_LIBRARIES}
+ ${ECORE_FILE_LIBRARIES}
+ ${FONTCONFIG_LIBRARIES}
+ ${GLIB_GOBJECT_LIBRARIES}
+)
+
if (ENABLE_ECORE_X)
list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
${ECORE_X_INCLUDE_DIRS}
Added: trunk/Tools/WebKitTestRunner/PlatformGTK.cmake (0 => 160934)
--- trunk/Tools/WebKitTestRunner/PlatformGTK.cmake (rev 0)
+++ trunk/Tools/WebKitTestRunner/PlatformGTK.cmake 2013-12-20 23:24:43 UTC (rev 160934)
@@ -0,0 +1,64 @@
+add_custom_target(gtk-forwarding-headers-for-WebKitTestRunner
+ COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT_TESTRUNNER_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include gtk
+)
+set(ForwardingHeadersForWebKitTestRunner_NAME gtk-forwarding-headers-for-WebKitTestRunner)
+
+add_custom_target(soup-forwarding-headers-for-WebKitTestRunner
+ COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT_TESTRUNNER_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include soup
+)
+set(ForwardingNetworkHeadersForWebKitTestRunner_NAME soup-forwarding-headers-for-WebKitTestRunner)
+
+list(APPEND WebKitTestRunner_SOURCES
+ ${WEBKIT_TESTRUNNER_DIR}/cairo/TestInvocationCairo.cpp
+
+ ${WEBKIT_TESTRUNNER_DIR}/gtk/TestControllerGtk.cpp
+ ${WEBKIT_TESTRUNNER_DIR}/gtk/PlatformWebViewGtk.cpp
+ ${WEBKIT_TESTRUNNER_DIR}/gtk/EventSenderProxyGtk.cpp
+
+ ${WEBKIT_TESTRUNNER_DIR}/gtk/EventSenderProxyGtk.cpp
+ ${WEBKIT_TESTRUNNER_DIR}/gtk/PlatformWebViewGtk.cpp
+ ${WEBKIT_TESTRUNNER_DIR}/gtk/TestControllerGtk.cpp
+ ${WEBKIT_TESTRUNNER_DIR}/gtk/main.cpp
+)
+
+list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
+ ${WTF_DIR}/wtf/gobject
+ ${ATK_INCLUDE_DIRS}
+ ${CAIRO_INCLUDE_DIRS}
+ ${GTK3_INCLUDE_DIRS}
+ ${GLIB_INCLUDE_DIRS}
+)
+
+list(APPEND WebKitTestRunner_LIBRARIES
+ ${ATK_LIBRARIES}
+ ${CAIRO_LIBRARIES}
+ ${GTK3_LIBRARIES}
+ ${GLIB_LIBRARIES}
+ WTF
+ WebCorePlatformGTK
+)
+
+set(WebKitTestRunnerInjectedBundle_LIBRARIES
+ ${ATK_LIBRARIES}
+ ${FONTCONFIG_LIBRARIES}
+ ${GLIB_LIBRARIES}
+ ${GTK3_LIBRARIES}
+ WebCoreTestSupport
+ WebKit2
+)
+
+list(APPEND WebKitTestRunnerInjectedBundle_SOURCES
+ ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityControllerAtk.cpp
+ ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityNotificationHandlerAtk.cpp
+ ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityUIElementAtk.cpp
+
+ ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/gtk/ActivateFontsGtk.cpp
+ ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/gtk/InjectedBundleGtk.cpp
+ ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/gtk/InjectedBundleUtilities.cpp
+ ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/gtk/TestRunnerGtk.cpp
+)
+
+add_definitions(
+ -DFONTS_CONF_DIR="${TOOLS_DIR}/DumpRenderTree/gtk/fonts"
+ -DTOP_LEVEL_DIR="${CMAKE_SOURCE_DIR}"
+)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
