diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2020-02-07 01:55:27 +0100 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-05-08 20:56:14 +0300 |
commit | 7e1529501883ce8741d8689c150f589ab68a814f (patch) | |
tree | 407e0c6b075a1b8872f7f9896948d79cbe5846ed /test cases | |
parent | a535ef6719816b23085da492dbcdcc4b7bfa8d2b (diff) | |
download | meson-7e1529501883ce8741d8689c150f589ab68a814f.zip meson-7e1529501883ce8741d8689c150f589ab68a814f.tar.gz meson-7e1529501883ce8741d8689c150f589ab68a814f.tar.bz2 |
rename unstable-kconfig to unstable-keyval
Discussions in #6524 have shown that there are various possible uses of the
kconfig module and even disagreements in the exact file format between
Python-based kconfiglib and the tools in Linux. Instead of trying to
reconcile them, just rename the module to something less suggestive and
leave any policy to meson.build files.
In the future it may be possible to add some kind of parsing through
keyword arguments such as bool_true, quoted_strings, etc. and possibly
creation of key-value lists too. For now, configuration_data objects
provide an easy way to access quoted strings. Note that Kconfig stores
false as "absent" so it was already necessary to write "x.has_key('abc')"
rather than the more compact "x['abc']". Therefore, having to use
configuration_data does not make things much more verbose.
Diffstat (limited to 'test cases')
-rw-r--r-- | test cases/common/222 source set realistic example/meson.build | 6 | ||||
-rw-r--r-- | test cases/keyval/1 basic/.config (renamed from test cases/kconfig/1 basic/.config) | 0 | ||||
-rw-r--r-- | test cases/keyval/1 basic/meson.build (renamed from test cases/kconfig/1 basic/meson.build) | 4 | ||||
-rw-r--r-- | test cases/keyval/2 subdir/.config (renamed from test cases/kconfig/2 subdir/.config) | 0 | ||||
-rw-r--r-- | test cases/keyval/2 subdir/dir/meson.build (renamed from test cases/kconfig/2 subdir/dir/meson.build) | 2 | ||||
-rw-r--r-- | test cases/keyval/2 subdir/meson.build (renamed from test cases/kconfig/2 subdir/meson.build) | 2 | ||||
-rw-r--r-- | test cases/keyval/3 load_config files/dir/config (renamed from test cases/kconfig/3 load_config files/dir/config) | 0 | ||||
-rw-r--r-- | test cases/keyval/3 load_config files/dir/meson.build (renamed from test cases/kconfig/3 load_config files/dir/meson.build) | 2 | ||||
-rw-r--r-- | test cases/keyval/3 load_config files/meson.build (renamed from test cases/kconfig/3 load_config files/meson.build) | 2 | ||||
-rw-r--r-- | test cases/keyval/4 load_config builddir/config (renamed from test cases/kconfig/4 load_config builddir/config) | 0 | ||||
-rw-r--r-- | test cases/keyval/4 load_config builddir/meson.build (renamed from test cases/kconfig/4 load_config builddir/meson.build) | 4 |
11 files changed, 11 insertions, 11 deletions
diff --git a/test cases/common/222 source set realistic example/meson.build b/test cases/common/222 source set realistic example/meson.build index 5b0e495..106b81d 100644 --- a/test cases/common/222 source set realistic example/meson.build +++ b/test cases/common/222 source set realistic example/meson.build @@ -1,4 +1,4 @@ -# a sort-of realistic example that combines the sourceset and kconfig +# a sort-of realistic example that combines the sourceset and keyval # modules, inspired by QEMU's build system project('sourceset-example', 'cpp', default_options: ['cpp_std=c++11']) @@ -9,7 +9,7 @@ if cppid == 'pgi' endif ss = import('sourceset') -kconfig = import('unstable-kconfig') +keyval = import('unstable-keyval') zlib = declare_dependency(compile_args: '-DZLIB=1') another = declare_dependency(compile_args: '-DANOTHER=1') @@ -39,7 +39,7 @@ targets = [ 'arm', 'aarch64', 'x86' ] target_dirs = { 'arm' : 'arm', 'aarch64' : 'arm', 'x86': 'x86' } foreach x : targets - config = kconfig.load('config' / x) + config = keyval.load('config' / x) target_specific = specific.apply(config, strict: false) target_common = common.apply(config, strict: false) target_deps = target_specific.dependencies() + target_common.dependencies() diff --git a/test cases/kconfig/1 basic/.config b/test cases/keyval/1 basic/.config index 071d185..071d185 100644 --- a/test cases/kconfig/1 basic/.config +++ b/test cases/keyval/1 basic/.config diff --git a/test cases/kconfig/1 basic/meson.build b/test cases/keyval/1 basic/meson.build index 5dc8d19..fc7ddb3 100644 --- a/test cases/kconfig/1 basic/meson.build +++ b/test cases/keyval/1 basic/meson.build @@ -1,6 +1,6 @@ -project('kconfig basic test') +project('keyval basic test') -k = import('unstable-kconfig') +k = import('unstable-keyval') conf = k.load('.config') if not conf.has_key('CONFIG_VAL1') diff --git a/test cases/kconfig/2 subdir/.config b/test cases/keyval/2 subdir/.config index 0599d46..0599d46 100644 --- a/test cases/kconfig/2 subdir/.config +++ b/test cases/keyval/2 subdir/.config diff --git a/test cases/kconfig/2 subdir/dir/meson.build b/test cases/keyval/2 subdir/dir/meson.build index 12f1502..dc1b478 100644 --- a/test cases/kconfig/2 subdir/dir/meson.build +++ b/test cases/keyval/2 subdir/dir/meson.build @@ -1,5 +1,5 @@ -k = import('unstable-kconfig') +k = import('unstable-keyval') conf = k.load(meson.source_root() / '.config') diff --git a/test cases/kconfig/2 subdir/meson.build b/test cases/keyval/2 subdir/meson.build index 1245b18..0651acf 100644 --- a/test cases/kconfig/2 subdir/meson.build +++ b/test cases/keyval/2 subdir/meson.build @@ -1,4 +1,4 @@ -project('kconfig subdir test') +project('keyval subdir test') # Test into sub directory subdir('dir') diff --git a/test cases/kconfig/3 load_config files/dir/config b/test cases/keyval/3 load_config files/dir/config index 0599d46..0599d46 100644 --- a/test cases/kconfig/3 load_config files/dir/config +++ b/test cases/keyval/3 load_config files/dir/config diff --git a/test cases/kconfig/3 load_config files/dir/meson.build b/test cases/keyval/3 load_config files/dir/meson.build index d7b8d44..43fba13 100644 --- a/test cases/kconfig/3 load_config files/dir/meson.build +++ b/test cases/keyval/3 load_config files/dir/meson.build @@ -1,5 +1,5 @@ -k = import('unstable-kconfig') +k = import('unstable-keyval') conf = k.load(files('config')) diff --git a/test cases/kconfig/3 load_config files/meson.build b/test cases/keyval/3 load_config files/meson.build index 1245b18..0651acf 100644 --- a/test cases/kconfig/3 load_config files/meson.build +++ b/test cases/keyval/3 load_config files/meson.build @@ -1,4 +1,4 @@ -project('kconfig subdir test') +project('keyval subdir test') # Test into sub directory subdir('dir') diff --git a/test cases/kconfig/4 load_config builddir/config b/test cases/keyval/4 load_config builddir/config index 0599d46..0599d46 100644 --- a/test cases/kconfig/4 load_config builddir/config +++ b/test cases/keyval/4 load_config builddir/config diff --git a/test cases/kconfig/4 load_config builddir/meson.build b/test cases/keyval/4 load_config builddir/meson.build index 1924d23..1bb0285 100644 --- a/test cases/kconfig/4 load_config builddir/meson.build +++ b/test cases/keyval/4 load_config builddir/meson.build @@ -1,6 +1,6 @@ -project('kconfig builddir test') +project('keyval builddir test') -k = import('unstable-kconfig') +k = import('unstable-keyval') out_conf = configure_file(input: 'config', output: 'out-config', copy: true) conf = k.load(out_conf) |