<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[174422] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/174422">174422</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-08 00:37:50 -0700 (Wed, 08 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformGTKcmake">trunk/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPICMakeListstxt">trunk/Tools/TestWebKitAPI/CMakeLists.txt</a></li>
<li><a href="#trunkToolsTestWebKitAPIPlatformGTKcmake">trunk/Tools/TestWebKitAPI/PlatformGTK.cmake</a></li>
<li><a href="#trunkToolsWebKitTestRunnerPlatformGTKcmake">trunk/Tools/WebKitTestRunner/PlatformGTK.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (174421 => 174422)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-10-08 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [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:
+
</ins><span class="cx"> 2014-10-07 Pascal Jacquemart <p.jacquemart@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Enable custom URI schemes with CustomProtocols
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (174421 => 174422)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -558,19 +558,6 @@
</span><span class="cx"> VERBATIM
</span><span class="cx"> )
</span><span class="cx">
</span><del>-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
-)
-
</del><span class="cx"> if (ENABLE_PLUGIN_PROCESS_GTK2)
</span><span class="cx"> set(PluginProcessGTK2_EXECUTABLE_NAME WebKitPluginProcess2)
</span><span class="cx">
</span><span class="lines">@@ -862,3 +849,45 @@
</span><span class="cx"> " ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}\n"
</span><span class="cx"> "headers=${WebKit2GTK_ENUM_GENERATION_HEADERS} ${WebKit2WebExtension_INSTALLED_HEADERS}\n"
</span><span class="cx"> )
</span><ins>+
+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
+)
</ins></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (174421 => 174422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-10-08 07:30:16 UTC (rev 174421)
+++ trunk/Tools/ChangeLog 2014-10-08 07:37:50 UTC (rev 174422)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-10-08 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [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.
+
</ins><span class="cx"> 2014-10-07 Tanay C <tanay.c@samsung.com>
</span><span class="cx">
</span><span class="cx"> Remove build warnings in Hashmap API tests
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPICMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (174421 => 174422)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -166,6 +166,7 @@
</span><span class="cx"> add_test(TestJavaScriptCore ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/JavaScriptCore/TestJavaScriptCore)
</span><span class="cx"> set_tests_properties(TestJavaScriptCore PROPERTIES TIMEOUT 60)
</span><span class="cx"> set_target_properties(TestJavaScriptCore PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/JavaScriptCore)
</span><ins>+add_dependencies(TestJavaScriptCore JavaScriptCore ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})
</ins><span class="cx">
</span><span class="cx"> foreach (testName ${test_webcore_BINARIES})
</span><span class="cx"> add_executable(${testName} ${test_main_SOURCES} ${TESTWEBKITAPI_DIR}/TestsController.cpp ${TESTWEBKITAPI_DIR}/Tests/WebCore/${testName}.cpp)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIPlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/PlatformGTK.cmake (174421 => 174422)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2,13 +2,7 @@
</span><span class="cx"> # disabled and this triggers the inclusion of the WebKit2 headers.
</span><span class="cx"> add_definitions(-DBUILDING_WEBKIT2__)
</span><span class="cx">
</span><del>-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)
</del><ins>+set(ForwardingHeadersForTestWebKitAPI_NAME TestWebKitAPI-forwarding-headers)
</ins><span class="cx">
</span><span class="cx"> include_directories(
</span><span class="cx"> ${FORWARDING_HEADERS_DIR}
</span><span class="lines">@@ -140,3 +134,20 @@
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WTF/gobject/GMainLoopSource.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WTF/gobject/GUniquePtr.cpp
</span><span class="cx"> )
</span><ins>+
+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
+)
</ins></span></pre></div>
<a id="trunkToolsWebKitTestRunnerPlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/PlatformGTK.cmake (174421 => 174422)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,7 +1,3 @@
</span><del>-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
-)
</del><span class="cx"> set(ForwardingHeadersForWebKitTestRunner_NAME WebKitTestRunner-forwarding-headers)
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKitTestRunner_SOURCES
</span><span class="lines">@@ -59,3 +55,20 @@
</span><span class="cx"> -DFONTS_CONF_DIR="${TOOLS_DIR}/WebKitTestRunner/gtk/fonts"
</span><span class="cx"> -DTOP_LEVEL_DIR="${CMAKE_SOURCE_DIR}"
</span><span class="cx"> )
</span><ins>+
+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
+)
</ins></span></pre>
</div>
</div>
</body>
</html>