Merge r178103 - [GTK] Build gtk-doc without gtkdoc-mktmpl

https://bugs.webkit.org/show_bug.cgi?id=140225

Patch by Michael Catanzaro <mcatanzaro@igalia.com> 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.

Canonical link: https://commits.webkit.org/154760.294@webkitgtk/2.6
git-svn-id: https://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.6@178504 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog

@@ -1,3 +1,19 @@
+2015-01-07  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [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  <berto@igalia.com>
 
         convertToUTF8String converts null string to empty string

Tools/gtk/gtkdoc.py

@@ -141,7 +141,6 @@ def generate(self, html=True):
         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 @@ def _run_gtkdoc_scangobj(self):
         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)