Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Disallow some keyword arguments to gnome.mkenums. 

The install argument is allowed for CustomTargets, but we use
install_header as the setting now. Also, setting a generic template when
specifying the more specific source or header template shouldn't be
allowed.
This commit is contained in:
Elliott Sales de Andrade 2016-11-13 19:00:20 -05:00 committed by Jussi Pakkanen
parent 621219ccb0
commit 996f4d89f3
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mesonbuild/modules/gnome.py
View File

@ -715,7 +715,7 @@ can not be used with the current version of glib-compiled-resources, due to
known_kwargs = ['comments', 'eprod', 'fhead', 'fprod', 'ftail', known_kwargs = ['comments', 'eprod', 'fhead', 'fprod', 'ftail',
'identifier_prefix', 'symbol_prefix', 'template', 'identifier_prefix', 'symbol_prefix', 'template',
'vhead', 'vprod', 'vtail'] 'vhead', 'vprod', 'vtail']
known_custom_target_kwargs = ['install', 'install_dir', 'build_always', known_custom_target_kwargs = ['install_dir', 'build_always',
'depends', 'depend_files'] 'depends', 'depend_files']
c_template = h_template = None c_template = h_template = None
install_header = False install_header = False
@ -724,8 +724,16 @@ can not be used with the current version of glib-compiled-resources, due to
sources = [value] + sources sources = [value] + sources
elif arg == 'c_template': elif arg == 'c_template':
c_template = value c_template = value
if 'template' in kwargs:
raise MesonException('Mkenums does not accept both '
'c_template and template keyword '
'arguments at the same time.')
elif arg == 'h_template': elif arg == 'h_template':
h_template = value h_template = value
if 'template' in kwargs:
raise MesonException('Mkenums does not accept both '
'h_template and template keyword '
'arguments at the same time.')
elif arg == 'install_header': elif arg == 'install_header':
install_header = value install_header = value
elif arg in known_kwargs: elif arg in known_kwargs: