<!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>[168304] 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/168304">168304</a></dd>
<dt>Author</dt> <dd>mrobinson@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-05 11:38:05 -0700 (Mon, 05 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK][CMake] Unable to do make install
https://bugs.webkit.org/show_bug.cgi?id=130188
Reviewed by Carlos Garcia Campos.
.:
Only try to install the HTML documentation if the build is configured to generate it via
the new ENABLE_GTKDOC option. We cannot conditionally install something, so this allows us
to keep the HTML documentation directory as an installation source.
* Source/PlatformGTK.cmake: The gtkdoc target now always builds HTML documentation, but
is only added to the default target when ENABLE_GTKDOC is turned on. gtkdoc-no-html is
never added to the default target, but will be triggered by build-webkit, so that
when ENABLE_GTKDOC is off and build-webkit isn't used, documentation isn't built at all.
* Source/cmake/OptionsGTK.cmake: Add an ENABLE_GTKDOC option to the build.
Tools:
* Scripts/webkitdirs.pm:
(buildCMakeGeneratedProject): Always build gtkdoc-no-html for WebKitGTK+. This
will give an early signal that a change has broken the documentation.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourcePlatformGTKcmake">trunk/Source/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitdirspm">trunk/Tools/Scripts/webkitdirs.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (168303 => 168304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-05-05 18:34:14 UTC (rev 168303)
+++ trunk/ChangeLog 2014-05-05 18:38:05 UTC (rev 168304)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-05-05 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK][CMake] Unable to do make install
+ https://bugs.webkit.org/show_bug.cgi?id=130188
+
+ Reviewed by Carlos Garcia Campos.
+
+ Only try to install the HTML documentation if the build is configured to generate it via
+ the new ENABLE_GTKDOC option. We cannot conditionally install something, so this allows us
+ to keep the HTML documentation directory as an installation source.
+
+ * Source/PlatformGTK.cmake: The gtkdoc target now always builds HTML documentation, but
+ is only added to the default target when ENABLE_GTKDOC is turned on. gtkdoc-no-html is
+ never added to the default target, but will be triggered by build-webkit, so that
+ when ENABLE_GTKDOC is off and build-webkit isn't used, documentation isn't built at all.
+ * Source/cmake/OptionsGTK.cmake: Add an ENABLE_GTKDOC option to the build.
+
</ins><span class="cx"> 2014-05-03 Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
</span><span class="cx">
</span><span class="cx"> [CMake] Define SHOULD_INSTALL_JS_SHELL before including ports Options files.
</span></span></pre></div>
<a id="trunkSourcePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/PlatformGTK.cmake (168303 => 168304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/PlatformGTK.cmake 2014-05-05 18:34:14 UTC (rev 168303)
+++ trunk/Source/PlatformGTK.cmake 2014-05-05 18:38:05 UTC (rev 168304)
</span><span class="lines">@@ -9,6 +9,9 @@
</span><span class="cx"> "${CMAKE_SOURCE_DIR}/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml"
</span><span class="cx"> "${CMAKE_SOURCE_DIR}/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt"
</span><span class="cx"> )
</span><ins>+endif ()
+
+if (ENABLE_GTKDOC)
</ins><span class="cx"> install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/webkit2gtk/html/
</span><span class="cx"> DESTINATION ${CMAKE_INSTALL_DATADIR}/gtk-doc/html/webkit2gtk
</span><span class="cx"> )
</span><span class="lines">@@ -25,14 +28,14 @@
</span><span class="cx"> endmacro()
</span><span class="cx">
</span><span class="cx"> add_gtkdoc_generator("docs-build-no-html.stamp" "--skip-html")
</span><del>-add_custom_target(gtkdoc-no-html ALL
- DEPENDS "${CMAKE_BINARY_DIR}/docs-build-no-html.stamp"
-)
</del><ins>+add_custom_target(gtkdoc-no-html DEPENDS "${CMAKE_BINARY_DIR}/docs-build-no-html.stamp")
</ins><span class="cx">
</span><span class="cx"> add_gtkdoc_generator("docs-build.stamp" "")
</span><del>-add_custom_target(gtkdoc
- DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp"
-)
</del><ins>+if (ENABLE_GTKDOC)
+ add_custom_target(gtkdoc ALL DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp")
+else ()
+ add_custom_target(gtkdoc DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp")
+endif ()
</ins><span class="cx">
</span><span class="cx"> add_custom_target(check
</span><span class="cx"> COMMAND ${TOOLS_DIR}/Scripts/run-gtk-tests
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (168303 => 168304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2014-05-05 18:34:14 UTC (rev 168303)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-05-05 18:38:05 UTC (rev 168304)
</span><span class="lines">@@ -17,6 +17,7 @@
</span><span class="cx"> CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(JAVASCRIPTCORE 16 2 16)
</span><span class="cx">
</span><span class="cx"> set(ENABLE_CREDENTIAL_STORAGE ON CACHE BOOL "Whether or not to enable support for credential storage using libsecret.")
</span><ins>+set(ENABLE_GTKDOC OFF CACHE BOOL "Whether or not to generate gtkdoc by default.")
</ins><span class="cx">
</span><span class="cx"> # FIXME: We want to expose fewer options to downstream, but for now everything is public.
</span><span class="cx"> WEBKIT_OPTION_BEGIN()
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (168303 => 168304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-05-05 18:34:14 UTC (rev 168303)
+++ trunk/Tools/ChangeLog 2014-05-05 18:38:05 UTC (rev 168304)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-05-05 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK][CMake] Unable to do make install
+ https://bugs.webkit.org/show_bug.cgi?id=130188
+
+ Reviewed by Carlos Garcia Campos.
+
+ * Scripts/webkitdirs.pm:
+ (buildCMakeGeneratedProject): Always build gtkdoc-no-html for WebKitGTK+. This
+ will give an early signal that a change has broken the documentation.
+
</ins><span class="cx"> 2014-05-05 Pratik Solanki <psolanki@apple.com>
</span><span class="cx">
</span><span class="cx"> Update framework locations in package-root
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (168303 => 168304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2014-05-05 18:34:14 UTC (rev 168303)
+++ trunk/Tools/Scripts/webkitdirs.pm 2014-05-05 18:38:05 UTC (rev 168304)
</span><span class="lines">@@ -1875,7 +1875,9 @@
</span><span class="cx"> if (isGtk()) {
</span><span class="cx"> chdir "$buildPath" or die;
</span><span class="cx"> $command = "$buildPath/build.sh";
</span><del>- @args = ($makeArgs);
</del><ins>+
+ # We always try to generate gtkdoc for GTK+, so that we see errors as early as possible.
+ @args = ($makeArgs, 'gtkdoc-no-html');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # We call system("cmake @args") instead of system("cmake", @args) so that @args is
</span></span></pre>
</div>
</div>
</body>
</html>