Title: [178504] releases/WebKitGTK/webkit-2.6/Tools
- Revision
- 178504
- Author
- [email protected]
- Date
- 2015-01-15 02:50:44 -0800 (Thu, 15 Jan 2015)
Log Message
Merge r178103 - [GTK] Build gtk-doc without gtkdoc-mktmpl
https://bugs.webkit.org/show_bug.cgi?id=140225
Patch by Michael Catanzaro <[email protected]> on 2015-01-07
Reviewed by Darin Adler.
Stop calling gtkdoc-mktmpl. It's being removed upstream, and since we
don't modify the tmpl files that it generates, it's not doing anything
for us.
* gtk/gtkdoc.py:
(GTKDoc.generate):
(GTKDoc._run_gtkdoc_scangobj):
(GTKDoc._run_gtkdoc_mktmpl): Deleted.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.6/Tools/ChangeLog (178503 => 178504)
--- releases/WebKitGTK/webkit-2.6/Tools/ChangeLog 2015-01-15 10:40:17 UTC (rev 178503)
+++ releases/WebKitGTK/webkit-2.6/Tools/ChangeLog 2015-01-15 10:50:44 UTC (rev 178504)
@@ -1,3 +1,19 @@
+2015-01-07 Michael Catanzaro <[email protected]>
+
+ [GTK] Build gtk-doc without gtkdoc-mktmpl
+ https://bugs.webkit.org/show_bug.cgi?id=140225
+
+ Reviewed by Darin Adler.
+
+ Stop calling gtkdoc-mktmpl. It's being removed upstream, and since we
+ don't modify the tmpl files that it generates, it's not doing anything
+ for us.
+
+ * gtk/gtkdoc.py:
+ (GTKDoc.generate):
+ (GTKDoc._run_gtkdoc_scangobj):
+ (GTKDoc._run_gtkdoc_mktmpl): Deleted.
+
2014-12-09 Alberto Garcia <[email protected]>
convertToUTF8String converts null string to empty string
Modified: releases/WebKitGTK/webkit-2.6/Tools/gtk/gtkdoc.py (178503 => 178504)
--- releases/WebKitGTK/webkit-2.6/Tools/gtk/gtkdoc.py 2015-01-15 10:40:17 UTC (rev 178503)
+++ releases/WebKitGTK/webkit-2.6/Tools/gtk/gtkdoc.py 2015-01-15 10:50:44 UTC (rev 178504)
@@ -141,7 +141,6 @@
self._write_version_xml()
self._run_gtkdoc_scan()
self._run_gtkdoc_scangobj()
- self._run_gtkdoc_mktmpl()
self._run_gtkdoc_mkdb()
if not html:
@@ -338,10 +337,6 @@
self._run_command(['gtkdoc-scangobj', '--module=%s' % self.module_name],
env=env, cwd=self.output_dir)
- def _run_gtkdoc_mktmpl(self):
- args = ['gtkdoc-mktmpl', '--module=%s' % self.module_name]
- self._run_command(args, cwd=self.output_dir)
-
def _run_gtkdoc_mkdb(self):
sgml_file = os.path.join(self.output_dir, self.main_sgml_file)
self._raise_exception_if_file_inaccessible(sgml_file)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
