Title: [169336] releases/WebKitGTK/webkit-2.4/Tools
Revision
169336
Author
[email protected]
Date
2014-05-26 03:00:23 -0700 (Mon, 26 May 2014)

Log Message

Unreviewed. Fix make distcheck.

* gtk/GNUmakefile.am: Remove generate-webkitdom-doc-files from
EXTRA_DIST and add webkitdom.py.
* gtk/generate-gtkdoc:
(generate_documentation_for_config): Do not try to use
generator.saw_warnings when rebasing, it's only set when
generating the docs.

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.4/Tools/ChangeLog (169335 => 169336)


--- releases/WebKitGTK/webkit-2.4/Tools/ChangeLog	2014-05-26 09:50:18 UTC (rev 169335)
+++ releases/WebKitGTK/webkit-2.4/Tools/ChangeLog	2014-05-26 10:00:23 UTC (rev 169336)
@@ -1,3 +1,14 @@
+2014-05-26  Carlos Garcia Campos  <[email protected]>
+
+        Unreviewed. Fix make distcheck.
+
+        * gtk/GNUmakefile.am: Remove generate-webkitdom-doc-files from
+        EXTRA_DIST and add webkitdom.py.
+        * gtk/generate-gtkdoc:
+        (generate_documentation_for_config): Do not try to use
+        generator.saw_warnings when rebasing, it's only set when
+        generating the docs.
+
 2014-05-20  Carlos Garcia Campos  <[email protected]>
 
         [GTK] WebKitWebPage::send-request always pass a valid pointer for redirected response

Modified: releases/WebKitGTK/webkit-2.4/Tools/gtk/GNUmakefile.am (169335 => 169336)


--- releases/WebKitGTK/webkit-2.4/Tools/gtk/GNUmakefile.am	2014-05-26 09:50:18 UTC (rev 169335)
+++ releases/WebKitGTK/webkit-2.4/Tools/gtk/GNUmakefile.am	2014-05-26 10:00:23 UTC (rev 169336)
@@ -4,8 +4,8 @@
 	Tools/gtk/generate-feature-defines-files \
 	Tools/gtk/generate-gtkdoc \
 	Tools/gtk/generate-inspector-gresource-manifest.py \
-	Tools/gtk/generate-webkitdom-doc-files \
-	Tools/gtk/gtkdoc.py
+	Tools/gtk/gtkdoc.py \
+	Tools/gtk/webkitdom.py
 
 docs: docs-build.stamp
 .PHONY : docs

Modified: releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-gtkdoc (169335 => 169336)


--- releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-gtkdoc	2014-05-26 09:50:18 UTC (rev 169335)
+++ releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-gtkdoc	2014-05-26 10:00:23 UTC (rev 169336)
@@ -149,11 +149,10 @@
         return
 
     if not arguments.rebase:
-        generate_doc(generator, arguments.skip_html)
-    else:
-        rebase_doc(generator)
-    return generator.saw_warnings
+        return generate_doc(generator, arguments.skip_html)
 
+    rebase_doc(generator)
+
 def prepare_environment_for_gtkdoc_generation():
     # We need to add the _javascript_Core build directory to the PKG_CONFIG_PATH
     # so that pkgconfig can properly resolve the libjavascriptcore dependency.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to