From 32c22ec492fb471dc0c1bfdbb83404a486e4a72a Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Thu, 21 Jun 2018 14:06:41 -0400 Subject: gtkdoc: Use generated types file if there is one Closes: #3773. --- mesonbuild/scripts/gtkdochelper.py | 5 +++++ 1 file changed, 5 insertions(+) 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, -- cgit v1.1