diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2019-07-24 11:30:35 +0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-07-31 21:42:24 +0300 |
| commit | 06aaffa4e14322274fe28184d159adec1142b1cb (patch) | |
| tree | c5dc412201bbb42635b840f0d94ecafa2b9d9d3b | |
| parent | 679ddb0ae780bfd4d81c586b0512255c0d1e24b6 (diff) | |
| download | meson-06aaffa4e14322274fe28184d159adec1142b1cb.zip meson-06aaffa4e14322274fe28184d159adec1142b1cb.tar.gz meson-06aaffa4e14322274fe28184d159adec1142b1cb.tar.bz2 | |
Allow kconfig to read from configure_file()
At configure time, kconfig can read from configure_file().
"test cases/kconfig/4 load_config builddir/meson.build" was already
showing a workaround, now it actually can take configure_file input
directly.
| -rw-r--r-- | docs/markdown/snippets/kconfig_enhancements.md | 3 | ||||
| -rw-r--r-- | mesonbuild/modules/unstable_kconfig.py | 13 | ||||
| -rw-r--r-- | test cases/kconfig/4 load_config builddir/meson.build | 4 |
3 files changed, 12 insertions, 8 deletions
diff --git a/docs/markdown/snippets/kconfig_enhancements.md b/docs/markdown/snippets/kconfig_enhancements.md new file mode 100644 index 0000000..94e3872 --- /dev/null +++ b/docs/markdown/snippets/kconfig_enhancements.md @@ -0,0 +1,3 @@ +## Enhancements to the kconfig module + +`kconfig.load()` may now accept a `configure_file()` as input file. diff --git a/mesonbuild/modules/unstable_kconfig.py b/mesonbuild/modules/unstable_kconfig.py index 1639eed..6685710 100644 --- a/mesonbuild/modules/unstable_kconfig.py +++ b/mesonbuild/modules/unstable_kconfig.py @@ -54,15 +54,16 @@ class KconfigModule(ExtensionModule): raise InvalidCode('load takes only one file input.') s = sources[0] + is_built = False if isinstance(s, mesonlib.File): - # kconfig input is processed at "meson setup" time, not during - # the build, so it cannot reside in the build directory. if s.is_built: - raise InvalidCode('kconfig input must be a source file.') - s = s.relative_name() + FeatureNew('kconfig.load() of built files', '0.52.0').use(state.subproject) + is_built = True + s = s.absolute_path(interpreter.environment.source_dir, interpreter.environment.build_dir) + else: + s = os.path.join(interpreter.environment.source_dir, s) - s = os.path.join(interpreter.environment.source_dir, s) - if s not in interpreter.build_def_files: + if s not in interpreter.build_def_files and not is_built: interpreter.build_def_files.append(s) return self._load_file(s) diff --git a/test cases/kconfig/4 load_config builddir/meson.build b/test cases/kconfig/4 load_config builddir/meson.build index 93136ba..1924d23 100644 --- a/test cases/kconfig/4 load_config builddir/meson.build +++ b/test cases/kconfig/4 load_config builddir/meson.build @@ -2,8 +2,8 @@ project('kconfig builddir test') k = import('unstable-kconfig') -configure_file(input: 'config', output: 'out-config', copy: true) -conf = k.load(meson.build_root() / 'out-config') +out_conf = configure_file(input: 'config', output: 'out-config', copy: true) +conf = k.load(out_conf) if not conf.has_key('CONFIG_IS_SET') error('Expected CONFIG_IS_SET to be set, but it wasn\'t') |