Title: [128367] trunk/Tools
- Revision
- 128367
- Author
- commit-qu...@webkit.org
- Date
- 2012-09-12 15:13:44 -0700 (Wed, 12 Sep 2012)
Log Message
[GTK] We attempt to rebase documentation even if it's not present
https://bugs.webkit.org/show_bug.cgi?id=96553
Patch by Xan Lopez <xlo...@igalia.com> on 2012-09-12
Reviewed by Martin Robinson.
Do not make the documentation rebase step fatal. This allows make
install to succeed when there's no documentation generated.
* gtk/generate-gtkdoc:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (128366 => 128367)
--- trunk/Tools/ChangeLog 2012-09-12 22:12:25 UTC (rev 128366)
+++ trunk/Tools/ChangeLog 2012-09-12 22:13:44 UTC (rev 128367)
@@ -1,3 +1,15 @@
+2012-09-12 Xan Lopez <xlo...@igalia.com>
+
+ [GTK] We attempt to rebase documentation even if it's not present
+ https://bugs.webkit.org/show_bug.cgi?id=96553
+
+ Reviewed by Martin Robinson.
+
+ Do not make the documentation rebase step fatal. This allows make
+ install to succeed when there's no documentation generated.
+
+ * gtk/generate-gtkdoc:
+
2012-09-12 Kenneth Rohde Christiansen <kenn...@webkit.org>
Respect WEBKITOUTPUTDIR when running EFL tests
Modified: trunk/Tools/gtk/generate-gtkdoc (128366 => 128367)
--- trunk/Tools/gtk/generate-gtkdoc 2012-09-12 22:12:25 UTC (rev 128366)
+++ trunk/Tools/gtk/generate-gtkdoc 2012-09-12 22:13:44 UTC (rev 128367)
@@ -173,7 +173,10 @@
saw_webkit1_warnings = generate_doc(generator)
else:
print "Rebasing WebKit1 documentation..."
- generator.rebase_installed_docs()
+ try:
+ generator.rebase_installed_docs()
+ except Exception,e:
+ print "Rebase did not happen, likely no documentation is present."
# WebKit2 might not be enabled, so check for the pkg-config file before building documentation.
pkg_config_path = common.build_path('Source', 'WebKit2', 'webkit2gtk-3.0.pc')
@@ -184,6 +187,9 @@
saw_webkit2_warnings = generate_doc(generator)
else:
print "\nRebasing WebKit2 documentation..."
- generator.rebase_installed_docs()
+ try:
+ generator.rebase_installed_docs()
+ except Exception,e:
+ print "Rebase did not happen, likely no documentation is present."
sys.exit(saw_webkit1_warnings or saw_webkit2_warnings)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
