From d17df82efa5dd0b60b9b2a25f8a5e2f34477af6a Mon Sep 17 00:00:00 2001 From: Charles Brunet Date: Thu, 13 Mar 2025 16:35:21 -0400 Subject: Move Interpreter.read_buildfile to base class --- mesonbuild/interpreter/interpreter.py | 5 ----- mesonbuild/interpreterbase/interpreterbase.py | 4 +++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index e4183bf87..a17c76c5f 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -328,11 +328,6 @@ class Interpreter(InterpreterBase, HoldableObject): self.builtin['target_machine'] = \ OBJ.MachineHolder(self.build.environment.machines.target, self) - def load_root_meson_file(self) -> None: - build_filename = os.path.join(self.subdir, environment.build_filename) - self.build_def_files.add(build_filename) - super().load_root_meson_file() - def build_func_dict(self) -> None: self.funcs.update({'add_global_arguments': self.func_add_global_arguments, 'add_global_link_arguments': self.func_add_global_link_arguments, diff --git a/mesonbuild/interpreterbase/interpreterbase.py b/mesonbuild/interpreterbase/interpreterbase.py index 53d62c385..2bdb5ef2e 100644 --- a/mesonbuild/interpreterbase/interpreterbase.py +++ b/mesonbuild/interpreterbase/interpreterbase.py @@ -109,7 +109,9 @@ class InterpreterBase: raise InvalidCode.from_node(f'Build file failed to parse as unicode: {e}', node=node) def load_root_meson_file(self) -> None: - mesonfile = os.path.join(self.source_root, self.subdir, environment.build_filename) + build_filename = os.path.join(self.subdir, environment.build_filename) + self.build_def_files.add(build_filename) + mesonfile = os.path.join(self.source_root, build_filename) if not os.path.isfile(mesonfile): raise InvalidArguments(f'Missing Meson file in {mesonfile}') code = self.read_buildfile(mesonfile, mesonfile) -- cgit v1.2.3