diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2023-09-03 12:07:32 -0400 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2023-09-07 06:55:07 -0400 |
| commit | d5f17bc9ffea9537057eb249fc68776eb53d5f58 (patch) | |
| tree | 06ba89b450c0c22f762555d5cc90ead4dbfb32b1 /mesonbuild/build.py | |
| parent | 3fc16f05b513f26aa5da614673116074f5d60396 (diff) | |
| download | meson-d5f17bc9ffea9537057eb249fc68776eb53d5f58.zip meson-d5f17bc9ffea9537057eb249fc68776eb53d5f58.tar.gz meson-d5f17bc9ffea9537057eb249fc68776eb53d5f58.tar.bz2 | |
Rename OptionOverrideProxy to OptionsView and move to coredata
Coredata is where all option handling is done so it makes sense there.
It is a view on a list of options for a given subproject and with
optional overrides. This change prepare for using that view in a more
generic way in the future.
Diffstat (limited to 'mesonbuild/build.py')
| -rw-r--r-- | mesonbuild/build.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 8fed785..edec75d 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -34,7 +34,7 @@ from .mesonlib import ( File, MesonException, MachineChoice, PerMachine, OrderedSet, listify, extract_as_list, typeslistify, stringlistify, classify_unity_sources, get_filenames_templates_dict, substitute_values, has_path_sep, - OptionKey, PerMachineDefaultable, OptionOverrideProxy, + OptionKey, PerMachineDefaultable, MesonBugException, EnvironmentVariables, pickle_load, ) from .compilers import ( @@ -535,7 +535,7 @@ class Target(HoldableObject, metaclass=abc.ABCMeta): for k, v in overrides.items()} else: ovr = {} - self.options = OptionOverrideProxy(ovr, self.environment.coredata.options, self.subproject) + self.options = coredata.OptionsView(self.environment.coredata.options, self.subproject, ovr) # XXX: this should happen in the interpreter if has_path_sep(self.name): # Fix failing test 53 when this becomes an error. @@ -655,7 +655,7 @@ class Target(HoldableObject, metaclass=abc.ABCMeta): else: self.options.overrides[k] = v - def get_options(self) -> OptionOverrideProxy: + def get_options(self) -> coredata.OptionsView: return self.options def get_option(self, key: 'OptionKey') -> T.Union[str, int, bool, 'WrapMode']: |