diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-11-11 09:20:01 +0530 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-12 11:54:13 -0500 |
| commit | 55288b0fcc8e80da9b7d96747c1478580c7e9130 (patch) | |
| tree | af9de2d88df06c32d97880aabfd888c3f369d038 /mesonbuild/scripts/gtkdochelper.py | |
| parent | 3db969336f73366341413eac013a9ae4d9265221 (diff) | |
| download | meson-55288b0fcc8e80da9b7d96747c1478580c7e9130.zip meson-55288b0fcc8e80da9b7d96747c1478580c7e9130.tar.gz meson-55288b0fcc8e80da9b7d96747c1478580c7e9130.tar.bz2 | |
scripts/gtkdochelper: ignore_headers is a list
Also, only add it if it's defined.
Closes #1020
Diffstat (limited to 'mesonbuild/scripts/gtkdochelper.py')
| -rwxr-xr-x | mesonbuild/scripts/gtkdochelper.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mesonbuild/scripts/gtkdochelper.py b/mesonbuild/scripts/gtkdochelper.py index 220801d..e34b541 100755 --- a/mesonbuild/scripts/gtkdochelper.py +++ b/mesonbuild/scripts/gtkdochelper.py @@ -90,10 +90,11 @@ def build_gtkdoc(source_root, build_root, doc_subdir, src_subdir, f_abs = os.path.join(doc_src, f) shutil.copyfile(f_abs, os.path.join(htmldir, os.path.basename(f_abs))) - scan_cmd = ['gtkdoc-scan', - '--module=' + module, - '--source-dir=' + abs_src, - '--ignore-headers=' + ignore_headers] + scan_args + scan_cmd = ['gtkdoc-scan', '--module=' + module, '--source-dir=' + abs_src] + if ignore_headers: + scan_cmd.append('--ignore-headers=' + ' '.join(ignore_headers)) + # Add user-specified arguments + scan_cmd += scan_args gtkdoc_run_check(scan_cmd, abs_out) if gobject_typesfile: |