diff options
| author | Mathieu Duponchelle <mathieu@centricular.com> | 2018-05-17 00:49:08 +0200 |
|---|---|---|
| committer | Mathieu Duponchelle <mathieu@centricular.com> | 2018-05-23 23:23:08 +0200 |
| commit | 6dd896d0014138c5eea194dc0f5bde658c286074 (patch) | |
| tree | 08805e137e28be199645d05d4557d0d0b1b43b55 | |
| parent | ecbeae565b1597f91f37513c258c077b1f54ad21 (diff) | |
| download | meson-6dd896d0014138c5eea194dc0f5bde658c286074.zip meson-6dd896d0014138c5eea194dc0f5bde658c286074.tar.gz meson-6dd896d0014138c5eea194dc0f5bde658c286074.tar.bz2 | |
gnome/mkenums: allow passing generated files as templates
| -rw-r--r-- | mesonbuild/modules/gnome.py | 8 | ||||
| -rw-r--r-- | test cases/frameworks/7 gnome/mkenums/meson.build | 16 |
2 files changed, 22 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@'] diff --git a/test cases/frameworks/7 gnome/mkenums/meson.build b/test cases/frameworks/7 gnome/mkenums/meson.build index ff31619..3db4d63 100644 --- a/test cases/frameworks/7 gnome/mkenums/meson.build +++ b/test cases/frameworks/7 gnome/mkenums/meson.build @@ -127,3 +127,19 @@ enums5 = gnome.mkenums_simple('enums5', sources : 'meson-sample.h', decorator : 'MESON_EXPORT', header_prefix : '#include "meson-decls.h"') enumexe5 = executable('enumprog5', main, enums5, dependencies : gobj) + +# Generate template then use as input to mkenums + +# Simple trick to copy the file without substitutions, can be +# removed when https://github.com/mesonbuild/meson/pull/3383 is fixed +gen_h_template = configure_file(input: 'enums2.h.in', + output: 'enums2-tmp.h.in', + configuration: configuration_data(), + format: 'cmake') + +enums_h3 = gnome.mkenums('abc3', + sources : 'meson-sample.h', + h_template : gen_h_template, + ftail : '/* trailing header file info */', + install_header : true, + install_dir : get_option('includedir')) |