Title: [182882] trunk
- Revision
- 182882
- Author
- o...@webkit.org
- Date
- 2015-04-16 04:46:27 -0700 (Thu, 16 Apr 2015)
Log Message
[GTK] Run forwarding headers generator unconditionally
https://bugs.webkit.org/show_bug.cgi?id=143819
Reviewed by Carlos Garcia Campos.
Source/WebKit2:
* PlatformGTK.cmake:
Tools:
* TestWebKitAPI/PlatformGTK.cmake:
* WebKitTestRunner/PlatformGTK.cmake:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (182881 => 182882)
--- trunk/Source/WebKit2/ChangeLog 2015-04-16 07:47:31 UTC (rev 182881)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-16 11:46:27 UTC (rev 182882)
@@ -1,3 +1,12 @@
+2015-04-16 Csaba Osztrogonác <o...@webkit.org>
+
+ [GTK] Run forwarding headers generator unconditionally
+ https://bugs.webkit.org/show_bug.cgi?id=143819
+
+ Reviewed by Carlos Garcia Campos.
+
+ * PlatformGTK.cmake:
+
2015-04-15 Brent Fulgham <bfulg...@apple.com>
[Mac] Disable "Save to Downloads" option for local files
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (182881 => 182882)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2015-04-16 07:47:31 UTC (rev 182881)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2015-04-16 11:46:27 UTC (rev 182882)
@@ -966,26 +966,9 @@
"main_sgml_file=webkit2gtk-docs.sgml\n"
)
-file(GLOB_RECURSE WebKit2_HEADERS
- *.h
-)
-
-add_custom_command(
- OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-forwarding-headers.stamp
- DEPENDS ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl
- ${WebKit2_SOURCES}
- ${WebProcess_SOURCES}
- ${NetworkProcess_SOURCES}
- ${DatabaseProcess_SOURCES}
- ${PluginProcessGTK2_SOURCES}
- ${PluginProcess_SOURCES}
- ${WebKit2_HEADERS}
+add_custom_target(WebKit2-forwarding-headers
COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT2_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk --platform soup
- COMMAND touch ${CMAKE_BINARY_DIR}/WebKit2-forwarding-headers.stamp
)
-add_custom_target(WebKit2-forwarding-headers
- DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-forwarding-headers.stamp
-)
# These symbolic link allows includes like #include <webkit2/WebkitWebView.h> which simulates installed headers.
add_custom_command(
Modified: trunk/Tools/ChangeLog (182881 => 182882)
--- trunk/Tools/ChangeLog 2015-04-16 07:47:31 UTC (rev 182881)
+++ trunk/Tools/ChangeLog 2015-04-16 11:46:27 UTC (rev 182882)
@@ -1,3 +1,13 @@
+2015-04-16 Csaba Osztrogonác <o...@webkit.org>
+
+ [GTK] Run forwarding headers generator unconditionally
+ https://bugs.webkit.org/show_bug.cgi?id=143819
+
+ Reviewed by Carlos Garcia Campos.
+
+ * TestWebKitAPI/PlatformGTK.cmake:
+ * WebKitTestRunner/PlatformGTK.cmake:
+
2015-04-15 Gyuyoung Kim <gyuyoung....@webkit.org>
[EFL] Add gnutls to jhbuild.module
Modified: trunk/Tools/TestWebKitAPI/PlatformGTK.cmake (182881 => 182882)
--- trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2015-04-16 07:47:31 UTC (rev 182881)
+++ trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2015-04-16 11:46:27 UTC (rev 182882)
@@ -2,6 +2,10 @@
# disabled and this triggers the inclusion of the WebKit2 headers.
add_definitions(-DBUILDING_WEBKIT2__)
+add_custom_target(TestWebKitAPI-forwarding-headers
+ COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${TESTWEBKITAPI_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk
+)
+
set(ForwardingHeadersForTestWebKitAPI_NAME TestWebKitAPI-forwarding-headers)
include_directories(
@@ -130,20 +134,3 @@
${TESTWEBKITAPI_DIR}/Tests/WTF/gobject/GMainLoopSource.cpp
${TESTWEBKITAPI_DIR}/Tests/WTF/gobject/GUniquePtr.cpp
)
-
-file(GLOB_RECURSE TestWebKitAPI_SOURCES
- *.cpp
- *.h
-)
-
-add_custom_command(
- OUTPUT ${CMAKE_BINARY_DIR}/TestWebKitAPI-forwarding-headers.stamp
- DEPENDS ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl
- ${TestWebKitAPI_SOURCES}
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${TESTWEBKITAPI_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk
- COMMAND touch ${CMAKE_BINARY_DIR}/TestWebKitAPI-forwarding-headers.stamp
-)
-add_custom_target(TestWebKitAPI-forwarding-headers
- DEPENDS WebKit2-forwarding-headers
- DEPENDS ${CMAKE_BINARY_DIR}/TestWebKitAPI-forwarding-headers.stamp
-)
Modified: trunk/Tools/WebKitTestRunner/PlatformGTK.cmake (182881 => 182882)
--- trunk/Tools/WebKitTestRunner/PlatformGTK.cmake 2015-04-16 07:47:31 UTC (rev 182881)
+++ trunk/Tools/WebKitTestRunner/PlatformGTK.cmake 2015-04-16 11:46:27 UTC (rev 182882)
@@ -1,3 +1,7 @@
+add_custom_target(WebKitTestRunner-forwarding-headers
+ COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_TESTRUNNER_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk
+)
+
set(ForwardingHeadersForWebKitTestRunner_NAME WebKitTestRunner-forwarding-headers)
list(APPEND WebKitTestRunner_SOURCES
@@ -55,20 +59,3 @@
-DFONTS_CONF_DIR="${TOOLS_DIR}/WebKitTestRunner/gtk/fonts"
-DTOP_LEVEL_DIR="${CMAKE_SOURCE_DIR}"
)
-
-file(GLOB_RECURSE WebKitTestRunner_HEADERS
- *.h
-)
-
-add_custom_command(
- OUTPUT ${CMAKE_BINARY_DIR}/WebKitTestRunner-forwarding-headers.stamp
- DEPENDS ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl
- ${WebKitTestRunner_SOURCES}
- ${WebKitTestRunner_HEADERS}
- ${WebKitTestRunnerInjectedBundle_SOURCES}
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_TESTRUNNER_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk
- COMMAND touch ${CMAKE_BINARY_DIR}/WebKitTestRunner-forwarding-headers.stamp
-)
-add_custom_target(WebKitTestRunner-forwarding-headers
- DEPENDS ${CMAKE_BINARY_DIR}/WebKitTestRunner-forwarding-headers.stamp
-)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
