Title: [174422] trunk
- Revision
- 174422
- Author
- [email protected]
- Date
- 2014-10-08 00:37:50 -0700 (Wed, 08 Oct 2014)
Log Message
[GTK] Make forwarding headers generation depend on source code
https://bugs.webkit.org/show_bug.cgi?id=137394
Reviewed by Philippe Normand.
Source/WebKit2:
Only run generate-forwarding-headers.pl when source code changes
and use a different target for the symlinks.
* PlatformGTK.cmake:
Tools:
* TestWebKitAPI/CMakeLists.txt: Add missing dependency rule.
* TestWebKitAPI/PlatformGTK.cmake: Only run
generate-forwarding-headers.pl when source code changes.
* WebKitTestRunner/PlatformGTK.cmake: Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (174421 => 174422)
--- trunk/Source/WebKit2/ChangeLog 2014-10-08 07:30:16 UTC (rev 174421)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-08 07:37:50 UTC (rev 174422)
@@ -1,3 +1,15 @@
+2014-10-08 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Make forwarding headers generation depend on source code
+ https://bugs.webkit.org/show_bug.cgi?id=137394
+
+ Reviewed by Philippe Normand.
+
+ Only run generate-forwarding-headers.pl when source code changes
+ and use a different target for the symlinks.
+
+ * PlatformGTK.cmake:
+
2014-10-07 Pascal Jacquemart <[email protected]>
[EFL] Enable custom URI schemes with CustomProtocols
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (174421 => 174422)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2014-10-08 07:30:16 UTC (rev 174421)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2014-10-08 07:37:50 UTC (rev 174422)
@@ -558,19 +558,6 @@
VERBATIM
)
-add_custom_target(webkit2gtk-forwarding-headers
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${FORWARDING_HEADERS_DIR} gtk
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${FORWARDING_HEADERS_DIR} soup
-
- # These symbolic link allows includes like #include <webkit2/WebkitWebView.h> which simulates installed headers.
- COMMAND ln -n -s -f ${WEBKIT2_DIR}/UIProcess/API/gtk ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}/webkit2
- COMMAND ln -n -s -f ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}/webkit2
-)
-
-set(WEBKIT2_EXTRA_DEPENDENCIES
- webkit2gtk-forwarding-headers
-)
-
if (ENABLE_PLUGIN_PROCESS_GTK2)
set(PluginProcessGTK2_EXECUTABLE_NAME WebKitPluginProcess2)
@@ -862,3 +849,45 @@
" ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}\n"
"headers=${WebKit2GTK_ENUM_GENERATION_HEADERS} ${WebKit2WebExtension_INSTALLED_HEADERS}\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}
+ ${PluginProcessGTK2_SOURCES}
+ ${PluginProcess_SOURCES}
+ ${WebKit2_HEADERS}
+ COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${FORWARDING_HEADERS_DIR} gtk
+ COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${FORWARDING_HEADERS_DIR} 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(
+ OUTPUT ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}/webkit2
+ DEPENDS ${WEBKIT2_DIR}/UIProcess/API/gtk
+ COMMAND ln -n -s -f ${WEBKIT2_DIR}/UIProcess/API/gtk ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}/webkit2
+)
+add_custom_command(
+ OUTPUT ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}/webkit2
+ DEPENDS ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk
+ COMMAND ln -n -s -f ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}/webkit2
+)
+add_custom_target(WebKit2-fake-api-headers
+ DEPENDS ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}/webkit2
+ ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}/webkit2
+)
+
+set(WEBKIT2_EXTRA_DEPENDENCIES
+ WebKit2-forwarding-headers
+ WebKit2-fake-api-headers
+)
Modified: trunk/Tools/ChangeLog (174421 => 174422)
--- trunk/Tools/ChangeLog 2014-10-08 07:30:16 UTC (rev 174421)
+++ trunk/Tools/ChangeLog 2014-10-08 07:37:50 UTC (rev 174422)
@@ -1,3 +1,15 @@
+2014-10-08 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Make forwarding headers generation depend on source code
+ https://bugs.webkit.org/show_bug.cgi?id=137394
+
+ Reviewed by Philippe Normand.
+
+ * TestWebKitAPI/CMakeLists.txt: Add missing dependency rule.
+ * TestWebKitAPI/PlatformGTK.cmake: Only run
+ generate-forwarding-headers.pl when source code changes.
+ * WebKitTestRunner/PlatformGTK.cmake: Ditto.
+
2014-10-07 Tanay C <[email protected]>
Remove build warnings in Hashmap API tests
Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (174421 => 174422)
--- trunk/Tools/TestWebKitAPI/CMakeLists.txt 2014-10-08 07:30:16 UTC (rev 174421)
+++ trunk/Tools/TestWebKitAPI/CMakeLists.txt 2014-10-08 07:37:50 UTC (rev 174422)
@@ -166,6 +166,7 @@
add_test(TestJavaScriptCore ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/_javascript_Core/TestJavaScriptCore)
set_tests_properties(TestJavaScriptCore PROPERTIES TIMEOUT 60)
set_target_properties(TestJavaScriptCore PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/_javascript_Core)
+add_dependencies(TestJavaScriptCore _javascript_Core ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})
foreach (testName ${test_webcore_BINARIES})
add_executable(${testName} ${test_main_SOURCES} ${TESTWEBKITAPI_DIR}/TestsController.cpp ${TESTWEBKITAPI_DIR}/Tests/WebCore/${testName}.cpp)
Modified: trunk/Tools/TestWebKitAPI/PlatformGTK.cmake (174421 => 174422)
--- trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2014-10-08 07:30:16 UTC (rev 174421)
+++ trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2014-10-08 07:37:50 UTC (rev 174422)
@@ -2,13 +2,7 @@
# disabled and this triggers the inclusion of the WebKit2 headers.
add_definitions(-DBUILDING_WEBKIT2__)
-add_custom_target(forwarding-headersGTKForTestWebKitAPI
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${FORWARDING_HEADERS_DIR} gtk
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${TESTWEBKITAPI_DIR} ${FORWARDING_HEADERS_DIR} gtk
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${FORWARDING_HEADERS_DIR} soup
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${TESTWEBKITAPI_DIR} ${FORWARDING_HEADERS_DIR} soup
-)
-set(ForwardingHeadersForTestWebKitAPI_NAME forwarding-headersGTKForTestWebKitAPI)
+set(ForwardingHeadersForTestWebKitAPI_NAME TestWebKitAPI-forwarding-headers)
include_directories(
${FORWARDING_HEADERS_DIR}
@@ -140,3 +134,20 @@
${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 ${TESTWEBKITAPI_DIR} ${FORWARDING_HEADERS_DIR} 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 (174421 => 174422)
--- trunk/Tools/WebKitTestRunner/PlatformGTK.cmake 2014-10-08 07:30:16 UTC (rev 174421)
+++ trunk/Tools/WebKitTestRunner/PlatformGTK.cmake 2014-10-08 07:37:50 UTC (rev 174422)
@@ -1,7 +1,3 @@
-add_custom_target(WebKitTestRunner-forwarding-headers
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT_TESTRUNNER_DIR} ${FORWARDING_HEADERS_DIR} gtk
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT_TESTRUNNER_DIR} ${FORWARDING_HEADERS_DIR} soup
-)
set(ForwardingHeadersForWebKitTestRunner_NAME WebKitTestRunner-forwarding-headers)
list(APPEND WebKitTestRunner_SOURCES
@@ -59,3 +55,20 @@
-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 ${WEBKIT_TESTRUNNER_DIR} ${FORWARDING_HEADERS_DIR} 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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
