diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2018-06-21 14:06:41 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-06-26 22:58:45 +0300 |
| commit | 32c22ec492fb471dc0c1bfdbb83404a486e4a72a (patch) | |
| tree | 834303e13485415a28e1c989cca7b78c3f59bf41 /mesonbuild/scripts | |
| parent | d784b5772a55eadb88034bd1992adeaddfba28d0 (diff) | |
| download | meson-32c22ec492fb471dc0c1bfdbb83404a486e4a72a.zip meson-32c22ec492fb471dc0c1bfdbb83404a486e4a72a.tar.gz meson-32c22ec492fb471dc0c1bfdbb83404a486e4a72a.tar.bz2 | |
gtkdoc: Use generated types file if there is one
Closes: #3773.
Diffstat (limited to 'mesonbuild/scripts')
| -rw-r--r-- | mesonbuild/scripts/gtkdochelper.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mesonbuild/scripts/gtkdochelper.py b/mesonbuild/scripts/gtkdochelper.py index 3e0478e..4c5cbdf 100644 --- a/mesonbuild/scripts/gtkdochelper.py +++ b/mesonbuild/scripts/gtkdochelper.py @@ -117,6 +117,11 @@ def build_gtkdoc(source_root, build_root, doc_subdir, src_subdirs, scan_cmd += scan_args gtkdoc_run_check(scan_cmd, abs_out) + # Use the generated types file when available, otherwise gobject_typesfile + # would often be a path to source dir instead of build dir. + if '--rebuild-types' in scan_args: + gobject_typesfile = os.path.join(abs_out, module + '.types') + if gobject_typesfile: scanobjs_cmd = ['gtkdoc-scangobj'] + scanobjs_args + ['--types=' + gobject_typesfile, '--module=' + module, |