<!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>[182882] 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/182882">182882</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-16 04:46:27 -0700 (Thu, 16 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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:</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="#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 (182881 => 182882)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-04-16 Csaba Osztrogonác <ossy@webkit.org>
+
+ [GTK] Run forwarding headers generator unconditionally
+ https://bugs.webkit.org/show_bug.cgi?id=143819
+
+ Reviewed by Carlos Garcia Campos.
+
+ * PlatformGTK.cmake:
+
</ins><span class="cx"> 2015-04-15 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Disable "Save to Downloads" option for local files
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (182881 => 182882)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -966,26 +966,9 @@
</span><span class="cx"> "main_sgml_file=webkit2gtk-docs.sgml\n"
</span><span class="cx"> )
</span><span class="cx">
</span><del>-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}
</del><ins>+add_custom_target(WebKit2-forwarding-headers
</ins><span class="cx"> COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT2_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk --platform soup
</span><del>- COMMAND touch ${CMAKE_BINARY_DIR}/WebKit2-forwarding-headers.stamp
</del><span class="cx"> )
</span><del>-add_custom_target(WebKit2-forwarding-headers
- DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-forwarding-headers.stamp
-)
</del><span class="cx">
</span><span class="cx"> # These symbolic link allows includes like #include <webkit2/WebkitWebView.h> which simulates installed headers.
</span><span class="cx"> add_custom_command(
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (182881 => 182882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-04-16 07:47:31 UTC (rev 182881)
+++ trunk/Tools/ChangeLog 2015-04-16 11:46:27 UTC (rev 182882)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-04-16 Csaba Osztrogonác <ossy@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:
+
</ins><span class="cx"> 2015-04-15 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> [EFL] Add gnutls to jhbuild.module
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIPlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/PlatformGTK.cmake (182881 => 182882)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2,6 +2,10 @@
</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><ins>+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
+)
+
</ins><span class="cx"> set(ForwardingHeadersForTestWebKitAPI_NAME TestWebKitAPI-forwarding-headers)
</span><span class="cx">
</span><span class="cx"> include_directories(
</span><span class="lines">@@ -130,20 +134,3 @@
</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><del>-
-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
-)
</del></span></pre></div>
<a id="trunkToolsWebKitTestRunnerPlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/PlatformGTK.cmake (182881 => 182882)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+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
+)
+
</ins><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">@@ -55,20 +59,3 @@
</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><del>-
-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
-)
</del></span></pre>
</div>
</div>
</body>
</html>