diff options
author | Xavier Claessens <xavier.claessens@collabora.com> | 2021-10-12 22:40:19 -0400 |
---|---|---|
committer | Xavier Claessens <xclaesse@gmail.com> | 2022-03-22 17:20:48 -0400 |
commit | 34f442a365cabdec884b7e9c9631bef434b7f989 (patch) | |
tree | 9987fd4a76247ad67e99db074de3bdab66502266 /mesonbuild/mesonlib | |
parent | 06d12064d0ccb1477fadf1d62492a493fb2fb947 (diff) | |
download | meson-34f442a365cabdec884b7e9c9631bef434b7f989.zip meson-34f442a365cabdec884b7e9c9631bef434b7f989.tar.gz meson-34f442a365cabdec884b7e9c9631bef434b7f989.tar.bz2 |
OptionOverrideProxy: Handle per-subproject options
Diffstat (limited to 'mesonbuild/mesonlib')
-rw-r--r-- | mesonbuild/mesonlib/universal.py | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/mesonbuild/mesonlib/universal.py b/mesonbuild/mesonlib/universal.py index f0253b2..dd8473e 100644 --- a/mesonbuild/mesonlib/universal.py +++ b/mesonbuild/mesonlib/universal.py @@ -1946,18 +1946,29 @@ class OptionOverrideProxy(collections.abc.Mapping): # TODO: the typing here could be made more explicit using a TypeDict from # python 3.8 or typing_extensions - def __init__(self, overrides: T.Dict['OptionKey', T.Any], options: 'KeyedOptionDictType'): + def __init__(self, overrides: T.Dict['OptionKey', T.Any], options: 'KeyedOptionDictType', + subproject: T.Optional[str] = None): self.overrides = overrides self.options = options + self.subproject = subproject def __getitem__(self, key: 'OptionKey') -> 'UserOption': - if key in self.options: + # FIXME: This is fundamentally the same algorithm than interpreter.get_option_internal(). + # We should try to share the code somehow. + key = key.evolve(subproject=self.subproject) + if not key.is_project(): + opt = self.options.get(key) + if opt is None or opt.yielding: + opt = self.options[key.as_root()] + else: opt = self.options[key] - if key in self.overrides: - opt = copy.copy(opt) - opt.set_value(self.overrides[key]) - return opt - raise KeyError('Option not found', key) + if opt.yielding: + opt = self.options.get(key.as_root(), opt) + override_value = self.overrides.get(key.as_root()) + if override_value is not None : + opt = copy.copy(opt) + opt.set_value(override_value) + return opt def __iter__(self) -> T.Iterator['OptionKey']: return iter(self.options) @@ -1968,8 +1979,8 @@ class OptionOverrideProxy(collections.abc.Mapping): def __eq__(self, other: object) -> bool: if not isinstance(other, OptionOverrideProxy): return NotImplemented - t1 = (self.overrides, self.options) - t2 = (other.overrides, other.options) + t1 = (self.overrides, self.subproject, self.options) + t2 = (other.overrides, other.subproject, other.options) return t1 == t2 |