Title: [164704] trunk
- Revision
- 164704
- Author
- commit-qu...@webkit.org
- Date
- 2014-02-26 00:11:08 -0800 (Wed, 26 Feb 2014)
Log Message
[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.
Modified Paths
Diff
Modified: trunk/Source/WebKit/gtk/ChangeLog (164703 => 164704)
--- trunk/Source/WebKit/gtk/ChangeLog 2014-02-26 07:53:56 UTC (rev 164703)
+++ trunk/Source/WebKit/gtk/ChangeLog 2014-02-26 08:11:08 UTC (rev 164704)
@@ -1,3 +1,13 @@
+2014-02-26 Martin Robinson <mrobin...@igalia.com>
+
+ [GTK] generate-gtkdoc can fail with WebKit1 or WebKit2 only builds
+ https://bugs.webkit.org/show_bug.cgi?id=129319
+
+ Reviewed by Carlos Garcia Campos.
+
+ * GNUmakefile.am: Do not generate the documentation configuration file if the port
+ is disabled.
+
2014-02-25 Anders Carlsson <ander...@apple.com>
Get rid of VisitedLinkStrategy
Modified: trunk/Source/WebKit/gtk/GNUmakefile.am (164703 => 164704)
--- trunk/Source/WebKit/gtk/GNUmakefile.am 2014-02-26 07:53:56 UTC (rev 164703)
+++ trunk/Source/WebKit/gtk/GNUmakefile.am 2014-02-26 08:11:08 UTC (rev 164704)
@@ -376,6 +376,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)" >> $@ && \
@@ -386,6 +387,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: trunk/Source/WebKit2/ChangeLog (164703 => 164704)
--- trunk/Source/WebKit2/ChangeLog 2014-02-26 07:53:56 UTC (rev 164703)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-26 08:11:08 UTC (rev 164704)
@@ -1,3 +1,13 @@
+2014-02-26 Martin Robinson <mrobin...@igalia.com>
+
+ [GTK] generate-gtkdoc can fail with WebKit1 or WebKit2 only builds
+ https://bugs.webkit.org/show_bug.cgi?id=129319
+
+ Reviewed by Carlos Garcia Campos.
+
+ * GNUmakefile.am: Do not generate the documentation configuration file if the port
+ is disabled.
+
2014-02-25 Benjamin Poulain <bpoul...@apple.com>
[iOS][WK2] Split the rects/scale updates in 3 internally consistent groups
Modified: trunk/Source/WebKit2/GNUmakefile.am (164703 => 164704)
--- trunk/Source/WebKit2/GNUmakefile.am 2014-02-26 07:53:56 UTC (rev 164703)
+++ trunk/Source/WebKit2/GNUmakefile.am 2014-02-26 08:11:08 UTC (rev 164704)
@@ -803,6 +803,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
@@ -821,6 +822,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: trunk/Tools/ChangeLog (164703 => 164704)
--- trunk/Tools/ChangeLog 2014-02-26 07:53:56 UTC (rev 164703)
+++ trunk/Tools/ChangeLog 2014-02-26 08:11:08 UTC (rev 164704)
@@ -1,3 +1,13 @@
+2014-02-26 Martin Robinson <mrobin...@igalia.com>
+
+ [GTK] generate-gtkdoc can fail with WebKit1 or WebKit2 only builds
+ https://bugs.webkit.org/show_bug.cgi?id=129319
+
+ Reviewed by Carlos Garcia Campos.
+
+ * gtk/generate-gtkdoc:
+ (get_generator_for_config): Properly handle the situation where the pkgconfig file is missing.
+
2014-02-25 Mihai Maerean <mmaer...@adobe.com>
Unreviewed. Add myself as a committer.
Modified: trunk/Tools/gtk/generate-gtkdoc (164703 => 164704)
--- trunk/Tools/gtk/generate-gtkdoc 2014-02-26 07:53:56 UTC (rev 164703)
+++ trunk/Tools/gtk/generate-gtkdoc 2014-02-26 08:11:08 UTC (rev 164704)
@@ -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
