diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-05-24 22:30:06 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-24 22:30:06 +0300 |
| commit | c8256a30a0a3523b62870c6bc93942af384d8c53 (patch) | |
| tree | 044f61261dbdd1782570781aae3f16eb19973a0c /mesonbuild | |
| parent | 41ab5166e42e1793419ba44e6fb060f7dbf7cd4c (diff) | |
| parent | 9a0e380525cfa3bf509888a1694aaf60218705e6 (diff) | |
| download | meson-c8256a30a0a3523b62870c6bc93942af384d8c53.zip meson-c8256a30a0a3523b62870c6bc93942af384d8c53.tar.gz meson-c8256a30a0a3523b62870c6bc93942af384d8c53.tar.bz2 | |
Merge pull request #3578 from MathieuDuponchelle/mkenums_gen_templates
gnome/mkenums: allow passing generated files as templates
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/modules/gnome.py | 8 |
1 files changed, 6 insertions, 2 deletions
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@'] |