diff options
author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2015-05-20 09:56:07 +0000 |
---|---|---|
committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2015-05-20 09:56:07 +0000 |
commit | 41386e9cb918eed93b3f13648cbef387e371e451 (patch) | |
tree | a97f9d7bd1d9d091833286085f72da9d83fd0606 /Tools/gtk/gtkdoc.py | |
parent | e15dd966d523731101f70ccf768bba12435a0208 (diff) | |
download | WebKitGtk-tarball-41386e9cb918eed93b3f13648cbef387e371e451.tar.gz |
webkitgtk-2.4.9webkitgtk-2.4.9
Diffstat (limited to 'Tools/gtk/gtkdoc.py')
-rw-r--r-- | Tools/gtk/gtkdoc.py | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py index 4c8237b0e..947c1e8c7 100644 --- a/Tools/gtk/gtkdoc.py +++ b/Tools/gtk/gtkdoc.py @@ -141,6 +141,7 @@ class GTKDoc(object): self._write_version_xml() self._run_gtkdoc_scan() self._run_gtkdoc_scangobj() + self._run_gtkdoc_mktmpl() self._run_gtkdoc_mkdb() if not html: @@ -194,15 +195,9 @@ class GTKDoc(object): if print_output: if stdout: - try: - sys.stdout.write(stdout.encode("utf-8")) - except UnicodeDecodeError: - sys.stdout.write(stdout) + sys.stdout.write(stdout) if stderr: - try: - sys.stderr.write(stderr.encode("utf-8")) - except UnicodeDecodeError: - sys.stderr.write(stderr) + sys.stderr.write(stderr) if process.returncode != 0: raise Exception('%s produced a non-zero return code %i' @@ -312,11 +307,7 @@ class GTKDoc(object): env = os.environ ldflags = self.ldflags if self.library_path: - additional_ldflags = '' - for arg in env.get('LDFLAGS', '').split(' '): - if arg.startswith('-L'): - additional_ldflags = '%s %s' % (additional_ldflags, arg) - ldflags = ' "-L%s" %s ' % (self.library_path, additional_ldflags) + ldflags + ldflags = ' "-L%s" ' % self.library_path + ldflags current_ld_library_path = env.get('LD_LIBRARY_PATH') if current_ld_library_path: env['RUN'] = 'LD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_ld_library_path) @@ -337,6 +328,10 @@ class GTKDoc(object): 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) |