Add support for LocalProgram to add_*_script()

Author: xclaesse

mesonbuild/interpreter/mesonmain.py

@@ -57,21 +57,23 @@ def __init__(self, build: 'build.Build', interpreter: 'Interpreter'):
         self.interpreter = interpreter
 
     def _find_source_script(
-            self, name: str, prog: T.Union[str, mesonlib.File, build.Executable, ExternalProgram],
-            args: T.List[str]) -> 'ExecutableSerialisation':
+            self, name: str, prog: T.Union[str, mesonlib.File, build.Executable, ExternalProgram, build.LocalProgram],
+            args: T.List[str], allow_built_program: bool = False) -> 'ExecutableSerialisation':
         largs: T.List[T.Union[str, build.Executable, ExternalProgram, build.LocalProgram]] = []
 
         if isinstance(prog, (build.Executable, ExternalProgram)):
             FeatureNew.single_use(f'Passing executable/found program object to script parameter of {name}',
                                   '0.55.0', self.subproject, location=self.current_node)
-            largs.append(prog)
-        else:
+        elif isinstance(prog, (str, mesonlib.File)):
             if isinstance(prog, mesonlib.File):
                 FeatureNew.single_use(f'Passing file object to script parameter of {name}',
                                       '0.57.0', self.subproject, location=self.current_node)
-            found = self.interpreter.find_program_impl([prog])
-            largs.append(found)
+            prog = self.interpreter.find_program_impl([prog])
+
+        if isinstance(prog, build.LocalProgram) and not allow_built_program and not prog.run_program():
+            self.interpreter._compiled_exe_error(prog)
 
+        largs.append(prog)
         largs.extend(args)
         es = self.interpreter.backend.get_executable_serialisation(largs, verbose=True)
         es.subproject = self.interpreter.subproject
@@ -116,7 +118,7 @@ def _process_script_args(
 
     @typed_pos_args(
         'meson.add_install_script',
-        (str, mesonlib.File, build.Executable, ExternalProgram),
+        (str, mesonlib.File, build.Executable, ExternalProgram, build.LocalProgram),
         varargs=(str, mesonlib.File, build.BuildTarget, build.CustomTarget, build.CustomTargetIndex, ExternalProgram)
     )
     @typed_kwargs(
@@ -132,7 +134,7 @@ def add_install_script_method(
                           T.List[T.Union[str, mesonlib.File, build.BuildTargetTypes, ExternalProgram]]],
             kwargs: 'AddInstallScriptKW') -> None:
         script_args = self._process_script_args('add_install_script', args[1])
-        script = self._find_source_script('add_install_script', args[0], script_args)
+        script = self._find_source_script('add_install_script', args[0], script_args, allow_built_program=True)
         script.skip_if_destdir = kwargs['skip_if_destdir']
         script.tag = kwargs['install_tag']
         script.dry_run = kwargs['dry_run']
@@ -147,7 +149,7 @@ def add_install_script_method(
     @InterpreterObject.method('add_postconf_script')
     def add_postconf_script_method(
             self,
-            args: T.Tuple[T.Union[str, mesonlib.File, ExternalProgram],
+            args: T.Tuple[T.Union[str, mesonlib.File, ExternalProgram, build.LocalProgram],
                           T.List[T.Union[str, mesonlib.File, ExternalProgram]]],
             kwargs: 'TYPE_kwargs') -> None:
         script_args = self._process_script_args('add_postconf_script', args[1])
@@ -164,7 +166,7 @@ def add_postconf_script_method(
     @InterpreterObject.method('add_dist_script')
     def add_dist_script_method(
             self,
-            args: T.Tuple[T.Union[str, mesonlib.File, ExternalProgram],
+            args: T.Tuple[T.Union[str, mesonlib.File, ExternalProgram, build.LocalProgram],
                           T.List[T.Union[str, mesonlib.File, ExternalProgram]]],
             kwargs: 'TYPE_kwargs') -> None:
         if args[1]: