<!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>[166584] trunk/Tools</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/166584">166584</a></dd>
<dt>Author</dt> <dd>mrobinson@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-01 08:13:40 -0700 (Tue, 01 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] No longer build WebKit1 gtkdoc
https://bugs.webkit.org/show_bug.cgi?id=130970
Reviewed by Anders Carlsson.
* gtk/common.py:
(gtk_version_of_pkg_config_file): Deleted.
* gtk/generate-gtkdoc:
(get_gtkdoc_module_paths): We no longer need to worry about GTK+ 2, since it
was only applicable for WebKit1.
(get_generator_for_config): No longer look for the WebKit1 configuration file.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsgtkcommonpy">trunk/Tools/gtk/common.py</a></li>
<li><a href="#trunkToolsgtkgenerategtkdoc">trunk/Tools/gtk/generate-gtkdoc</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (166583 => 166584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-04-01 14:32:44 UTC (rev 166583)
+++ trunk/Tools/ChangeLog 2014-04-01 15:13:40 UTC (rev 166584)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-04-01 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK] No longer build WebKit1 gtkdoc
+ https://bugs.webkit.org/show_bug.cgi?id=130970
+
+ Reviewed by Anders Carlsson.
+
+ * gtk/common.py:
+ (gtk_version_of_pkg_config_file): Deleted.
+ * gtk/generate-gtkdoc:
+ (get_gtkdoc_module_paths): We no longer need to worry about GTK+ 2, since it
+ was only applicable for WebKit1.
+ (get_generator_for_config): No longer look for the WebKit1 configuration file.
+
</ins><span class="cx"> 2014-04-01 Mario Sanchez Prada <mario.prada@samsung.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Running minibrowser with url crashes in debug build
</span></span></pre></div>
<a id="trunkToolsgtkcommonpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/common.py (166583 => 166584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/common.py 2014-04-01 14:32:44 UTC (rev 166583)
+++ trunk/Tools/gtk/common.py 2014-04-01 15:13:40 UTC (rev 166584)
</span><span class="lines">@@ -117,16 +117,6 @@
</span><span class="cx"> return pkg_config_file_variable(package, 'prefix')
</span><span class="cx">
</span><span class="cx">
</span><del>-def gtk_version_of_pkg_config_file(pkg_config_path):
- process = subprocess.Popen(['pkg-config', pkg_config_path, '--print-requires'],
- stdout=subprocess.PIPE)
- stdout = process.communicate()[0].decode("utf-8")
-
- if 'gtk+-3.0' in stdout:
- return 3
- return 2
-
-
</del><span class="cx"> def parse_output_lines(fd, parse_line_callback):
</span><span class="cx"> output = ''
</span><span class="cx"> read_set = [fd]
</span></span></pre></div>
<a id="trunkToolsgtkgenerategtkdoc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/generate-gtkdoc (166583 => 166584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/generate-gtkdoc 2014-04-01 14:32:44 UTC (rev 166583)
+++ trunk/Tools/gtk/generate-gtkdoc 2014-04-01 15:13:40 UTC (rev 166584)
</span><span class="lines">@@ -39,16 +39,13 @@
</span><span class="cx"> else:
</span><span class="cx"> handler.setFormatter(logging.Formatter('%(message)s'))
</span><span class="cx">
</span><del>-def get_gtkdoc_module_paths(gtk_version):
</del><ins>+def get_gtkdoc_module_paths():
</ins><span class="cx"> dependent_packages = {
</span><span class="cx"> 'glib-2.0' : ['glib', 'gobject', 'gio'],
</span><span class="cx"> 'libsoup-2.4' : ['libsoup-2.4'],
</span><del>- 'gdk-pixbuf-2.0': ['gdk-pixbuf']
</del><ins>+ 'gdk-pixbuf-2.0': ['gdk-pixbuf'],
+ 'gtk+-3.0' : ['gtk3', 'gdk3']
</ins><span class="cx"> }
</span><del>- if gtk_version == 3:
- dependent_packages.update({'gtk+-3.0' : ['gtk3', 'gdk3']})
- else:
- dependent_packages.update({'gtk+-2.0' : ['gtk', 'gdk']})
</del><span class="cx">
</span><span class="cx"> paths = []
</span><span class="cx"> html_dir = os.path.join('share', 'gtk-doc', 'html')
</span><span class="lines">@@ -105,7 +102,6 @@
</span><span class="cx"> config.read(config_file)
</span><span class="cx"> module_name = config.sections()[0]
</span><span class="cx"> pkgconfig_file = config.get(module_name, 'pkgconfig_file')
</span><del>- gtk_version = common.gtk_version_of_pkg_config_file(pkgconfig_file)
</del><span class="cx">
</span><span class="cx"> if not os.path.isfile(pkgconfig_file):
</span><span class="cx"> return None
</span><span class="lines">@@ -124,7 +120,7 @@
</span><span class="cx"> 'source_dirs': source_dirs,
</span><span class="cx"> 'headers': headers,
</span><span class="cx"> 'cflags': " ".join(config.get(module_name, 'cflags').split()),
</span><del>- 'cross_reference_deps': get_gtkdoc_module_paths(gtk_version),
</del><ins>+ 'cross_reference_deps': get_gtkdoc_module_paths(),
</ins><span class="cx"> 'ignored_files': files_to_ignore(source_dirs, headers),
</span><span class="cx"> })
</span><span class="cx">
</span><span class="lines">@@ -193,8 +189,6 @@
</span><span class="cx">
</span><span class="cx"> webkitdom.write_doc_files()
</span><span class="cx"> generate_documentation_for_config(common.build_path('gtkdoc-webkitdom.cfg'))
</span><ins>+ saw_warnings = generate_documentation_for_config(common.build_path('gtkdoc-webkit2gtk.cfg'))
</ins><span class="cx">
</span><del>- saw_webkit1_warnings = generate_documentation_for_config(common.build_path('gtkdoc-webkitgtk.cfg'))
- saw_webkit2_warnings = generate_documentation_for_config(common.build_path('gtkdoc-webkit2gtk.cfg'))
-
- sys.exit(saw_webkit1_warnings or saw_webkit2_warnings)
</del><ins>+ sys.exit(saw_warnings)
</ins></span></pre>
</div>
</div>
</body>
</html>