From 1033728c8573c1dee5b06237e2dc0a99d2a3500d Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 19 Sep 2016 01:34:56 -0400 Subject: [PATCH] Fix mkenums and genmarshal argument names. Dashes aren't allowed in keyword argument names. --- mesonbuild/modules/gnome.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index edd3f93ee..8cbc4049d 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -489,7 +489,7 @@ class GnomeModule: cmd = ['glib-mkenums'] known_kwargs = ['comments', 'eprod', 'fhead', 'fprod', 'ftail', - 'identifier-prefix', 'symbol-prefix', 'template', + 'identifier_prefix', 'symbol_prefix', 'template', 'vhead', 'vprod', 'vtail'] known_custom_target_kwargs = ['install', 'install_dir', 'build_always', 'depends', 'depend_files'] @@ -499,7 +499,7 @@ class GnomeModule: add_template = True sources = [value] + sources elif arg in known_kwargs: - cmd += ['--' + arg, value] + cmd += ['--' + arg.replace('_', '-'), value] elif arg not in known_custom_target_kwargs: raise MesonException( 'Mkenums does not take a %s keyword argument.' % (arg, )) @@ -535,8 +535,8 @@ class GnomeModule: 'Sources keyword argument must be a string or array.') cmd = ['glib-genmarshal'] - known_kwargs = ['internal', 'nostdinc', 'skip-source', 'stdinc', - 'valist-marshallers'] + known_kwargs = ['internal', 'nostdinc', 'skip_source', 'stdinc', + 'valist_marshallers'] known_custom_target_kwargs = ['build_always', 'depends', 'depend_files', 'install_dir', 'install_header'] @@ -544,7 +544,7 @@ class GnomeModule: if arg == 'prefix': cmd += ['--prefix', value] elif arg in known_kwargs and value: - cmd += ['--' + arg] + cmd += ['--' + arg.replace('_', '-')] elif arg not in known_custom_target_kwargs: raise MesonException( 'Genmarshal does not take a %s keyword argument.' % (