<!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>[168710] releases/WebKitGTK/webkit-2.4</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/168710">168710</a></dd>
<dt>Author</dt> <dd>gns@gnome.org</dd>
<dt>Date</dt> <dd>2014-05-13 12:29:19 -0700 (Tue, 13 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge 164704 - [GTK] generate-gtkdoc can fail with WebKit1 or WebKit2 only builds
https://bugs.webkit.org/show_bug.cgi?id=129319
Patch by Martin Robinson <mrobinson@igalia.com> on 2014-02-26
Reviewed by Carlos Garcia Campos.
Source/WebKit/gtk:
* GNUmakefile.am: Do not generate the documentation configuration file if the port
is disabled.
Source/WebKit2:
* GNUmakefile.am: Do not generate the documentation configuration file if the port
is disabled.
Tools:
* gtk/generate-gtkdoc:
(get_generator_for_config): Properly handle the situation where the pkgconfig file is missing.
Conflicts:
Source/WebKit/gtk/ChangeLog
Source/WebKit2/ChangeLog
Tools/ChangeLog</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKitgtkGNUmakefileam">releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/GNUmakefile.am</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2GNUmakefileam">releases/WebKitGTK/webkit-2.4/Source/WebKit2/GNUmakefile.am</a></li>
<li><a href="#releasesWebKitGTKwebkit24Toolsgtkgenerategtkdoc">releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-gtkdoc</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24SourceWebKitgtkGNUmakefileam"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/GNUmakefile.am (168709 => 168710)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/GNUmakefile.am 2014-05-13 19:29:03 UTC (rev 168709)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/GNUmakefile.am 2014-05-13 19:29:19 UTC (rev 168710)
</span><span class="lines">@@ -379,6 +379,7 @@
</span><span class="cx"> && cp xgen-gtc $@ \
</span><span class="cx"> && rm -f xgen-gtc
</span><span class="cx">
</span><ins>+if ENABLE_WEBKIT1
</ins><span class="cx"> gtkdoc-webkitgtk.cfg: $(WebKit)/GNUmakefile.am $(srcdir)/Tools/gtk/GNUmakefile.am
</span><span class="cx"> $(AM_V_GEN)echo "[webkitgtk]" > $@ && \
</span><span class="cx"> echo "pkgconfig_file=$(webkit1_pkg_config_file)" >> $@ && \
</span><span class="lines">@@ -389,6 +390,7 @@
</span><span class="cx"> Source/WebKit/gtk/webkit" >> $@ && \
</span><span class="cx"> echo -e "headers=$(webkitgtk_static_h_api) Source/WebKit/gtk/webkit/webkitversion.h" >> $@
</span><span class="cx"> BUILT_SOURCES += gtkdoc-webkitgtk.cfg
</span><ins>+endif
</ins><span class="cx">
</span><span class="cx"> EXTRA_DIST += \
</span><span class="cx"> $(WebKit)/ChangeLog \
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2GNUmakefileam"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/GNUmakefile.am (168709 => 168710)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/GNUmakefile.am 2014-05-13 19:29:03 UTC (rev 168709)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/GNUmakefile.am 2014-05-13 19:29:19 UTC (rev 168710)
</span><span class="lines">@@ -809,6 +809,7 @@
</span><span class="cx"> -fvisibility-inlines-hidden \
</span><span class="cx"> $(global_cxxflags)
</span><span class="cx">
</span><ins>+if ENABLE_WEBKIT2
</ins><span class="cx"> # It would be nice to use the CPPFLAGS from the WebKit2 library here, but the prefix
</span><span class="cx"> # header doesn't seem to play nicely with the gtkdoc tools.
</span><span class="cx"> gtkdoc-webkit2gtk.cfg: $(WebKit2)/GNUmakefile.am $(WebKit2)/GNUmakefile.list.am
</span><span class="lines">@@ -827,6 +828,7 @@
</span><span class="cx"> $(webkit2gtk_web_extension_h_api)\n \
</span><span class="cx"> DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitVersion.h" >> $@
</span><span class="cx"> BUILT_SOURCES += gtkdoc-webkit2gtk.cfg
</span><ins>+endif
</ins><span class="cx">
</span><span class="cx"> EXTRA_DIST += \
</span><span class="cx"> $(WebKit2)/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml \
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24Toolsgtkgenerategtkdoc"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-gtkdoc (168709 => 168710)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-gtkdoc 2014-05-13 19:29:03 UTC (rev 168709)
+++ releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-gtkdoc 2014-05-13 19:29:19 UTC (rev 168710)
</span><span class="lines">@@ -106,6 +106,9 @@
</span><span class="cx"> pkgconfig_file = config.get(module_name, 'pkgconfig_file')
</span><span class="cx"> gtk_version = common.gtk_version_of_pkg_config_file(pkgconfig_file)
</span><span class="cx">
</span><ins>+ if not os.path.isfile(pkgconfig_file):
+ return None
+
</ins><span class="cx"> source_dirs = config.get(module_name, 'source_dirs').replace(';', ' ').split()
</span><span class="cx"> headers = [os.path.abspath(f) for f in config.get(module_name, 'headers').replace(';', ' ').split()]
</span><span class="cx"> return gtkdoc.PkgConfigGTKDoc(pkgconfig_file, {
</span></span></pre>
</div>
</div>
</body>
</html>