aboutsummaryrefslogtreecommitdiff
path: root/modules/gnome.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2015-10-19 00:35:41 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2015-10-19 00:35:41 +0300
commitbbbe102cc29a19c726095dbd5118c515996e64f0 (patch)
tree4dd929f0d110d4b86ec98bbacf423aa931f28153 /modules/gnome.py
parent0b63f32fe33298bb373522b0a717e186a4d0ebd4 (diff)
downloadmeson-bbbe102cc29a19c726095dbd5118c515996e64f0.zip
meson-bbbe102cc29a19c726095dbd5118c515996e64f0.tar.gz
meson-bbbe102cc29a19c726095dbd5118c515996e64f0.tar.bz2
Can set extra args to gtkdoc scan.
Diffstat (limited to 'modules/gnome.py')
-rw-r--r--modules/gnome.py25
1 files changed, 15 insertions, 10 deletions
diff --git a/modules/gnome.py b/modules/gnome.py
index 9e2b476..f126bcf 100644
--- a/modules/gnome.py
+++ b/modules/gnome.py
@@ -233,21 +233,26 @@ class GnomeModule:
'--headerdir=' + header_dir,
'--mainfile=' + main_file,
'--modulename=' + modulename]
+ args += self.unpack_args('--htmlargs=', 'html_args', kwargs)
+ args += self.unpack_args('--scanargs=', 'scan_args', kwargs)
+ res = [build.RunTarget(targetname, command, args, state.subdir)]
+ if kwargs.get('install', True):
+ res.append(build.InstallScript([command] + args))
+ return res
+
+ def unpack_args(self, arg, kwarg_name, kwargs):
try:
- html_args = kwargs['html_args']
- if not isinstance(html_args, list):
- html_args = [html_args]
- for i in html_args:
+ new_args = kwargs[kwarg_name]
+ if not isinstance(new_args, list):
+ new_args = [new_args]
+ for i in new_args:
if not isinstance(i, str):
raise MesonException('html_args values must be strings.')
except KeyError:
- html_args = []
+ return[]
if len(html_args) > 0:
- args.append('--htmlargs=' + '@@'.join(html_args))
- res = [build.RunTarget(targetname, command, args, state.subdir)]
- if kwargs.get('install', True):
- res.append(build.InstallScript([command] + args))
- return res
+ return ['--htmlargs=' + '@@'.join(new_args)]
+ return []
def gdbus_codegen(self, state, args, kwargs):
if len(args) != 2: