diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2025-05-05 13:23:30 +0200 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-05-07 09:43:43 -0700 |
| commit | 01da0686f67e6a2f658130c11328be2977db5f90 (patch) | |
| tree | c8840e2659e15594e95d7297b0f683bd843172da /mesonbuild/interpreter/interpreter.py | |
| parent | c1b7ef4218f12905641f1cb1503c8b9b3542e983 (diff) | |
| download | meson-01da0686f67e6a2f658130c11328be2977db5f90.tar.gz | |
interpreter: rename default_project_options
It is assigned to invoker_method_default_options for clarity, use that name
everywhere.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'mesonbuild/interpreter/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 8fb660d1f..44209d097 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -270,7 +270,7 @@ class Interpreter(InterpreterBase, HoldableObject): subproject: str = '', subdir: str = '', subproject_dir: str = 'subprojects', - default_project_options: T.Optional[T.Dict[OptionKey, str]] = None, + invoker_method_default_options: T.Optional[T.Dict[OptionKey, str]] = None, ast: T.Optional[mparser.CodeBlockNode] = None, relaxations: T.Optional[T.Set[InterpreterRuleRelaxation]] = None, user_defined_options: T.Optional[coredata.SharedCMDOptions] = None, @@ -295,11 +295,11 @@ class Interpreter(InterpreterBase, HoldableObject): self.subproject_stack: T.List[str] = [] self.configure_file_outputs: T.Dict[str, int] = {} # Passed from the outside, only used in subprojects. - if default_project_options: - assert isinstance(default_project_options, dict) - self.default_project_options = default_project_options + if invoker_method_default_options: + assert isinstance(invoker_method_default_options, dict) + self.invoker_method_default_options = invoker_method_default_options else: - self.default_project_options = {} + self.invoker_method_default_options = {} self.project_default_options: T.List[str] = [] self.build_func_dict() self.build_holder_map() @@ -1199,9 +1199,8 @@ class Interpreter(InterpreterBase, HoldableObject): self.user_defined_options.cmd_line_options, self.environment.options) else: - invoker_method_default_options = self.default_project_options self.coredata.optstore.initialize_from_subproject_call(self.subproject, - invoker_method_default_options, + self.invoker_method_default_options, self.project_default_options, self.user_defined_options.cmd_line_options) self.coredata.initialized_subprojects.add(self.subproject) |