Merge pull request #8192 from dcbaker/submit/minstall-type-annotations

Add type annotations to minstall (and some related cleanups)

4 files changed, 13 insertions, 13 deletions

diff --git a/mesonbuild/modules/cmake.py b/mesonbuild/modules/cmake.py
index f6afaf3..ef53d9f 100644
--- a/mesonbuild/modules/cmake.py
+++ b/mesonbuild/modules/cmake.py
@@ -285,7 +285,7 @@ class CmakeModule(ExtensionModule):
         }
         mesonlib.do_conf_file(template_file, version_file, conf, 'meson')
 
-        res = build.Data(mesonlib.File(True, state.environment.get_scratch_dir(), version_file), pkgroot)
+        res = build.Data([mesonlib.File(True, state.environment.get_scratch_dir(), version_file)], pkgroot)
         return ModuleReturnValue(res, [res])
 
     def create_package_file(self, infile, outfile, PACKAGE_RELATIVE_PATH, extra, confdata):
@@ -370,7 +370,7 @@ class CmakeModule(ExtensionModule):
         if conffile not in interpreter.build_def_files:
             interpreter.build_def_files.append(conffile)
 
-        res = build.Data(mesonlib.File(True, ofile_path, ofile_fname), install_dir)
+        res = build.Data([mesonlib.File(True, ofile_path, ofile_fname)], install_dir)
         interpreter.build.data.append(res)
 
         return res
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index 21570bd..5cad9f5 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -1629,7 +1629,7 @@ G_END_DECLS'''
         with open(fname, 'w') as ofile:
             for package in packages:
                 ofile.write(package + '\n')
-        return build.Data(mesonlib.File(True, outdir, fname), install_dir)
+        return build.Data([mesonlib.File(True, outdir, fname)], install_dir)
 
     def _get_vapi_link_with(self, target):
         link_with = []
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py
index 7d347a6..db589a3 100644
--- a/mesonbuild/modules/pkgconfig.py
+++ b/mesonbuild/modules/pkgconfig.py
@@ -539,7 +539,7 @@ class PkgConfigModule(ExtensionModule):
         self.generate_pkgconfig_file(state, deps, subdirs, name, description, url,
                                      version, pcfile, conflicts, variables,
                                      False, dataonly)
-        res = build.Data(mesonlib.File(True, state.environment.get_scratch_dir(), pcfile), pkgroot)
+        res = build.Data([mesonlib.File(True, state.environment.get_scratch_dir(), pcfile)], pkgroot)
         variables = self.interpreter.extract_variables(kwargs, argname='uninstalled_variables', dict_new=True)
         variables = parse_variable_list(variables)
 
diff --git a/mesonbuild/modules/unstable_external_project.py b/mesonbuild/modules/unstable_external_project.py
index 809b590..1604e25 100644
--- a/mesonbuild/modules/unstable_external_project.py
+++ b/mesonbuild/modules/unstable_external_project.py
@@ -22,7 +22,7 @@ from ..mesonlib import (MesonException, Popen_safe, MachineChoice,
                        get_variable_regex, do_replacement)
 from ..interpreterbase import InterpreterObject, InterpreterException, FeatureNew
 from ..interpreterbase import stringArgs, permittedKwargs
-from ..interpreter import Interpreter, DependencyHolder, InstallDir
+from ..interpreter import Interpreter, DependencyHolder, InstallDirHolder
 from ..compilers.compilers import CFLAGS_MAPPING, CEXE_MAPPING
 from ..dependencies.base import InternalDependency, PkgConfigDependency
 from ..environment import Environment
@@ -192,15 +192,15 @@ class ExternalProject(InterpreterObject):
                                          self.subproject,
                                          target_kwargs)
 
-        idir = InstallDir(self.subdir.as_posix(),
-                          Path('dist', self.rel_prefix).as_posix(),
-                          install_dir='.',
-                          install_mode=None,
-                          exclude=None,
-                          strip_directory=True,
-                          from_source_dir=False)
+        idir = build.InstallDir(self.subdir.as_posix(),
+                                Path('dist', self.rel_prefix).as_posix(),
+                                install_dir='.',
+                                install_mode=None,
+                                exclude=None,
+                                strip_directory=True,
+                                from_source_dir=False)
 
-        return [self.target, idir]
+        return [self.target, InstallDirHolder(idir)]
 
     @stringArgs
     @permittedKwargs({'subdir'})