Modified: trunk/Tools/ChangeLog (166583 => 166584)
--- trunk/Tools/ChangeLog 2014-04-01 14:32:44 UTC (rev 166583)
+++ trunk/Tools/ChangeLog 2014-04-01 15:13:40 UTC (rev 166584)
@@ -1,3 +1,17 @@
+2014-04-01 Martin Robinson <mrobin...@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.
+
2014-04-01 Mario Sanchez Prada <mario.pr...@samsung.com>
[GTK] Running minibrowser with url crashes in debug build
Modified: trunk/Tools/gtk/common.py (166583 => 166584)
--- 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)
@@ -117,16 +117,6 @@
return pkg_config_file_variable(package, 'prefix')
-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
-
-
def parse_output_lines(fd, parse_line_callback):
output = ''
read_set = [fd]
Modified: trunk/Tools/gtk/generate-gtkdoc (166583 => 166584)
--- 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)
@@ -39,16 +39,13 @@
else:
handler.setFormatter(logging.Formatter('%(message)s'))
-def get_gtkdoc_module_paths(gtk_version):
+def get_gtkdoc_module_paths():
dependent_packages = {
'glib-2.0' : ['glib', 'gobject', 'gio'],
'libsoup-2.4' : ['libsoup-2.4'],
- 'gdk-pixbuf-2.0': ['gdk-pixbuf']
+ 'gdk-pixbuf-2.0': ['gdk-pixbuf'],
+ 'gtk+-3.0' : ['gtk3', 'gdk3']
}
- if gtk_version == 3:
- dependent_packages.update({'gtk+-3.0' : ['gtk3', 'gdk3']})
- else:
- dependent_packages.update({'gtk+-2.0' : ['gtk', 'gdk']})
paths = []
html_dir = os.path.join('share', 'gtk-doc', 'html')
@@ -105,7 +102,6 @@
config.read(config_file)
module_name = config.sections()[0]
pkgconfig_file = config.get(module_name, 'pkgconfig_file')
- gtk_version = common.gtk_version_of_pkg_config_file(pkgconfig_file)
if not os.path.isfile(pkgconfig_file):
return None
@@ -124,7 +120,7 @@
'source_dirs': source_dirs,
'headers': headers,
'cflags': " ".join(config.get(module_name, 'cflags').split()),
- 'cross_reference_deps': get_gtkdoc_module_paths(gtk_version),
+ 'cross_reference_deps': get_gtkdoc_module_paths(),
'ignored_files': files_to_ignore(source_dirs, headers),
})
@@ -193,8 +189,6 @@
webkitdom.write_doc_files()
generate_documentation_for_config(common.build_path('gtkdoc-webkitdom.cfg'))
+ saw_warnings = generate_documentation_for_config(common.build_path('gtkdoc-webkit2gtk.cfg'))
- 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)
+ sys.exit(saw_warnings)
