diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-05-25 18:00:15 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-05-25 18:00:15 +0300 |
| commit | f3fa6c02a7cb7bdbe391ad85a6f87b8cfb4ee6b6 (patch) | |
| tree | 9595a45d81760fa712332e1b0e6caf7204bd6182 | |
| parent | babdb27570336387c49e380f12f589b01438d66d (diff) | |
| parent | 245d6b09042314ca5d3295142fc172822e86d2ce (diff) | |
| download | meson-f3fa6c02a7cb7bdbe391ad85a6f87b8cfb4ee6b6.zip meson-f3fa6c02a7cb7bdbe391ad85a6f87b8cfb4ee6b6.tar.gz meson-f3fa6c02a7cb7bdbe391ad85a6f87b8cfb4ee6b6.tar.bz2 | |
Merge pull request #556 from ebassi/gtkdoc-fixref
Support passing extra arguments to gtkdoc-fixxref
| -rw-r--r-- | authors.txt | 1 | ||||
| -rw-r--r-- | mesonbuild/modules/gnome.py | 1 | ||||
| -rw-r--r-- | mesonbuild/scripts/gtkdochelper.py | 12 |
3 files changed, 11 insertions, 3 deletions
diff --git a/authors.txt b/authors.txt index d8b0abc..d628368 100644 --- a/authors.txt +++ b/authors.txt @@ -33,3 +33,4 @@ Nicolas Schneider Luke Adams Rogiel Sulzbach Tim-Philipp Müller +Emmanuele Bassi diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 39a6ff7..718d07a 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -289,6 +289,7 @@ class GnomeModule: '--modulename=' + modulename] args += self.unpack_args('--htmlargs=', 'html_args', kwargs) args += self.unpack_args('--scanargs=', 'scan_args', kwargs) + args += self.unpack_args('--fixxrefargs=', 'fixxref_args', kwargs) res = [build.RunTarget(targetname, command[0], command[1:] + args, state.subdir)] if kwargs.get('install', True): res.append(build.InstallScript(command + args)) diff --git a/mesonbuild/scripts/gtkdochelper.py b/mesonbuild/scripts/gtkdochelper.py index 68be8f2..d920b61 100644 --- a/mesonbuild/scripts/gtkdochelper.py +++ b/mesonbuild/scripts/gtkdochelper.py @@ -28,9 +28,10 @@ parser.add_argument('--mainfile', dest='mainfile') parser.add_argument('--modulename', dest='modulename') parser.add_argument('--htmlargs', dest='htmlargs', default='') parser.add_argument('--scanargs', dest='scanargs', default='') +parser.add_argument('--fixxrefargs', dest='fixxrefargs', default='') def build_gtkdoc(source_root, build_root, doc_subdir, src_subdir, - main_file, module, html_args, scan_args): + main_file, module, html_args, scan_args, fixxref_args): abs_src = os.path.join(source_root, src_subdir) abs_out = os.path.join(build_root, doc_subdir) htmldir = os.path.join(abs_out, 'html') @@ -76,7 +77,7 @@ def build_gtkdoc(source_root, build_root, doc_subdir, src_subdir, subprocess.check_call(mkhtml_cmd, cwd=os.path.join(abs_out, 'html'), shell=False) fixref_cmd = ['gtkdoc-fixxref', '--module=' + module, - '--module-dir=html'] + '--module-dir=html'] + fixxref_args # print(fixref_cmd) # sys.exit(1) subprocess.check_call(fixref_cmd, cwd=abs_out) @@ -97,6 +98,10 @@ def run(args): scanargs = options.scanargs.split('@@') else: scanargs = [] + if len(options.fixxrefargs) > 0: + fixxrefargs = options.fixxrefargs.split('@@') + else: + fixxrefargs = [] build_gtkdoc(options.sourcedir, options.builddir, options.subdir, @@ -104,7 +109,8 @@ def run(args): options.mainfile, options.modulename, htmlargs, - scanargs) + scanargs, + fixxrefargs) if 'MESON_INSTALL_PREFIX' in os.environ: if 'DESTDIR' in os.environ: |