Title: [168710] releases/WebKitGTK/webkit-2.4
- Revision
- 168710
- Author
- g...@gnome.org
- Date
- 2014-05-13 12:29:19 -0700 (Tue, 13 May 2014)
Log Message
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 <mrobin...@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
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/GNUmakefile.am (168709 => 168710)
--- 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)
@@ -379,6 +379,7 @@
&& cp xgen-gtc $@ \
&& rm -f xgen-gtc
+if ENABLE_WEBKIT1
gtkdoc-webkitgtk.cfg: $(WebKit)/GNUmakefile.am $(srcdir)/Tools/gtk/GNUmakefile.am
$(AM_V_GEN)echo "[webkitgtk]" > $@ && \
echo "pkgconfig_file=$(webkit1_pkg_config_file)" >> $@ && \
@@ -389,6 +390,7 @@
Source/WebKit/gtk/webkit" >> $@ && \
echo -e "headers=$(webkitgtk_static_h_api) Source/WebKit/gtk/webkit/webkitversion.h" >> $@
BUILT_SOURCES += gtkdoc-webkitgtk.cfg
+endif
EXTRA_DIST += \
$(WebKit)/ChangeLog \
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/GNUmakefile.am (168709 => 168710)
--- 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)
@@ -809,6 +809,7 @@
-fvisibility-inlines-hidden \
$(global_cxxflags)
+if ENABLE_WEBKIT2
# It would be nice to use the CPPFLAGS from the WebKit2 library here, but the prefix
# header doesn't seem to play nicely with the gtkdoc tools.
gtkdoc-webkit2gtk.cfg: $(WebKit2)/GNUmakefile.am $(WebKit2)/GNUmakefile.list.am
@@ -827,6 +828,7 @@
$(webkit2gtk_web_extension_h_api)\n \
DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitVersion.h" >> $@
BUILT_SOURCES += gtkdoc-webkit2gtk.cfg
+endif
EXTRA_DIST += \
$(WebKit2)/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml \
Modified: releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-gtkdoc (168709 => 168710)
--- 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)
@@ -106,6 +106,9 @@
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
+
source_dirs = config.get(module_name, 'source_dirs').replace(';', ' ').split()
headers = [os.path.abspath(f) for f in config.get(module_name, 'headers').replace(';', ' ').split()]
return gtkdoc.PkgConfigGTKDoc(pkgconfig_file, {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
