aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2021-12-03 14:49:28 -0800
committerEli Schwartz <eschwartz93@gmail.com>2021-12-20 16:03:19 -0500
commitb2eb890da917560042527a3882ab8ec288b20ede (patch)
tree7a4d7183918e718ef5161ba369246bebab10935a
parentc5ce9744b291d1b93c724384154992f440489f08 (diff)
downloadmeson-b2eb890da917560042527a3882ab8ec288b20ede.zip
meson-b2eb890da917560042527a3882ab8ec288b20ede.tar.gz
meson-b2eb890da917560042527a3882ab8ec288b20ede.tar.bz2
gnome: remove 'template' handling from mkenums
This has never been in permittedKwargs, it does nothing, and it was never documented, so it seems pretty safe to just remove it.
-rw-r--r--mesonbuild/modules/gnome.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index 326f56b..7fe979d 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -1493,7 +1493,7 @@ class GnomeModule(ExtensionModule):
cmd = []
known_kwargs = ['comments', 'eprod', 'fhead', 'fprod', 'ftail',
- 'identifier_prefix', 'symbol_prefix', 'template',
+ 'identifier_prefix', 'symbol_prefix',
'vhead', 'vprod', 'vtail']
known_custom_target_kwargs = ['install_dir', 'build_always',
'depends', 'depend_files']
@@ -1506,18 +1506,10 @@ class GnomeModule(ExtensionModule):
c_template = value
if isinstance(c_template, mesonlib.File):
c_template = c_template.absolute_path(state.environment.source_dir, state.environment.build_dir)
- 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':
h_template = value
if isinstance(h_template, mesonlib.File):
h_template = h_template.absolute_path(state.environment.source_dir, state.environment.build_dir)
- 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':
install_header = value
elif arg in known_kwargs: