From 6dd896d0014138c5eea194dc0f5bde658c286074 Mon Sep 17 00:00:00 2001 From: Mathieu Duponchelle Date: Thu, 17 May 2018 00:49:08 +0200 Subject: gnome/mkenums: allow passing generated files as templates --- mesonbuild/modules/gnome.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'mesonbuild/modules/gnome.py') diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index da72a1f..ea8ff3f 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -1014,12 +1014,16 @@ This will become a hard error in the future.''') raise AssertionError("sources should've already been handled") elif arg == 'c_template': 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 ' @@ -1040,7 +1044,7 @@ This will become a hard error in the future.''') targets = [] if h_template is not None: - h_output = os.path.splitext(h_template)[0] + h_output = os.path.basename(os.path.splitext(h_template)[0]) # We always set template as the first element in the source array # so --template consumes it. h_cmd = cmd + ['--template', '@INPUT@'] @@ -1055,7 +1059,7 @@ This will become a hard error in the future.''') targets.append(h_target) if c_template is not None: - c_output = os.path.splitext(c_template)[0] + c_output = os.path.basename(os.path.splitext(c_template)[0]) # We always set template as the first element in the source array # so --template consumes it. c_cmd = cmd + ['--template', '@INPUT@'] -- cgit v1.1