local_program: Allow passing arguments to interpreter

Author: xclaesse

docs/yaml/functions/local_program.yaml

@@ -36,8 +36,10 @@ kwargs:
       after those targets have been built.
 
   interpreter:
-    type: external_program
+    type: external_program | array[external_program | str]
     description: |
       When the program is a [[@custom_tgt]], Meson cannot derive the interpreter
       from the file's "shebang" (`#!`) line before it's built. If needed, this
       argument allows specifying an interpreter for the script.
+      If arguments are needed for the interpreter, an array can be passed where
+      the first element is the interpreter program and the rest are strings.

mesonbuild/interpreter/interpreter.py

@@ -1801,7 +1801,7 @@ def func_find_program(self, node: mparser.BaseNode, args: T.Tuple[T.List[mesonli
         'local_program',
         DEPENDS_KW,
         DEPEND_FILES_KW,
-        KwargInfo('interpreter', (ExternalProgram, NoneType), default=None),
+        KwargInfo('interpreter', (NoneType, ExternalProgram, ContainerTypeInfo(list, (ExternalProgram, str))), default=None),
     )
     def func_local_program(self, node: mparser.BaseNode, args: T.Tuple[T.Union[mesonlib.FileOrString, build.Executable, build.CustomTarget, build.CustomTargetIndex]],
                            kwargs: kwtypes.LocalProgram) -> build.LocalProgram:
@@ -1810,7 +1810,7 @@ def func_local_program(self, node: mparser.BaseNode, args: T.Tuple[T.Union[meson
     def _local_program_impl(self, exe: T.Union[mesonlib.FileOrString, build.Executable, build.CustomTarget, build.CustomTargetIndex],
                             depends_: T.Optional[T.List[T.Union[build.BuildTarget, build.CustomTarget, build.CustomTargetIndex]]] = None,
                             depend_files_: T.Optional[T.List[mesonlib.FileOrString]] = None,
-                            interpreter: T.Optional[ExternalProgram] = None) -> build.LocalProgram:
+                            interpreter: T.Optional[T.Union[ExternalProgram, T.List[ExternalProgram, str]]] = None) -> build.LocalProgram:
         if isinstance(exe, build.CustomTarget):
             if len(exe.outputs) != 1:
                 raise InvalidArguments('CustomTarget used as LocalProgram must have exactly one output.')
@@ -1824,11 +1824,17 @@ def _local_program_impl(self, exe: T.Union[mesonlib.FileOrString, build.Executab
         if interpreter:
             if not isinstance(exe, (build.CustomTarget, build.CustomTargetIndex)):
                 raise InvalidArguments('The "interpreter" argument can only be used when the first argument is a custom target.')
+            if isinstance(interpreter, list):
+                interpreter, args = interpreter[0], interpreter[1:]
+                if not isinstance(interpreter, ExternalProgram) or any(not isinstance(a, str) for a in args):
+                    raise InvalidArguments('Interpreter must be an ExternalProgram followed by strings.')
+            else:
+                args = []
             if not interpreter.found():
                 raise InvalidArguments(f'Specified interpreter program {interpreter.description()!r} not found.')
             target = exe.target if isinstance(exe, build.CustomTargetIndex) else exe
             depends.append(target)
-            cmd = interpreter.get_command() + [self.backend.get_target_filename(exe)]
+            cmd = interpreter.get_command() + args + [self.backend.get_target_filename(exe)]
             prog = ExternalProgram(exe.name, command=cmd, silent=True)
             return build.LocalProgram(prog, self.project_version, depends, depend_files)
         return build.LocalProgram(exe, self.project_version, depends, depend_files)

test cases/common/285 local program/meson.build

@@ -63,3 +63,6 @@ assert(prog5.found())
 if host_machine.system() != 'windows'
   test('test-prog5', prog5)
 endif
+
+prog6 = local_program(prog_ct, interpreter: [python3, '-B'])
+test('test-prog6', prog6)