Target: Stop passing environment in method args

2 files changed, 58 insertions, 58 deletions

diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
index 8d3ba88..0f70643 100644
--- a/mesonbuild/backend/backends.py
+++ b/mesonbuild/backend/backends.py
@@ -1529,7 +1529,7 @@ class Backend:
         for t in self.build.get_targets().values():
             if not t.should_install():
                 continue
-            outdirs, install_dir_name, custom_install_dir = t.get_install_dir(self.environment)
+            outdirs, install_dir_name, custom_install_dir = t.get_install_dir()
             # Sanity-check the outputs and install_dirs
             num_outdirs, num_out = len(outdirs), len(t.get_outputs())
             if num_outdirs != 1 and num_outdirs != num_out:
@@ -1561,7 +1561,7 @@ class Backend:
                 # Done separately because of strip/aliases/rpath
                 if outdirs[0] is not False:
                     tag = t.install_tag[0] or ('devel' if isinstance(t, build.StaticLibrary) else 'runtime')
-                    mappings = t.get_link_deps_mapping(d.prefix, self.environment)
+                    mappings = t.get_link_deps_mapping(d.prefix)
                     i = TargetInstallData(self.get_target_filename(t), outdirs[0],
                                           install_dir_name,
                                           should_strip, mappings, t.rpath_dirs_to_remove,
@@ -1803,7 +1803,7 @@ class Backend:
         for t in self.build.get_targets().values():
             cross_built = not self.environment.machines.matches_build_machine(t.for_machine)
             can_run = not cross_built or not self.environment.need_exe_wrapper()
-            in_default_dir = t.should_install() and not t.get_install_dir(self.environment)[2]
+            in_default_dir = t.should_install() and not t.get_install_dir()[2]
             if not can_run or not in_default_dir:
                 continue
             tdir = os.path.join(self.environment.get_build_dir(), self.get_target_dir(t))
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index 72f5950..eaf9433 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -604,15 +604,15 @@ class Target(HoldableObject):
             return NotImplemented
         return self.get_id() >= other.get_id()
 
-    def get_default_install_dir(self, env: environment.Environment) -> T.Tuple[str, str]:
+    def get_default_install_dir(self) -> T.Tuple[str, str]:
         raise NotImplementedError
 
     def get_custom_install_dir(self) -> T.List[T.Union[str, bool]]:
         raise NotImplementedError
 
-    def get_install_dir(self, environment: environment.Environment) -> T.Tuple[T.Any, str, bool]:
+    def get_install_dir(self) -> T.Tuple[T.Any, str, bool]:
         # Find the installation directory.
-        default_install_dir, install_dir_name = self.get_default_install_dir(environment)
+        default_install_dir, install_dir_name = self.get_default_install_dir()
         outdirs = self.get_custom_install_dir()
         if outdirs and outdirs[0] != default_install_dir and outdirs[0] is not True:
             # Either the value is set to a non-default value, or is set to
@@ -774,11 +774,11 @@ class BuildTarget(Target):
         # 1. Pre-existing objects provided by the user with the `objects:` kwarg
         # 2. Compiled objects created by and extracted from another target
         self.process_objectlist(objects)
-        self.process_kwargs(kwargs, environment)
+        self.process_kwargs(kwargs)
         self.check_unknown_kwargs(kwargs)
         if not any([self.sources, self.generated, self.objects, self.link_whole, self.structured_sources]):
             raise InvalidArguments(f'Build target {name} has no sources.')
-        self.validate_install(environment)
+        self.validate_install()
         self.check_module_linking()
 
     def post_init(self) -> None:
@@ -797,9 +797,9 @@ class BuildTarget(Target):
     def __str__(self):
         return f"{self.name}"
 
-    def validate_install(self, environment):
+    def validate_install(self):
         if self.for_machine is MachineChoice.BUILD and self.need_install:
-            if environment.is_cross_build():
+            if self.environment.is_cross_build():
                 raise InvalidArguments('Tried to install a target for the build machine in a cross build.')
             else:
                 mlog.warning('Installing target build for the build machine. This will fail in a cross build.')
@@ -985,7 +985,7 @@ class BuildTarget(Target):
             langs = ', '.join(self.compilers.keys())
             raise InvalidArguments(f'Cannot mix those languages into a target: {langs}')
 
-    def process_link_depends(self, sources, environment):
+    def process_link_depends(self, sources):
         """Process the link_depends keyword argument.
 
         This is designed to handle strings, Files, and the output of Custom
@@ -1000,7 +1000,7 @@ class BuildTarget(Target):
                 self.link_depends.append(s)
             elif isinstance(s, str):
                 self.link_depends.append(
-                    File.from_source_file(environment.source_dir, self.subdir, s))
+                    File.from_source_file(self.environment.source_dir, self.subdir, s))
             elif hasattr(s, 'get_outputs'):
                 self.link_depends.append(s)
             else:
@@ -1059,14 +1059,14 @@ class BuildTarget(Target):
             result += i.get_all_link_deps()
         return result
 
-    def get_link_deps_mapping(self, prefix: str, environment: environment.Environment) -> T.Mapping[str, str]:
-        return self.get_transitive_link_deps_mapping(prefix, environment)
+    def get_link_deps_mapping(self, prefix: str) -> T.Mapping[str, str]:
+        return self.get_transitive_link_deps_mapping(prefix)
 
     @lru_cache(maxsize=None)
-    def get_transitive_link_deps_mapping(self, prefix: str, environment: environment.Environment) -> T.Mapping[str, str]:
+    def get_transitive_link_deps_mapping(self, prefix: str) -> T.Mapping[str, str]:
         result: T.Dict[str, str] = {}
         for i in self.link_targets:
-            mapping = i.get_link_deps_mapping(prefix, environment)
+            mapping = i.get_link_deps_mapping(prefix)
             #we are merging two dictionaries, while keeping the earlier one dominant
             result_tmp = mapping.copy()
             result_tmp.update(result)
@@ -1082,8 +1082,8 @@ class BuildTarget(Target):
             result.update(i.get_link_dep_subdirs())
         return result
 
-    def get_default_install_dir(self, environment: environment.Environment) -> T.Tuple[str, str]:
-        return environment.get_libdir(), '{libdir}'
+    def get_default_install_dir(self) -> T.Tuple[str, str]:
+        return self.environment.get_libdir(), '{libdir}'
 
     def get_custom_install_dir(self) -> T.List[T.Union[str, bool]]:
         return self.install_dir
@@ -1091,7 +1091,7 @@ class BuildTarget(Target):
     def get_custom_install_mode(self) -> T.Optional['FileMode']:
         return self.install_mode
 
-    def process_kwargs(self, kwargs, environment):
+    def process_kwargs(self, kwargs):
         self.process_kwargs_base(kwargs)
         self.copy_kwargs(kwargs)
         kwargs.get('modules', [])
@@ -1153,7 +1153,7 @@ class BuildTarget(Target):
                     or build_rpath properties instead.
                     This will become a hard error in a future Meson release.
                 '''))
-        self.process_link_depends(kwargs.get('link_depends', []), environment)
+        self.process_link_depends(kwargs.get('link_depends', []))
         # Target-specific include dirs must be added BEFORE include dirs from
         # internal deps (added inside self.add_deps()) to override them.
         inclist = extract_as_list(kwargs, 'include_directories')
@@ -1189,7 +1189,7 @@ class BuildTarget(Target):
         extra_files = extract_as_list(kwargs, 'extra_files')
         for i in extra_files:
             assert isinstance(i, File)
-            trial = os.path.join(environment.get_source_dir(), i.subdir, i.fname)
+            trial = os.path.join(self.environment.get_source_dir(), i.subdir, i.fname)
             if not os.path.isfile(trial):
                 raise InvalidArguments(f'Tried to add non-existing extra file {i}.')
         self.extra_files = extra_files
@@ -1203,7 +1203,7 @@ class BuildTarget(Target):
         for r in resources:
             if not isinstance(r, str):
                 raise InvalidArguments('Resource argument is not a string.')
-            trial = os.path.join(environment.get_source_dir(), self.subdir, r)
+            trial = os.path.join(self.environment.get_source_dir(), self.subdir, r)
             if not os.path.isfile(trial):
                 raise InvalidArguments(f'Tried to add non-existing resource {r}.')
         self.resources = resources
@@ -1239,13 +1239,13 @@ class BuildTarget(Target):
             if m.is_darwin() or m.is_windows():
                 self.pic = True
             else:
-                self.pic = self._extract_pic_pie(kwargs, 'pic', environment, 'b_staticpic')
+                self.pic = self._extract_pic_pie(kwargs, 'pic', 'b_staticpic')
         if isinstance(self, Executable) or (isinstance(self, StaticLibrary) and not self.pic):
             # Executables must be PIE on Android
             if self.environment.machines[self.for_machine].is_android():
                 self.pie = True
             else:
-                self.pie = self._extract_pic_pie(kwargs, 'pie', environment, 'b_pie')
+                self.pie = self._extract_pic_pie(kwargs, 'pie', 'b_pie')
         self.implicit_include_directories = kwargs.get('implicit_include_directories', True)
         if not isinstance(self.implicit_include_directories, bool):
             raise InvalidArguments('Implicit_include_directories must be a boolean.')
@@ -1263,7 +1263,7 @@ class BuildTarget(Target):
             raise InvalidArguments(f'Invalid value for win_subsystem: {value}.')
         return value
 
-    def _extract_pic_pie(self, kwargs, arg: str, environment, option: str):
+    def _extract_pic_pie(self, kwargs, arg: str, option: str):
         # Check if we have -fPIC, -fpic, -fPIE, or -fpie in cflags
         all_flags = self.extra_args['c'] + self.extra_args['cpp']
         if '-f' + arg.lower() in all_flags or '-f' + arg.upper() in all_flags:
@@ -1273,8 +1273,8 @@ class BuildTarget(Target):
         k = OptionKey(option)
         if arg in kwargs:
             val = kwargs[arg]
-        elif k in environment.coredata.options:
-            val = environment.coredata.options[k].value
+        elif k in self.environment.coredata.options:
+            val = self.environment.coredata.options[k].value
         else:
             val = False
 
@@ -1876,8 +1876,8 @@ class Executable(BuildTarget):
                                      self.get_using_msvc()):
             self.debug_filename = self.name + '.pdb'
 
-    def get_default_install_dir(self, environment: environment.Environment) -> T.Tuple[str, str]:
-        return environment.get_bindir(), '{bindir}'
+    def get_default_install_dir(self) -> T.Tuple[str, str]:
+        return self.environment.get_bindir(), '{bindir}'
 
     def description(self):
         '''Human friendly description of the executable'''
@@ -1964,17 +1964,17 @@ class StaticLibrary(BuildTarget):
         self.filename = self.prefix + self.name + '.' + self.suffix
         self.outputs = [self.filename]
 
-    def get_link_deps_mapping(self, prefix: str, environment: environment.Environment) -> T.Mapping[str, str]:
+    def get_link_deps_mapping(self, prefix: str) -> T.Mapping[str, str]:
         return {}
 
-    def get_default_install_dir(self, environment) -> T.Tuple[str, str]:
-        return environment.get_static_lib_dir(), '{libdir_static}'
+    def get_default_install_dir(self) -> T.Tuple[str, str]:
+        return self.environment.get_static_lib_dir(), '{libdir_static}'
 
     def type_suffix(self):
         return "@sta"
 
-    def process_kwargs(self, kwargs, environment):
-        super().process_kwargs(kwargs, environment)
+    def process_kwargs(self, kwargs):
+        super().process_kwargs(kwargs)
         if 'rust_crate_type' in kwargs:
             rust_crate_type = kwargs['rust_crate_type']
             if isinstance(rust_crate_type, str):
@@ -2026,24 +2026,24 @@ class SharedLibrary(BuildTarget):
         if not hasattr(self, 'suffix'):
             self.suffix = None
         self.basic_filename_tpl = '{0.prefix}{0.name}.{0.suffix}'
-        self.determine_filenames(self.environment)
+        self.determine_filenames()
 
-    def get_link_deps_mapping(self, prefix: str, environment: environment.Environment) -> T.Mapping[str, str]:
+    def get_link_deps_mapping(self, prefix: str) -> T.Mapping[str, str]:
         result: T.Dict[str, str] = {}
-        mappings = self.get_transitive_link_deps_mapping(prefix, environment)
+        mappings = self.get_transitive_link_deps_mapping(prefix)
         old = get_target_macos_dylib_install_name(self)
         if old not in mappings:
             fname = self.get_filename()
-            outdirs, _, _ = self.get_install_dir(self.environment)
+            outdirs, _, _ = self.get_install_dir()
             new = os.path.join(prefix, outdirs[0], fname)
             result.update({old: new})
         mappings.update(result)
         return mappings
 
-    def get_default_install_dir(self, environment) -> T.Tuple[str, str]:
-        return environment.get_shared_lib_dir(), '{libdir_shared}'
+    def get_default_install_dir(self) -> T.Tuple[str, str]:
+        return self.environment.get_shared_lib_dir(), '{libdir_shared}'
 
-    def determine_filenames(self, env):
+    def determine_filenames(self):
         """
         See https://github.com/mesonbuild/meson/pull/417 for details.
 
@@ -2078,7 +2078,7 @@ class SharedLibrary(BuildTarget):
         # C, C++, Swift, Vala
         # Only Windows uses a separate import library for linking
         # For all other targets/platforms import_filename stays None
-        elif env.machines[self.for_machine].is_windows():
+        elif self.environment.machines[self.for_machine].is_windows():
             suffix = 'dll'
             self.vs_import_filename = '{}{}.lib'.format(self.prefix if self.prefix is not None else '', self.name)
             self.gcc_import_filename = '{}{}.dll.a'.format(self.prefix if self.prefix is not None else 'lib', self.name)
@@ -2105,7 +2105,7 @@ class SharedLibrary(BuildTarget):
                 self.filename_tpl = '{0.prefix}{0.name}-{0.soversion}.{0.suffix}'
             else:
                 self.filename_tpl = '{0.prefix}{0.name}.{0.suffix}'
-        elif env.machines[self.for_machine].is_cygwin():
+        elif self.environment.machines[self.for_machine].is_cygwin():
             suffix = 'dll'
             self.gcc_import_filename = '{}{}.dll.a'.format(self.prefix if self.prefix is not None else 'lib', self.name)
             # Shared library is of the form cygfoo.dll
@@ -2117,7 +2117,7 @@ class SharedLibrary(BuildTarget):
                 self.filename_tpl = '{0.prefix}{0.name}-{0.soversion}.{0.suffix}'
             else:
                 self.filename_tpl = '{0.prefix}{0.name}.{0.suffix}'
-        elif env.machines[self.for_machine].is_darwin():
+        elif self.environment.machines[self.for_machine].is_darwin():
             prefix = 'lib'
             suffix = 'dylib'
             # On macOS, the filename can only contain the major version
@@ -2127,7 +2127,7 @@ class SharedLibrary(BuildTarget):
             else:
                 # libfoo.dylib
                 self.filename_tpl = '{0.prefix}{0.name}.{0.suffix}'
-        elif env.machines[self.for_machine].is_android():
+        elif self.environment.machines[self.for_machine].is_android():
             prefix = 'lib'
             suffix = 'so'
             # Android doesn't support shared_library versioning
@@ -2191,8 +2191,8 @@ class SharedLibrary(BuildTarget):
             raise InvalidArguments('Shared library darwin_versions: value is invalid')
         return darwin_versions
 
-    def process_kwargs(self, kwargs, environment):
-        super().process_kwargs(kwargs, environment)
+    def process_kwargs(self, kwargs):
+        super().process_kwargs(kwargs)
 
         if not self.environment.machines[self.for_machine].is_android():
             supports_versioning = True
@@ -2233,7 +2233,7 @@ class SharedLibrary(BuildTarget):
                 if os.path.isabs(path):
                     self.vs_module_defs = File.from_absolute_file(path)
                 else:
-                    self.vs_module_defs = File.from_source_file(environment.source_dir, self.subdir, path)
+                    self.vs_module_defs = File.from_source_file(self.environment.source_dir, self.subdir, path)
             elif isinstance(path, File):
                 # When passing a generated file.
                 self.vs_module_defs = path
@@ -2244,7 +2244,7 @@ class SharedLibrary(BuildTarget):
                 raise InvalidArguments(
                     'Shared library vs_module_defs must be either a string, '
                     'a file object or a Custom Target')
-            self.process_link_depends(path, environment)
+            self.process_link_depends(path)
 
         if 'rust_crate_type' in kwargs:
             rust_crate_type = kwargs['rust_crate_type']
@@ -2337,8 +2337,8 @@ class SharedModule(SharedLibrary):
         # to build targets, see: https://github.com/mesonbuild/meson/issues/9492
         self.force_soname = False
 
-    def get_default_install_dir(self, environment) -> T.Tuple[str, str]:
-        return environment.get_shared_module_dir(), '{moduledir_shared}'
+    def get_default_install_dir(self) -> T.Tuple[str, str]:
+        return self.environment.get_shared_module_dir(), '{moduledir_shared}'
 
 class BothLibraries(SecondLevelHolder):
     def __init__(self, shared: SharedLibrary, static: StaticLibrary) -> None:
@@ -2465,7 +2465,7 @@ class CustomTarget(Target, CommandBase):
         # Whether to use absolute paths for all files on the commandline
         self.absolute_paths = absolute_paths
 
-    def get_default_install_dir(self, environment) -> T.Tuple[str, str]:
+    def get_default_install_dir(self) -> T.Tuple[str, str]:
         return None, None
 
     def __repr__(self):
@@ -2549,7 +2549,7 @@ class CustomTarget(Target, CommandBase):
         suf = os.path.splitext(self.outputs[0])[-1]
         return suf in {'.a', '.dll', '.lib', '.so', '.dylib'}
 
-    def get_link_deps_mapping(self, prefix: str, environment: environment.Environment) -> T.Mapping[str, str]:
+    def get_link_deps_mapping(self, prefix: str) -> T.Mapping[str, str]:
         return {}
 
     def get_link_dep_subdirs(self):
@@ -2680,7 +2680,7 @@ class Jar(BuildTarget):
     def get_java_resources(self) -> T.Optional[StructuredSources]:
         return self.java_resources
 
-    def validate_install(self, environment):
+    def validate_install(self):
         # All jar targets are installable.
         pass
 
@@ -2694,8 +2694,8 @@ class Jar(BuildTarget):
             return ['-cp', os.pathsep.join(cp_paths)]
         return []
 
-    def get_default_install_dir(self, environment: environment.Environment) -> T.Tuple[str, str]:
-        return environment.get_jar_dir(), '{jardir}'
+    def get_default_install_dir(self) -> T.Tuple[str, str]:
+        return self.environment.get_jar_dir(), '{jardir}'
 
 @dataclass(eq=False)
 class CustomTargetIndex(HoldableObject):
@@ -2736,8 +2736,8 @@ class CustomTargetIndex(HoldableObject):
     def get_all_link_deps(self):
         return self.target.get_all_link_deps()
 
-    def get_link_deps_mapping(self, prefix: str, environment: environment.Environment) -> T.Mapping[str, str]:
-        return self.target.get_link_deps_mapping(prefix, environment)
+    def get_link_deps_mapping(self, prefix: str) -> T.Mapping[str, str]:
+        return self.target.get_link_deps_mapping(prefix)
 
     def get_link_dep_subdirs(self):
         return self.target.get_link_dep_subdirs()