diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-06-07 21:01:49 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-07 21:01:49 +0300 |
| commit | 4ed68e7934e7d8a126c896593bb783b753d41d82 (patch) | |
| tree | c159c87c8f9828988555249e155fa1b13aa424ff /mesonbuild/scripts/gtkdochelper.py | |
| parent | a53e44ad638085c7b7a50a819f8615a1a8750d85 (diff) | |
| parent | f0a32ced54834d7f2a2a7e93f793e705bd98f294 (diff) | |
| download | meson-4ed68e7934e7d8a126c896593bb783b753d41d82.zip meson-4ed68e7934e7d8a126c896593bb783b753d41d82.tar.gz meson-4ed68e7934e7d8a126c896593bb783b753d41d82.tar.bz2 | |
Merge pull request #1866 from ebassi/mkdb-args
Add mkdb_args support to gnome.gtkdoc()
Diffstat (limited to 'mesonbuild/scripts/gtkdochelper.py')
| -rw-r--r-- | mesonbuild/scripts/gtkdochelper.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/mesonbuild/scripts/gtkdochelper.py b/mesonbuild/scripts/gtkdochelper.py index 434225e..a2cbf5a 100644 --- a/mesonbuild/scripts/gtkdochelper.py +++ b/mesonbuild/scripts/gtkdochelper.py @@ -32,6 +32,7 @@ parser.add_argument('--scanargs', dest='scanargs', default='') parser.add_argument('--scanobjsargs', dest='scanobjsargs', default='') parser.add_argument('--gobjects-types-file', dest='gobject_typesfile', default='') parser.add_argument('--fixxrefargs', dest='fixxrefargs', default='') +parser.add_argument('--mkdbargs', dest='mkdbargs', default='') parser.add_argument('--ld', dest='ld', default='') parser.add_argument('--cc', dest='cc', default='') parser.add_argument('--ldflags', dest='ldflags', default='') @@ -55,7 +56,8 @@ def gtkdoc_run_check(cmd, cwd): raise MesonException('\n'.join(err_msg)) def build_gtkdoc(source_root, build_root, doc_subdir, src_subdirs, - main_file, module, html_args, scan_args, fixxref_args, + main_file, module, + html_args, scan_args, fixxref_args, mkdb_args, gobject_typesfile, scanobjs_args, ld, cc, ldflags, cflags, html_assets, content_files, ignore_headers, namespace, expand_content_files, mode): @@ -141,6 +143,8 @@ def build_gtkdoc(source_root, build_root, doc_subdir, src_subdirs, if len(main_file) > 0: # Yes, this is the flag even if the file is in xml. mkdb_cmd.append('--main-sgml-file=' + main_file) + # Add user-specified arguments + mkdb_cmd += mkdb_args gtkdoc_run_check(mkdb_cmd, abs_out) # Make HTML documentation @@ -185,6 +189,10 @@ def run(args): fixxrefargs = options.fixxrefargs.split('@@') else: fixxrefargs = [] + if len(options.mkdbargs) > 0: + mkdbargs = options.mkdbargs.split('@@') + else: + mkdbargs = [] build_gtkdoc( options.sourcedir, options.builddir, @@ -195,6 +203,7 @@ def run(args): htmlargs, scanargs, fixxrefargs, + mkdbargs, options.gobject_typesfile, scanobjsargs, options.ld, |