interpreter: use typed_kwargs for "sources" keyword argument of build…

… targets

mesonbuild/interpreter/interpreter.py

@@ -3265,8 +3265,8 @@ def build_target_decorator_caller(self, node, args, kwargs):
             # Silently force to native because that's the only sensible value
             # and rust_crate_type is deprecated any way.
             for_machine = MachineChoice.BUILD
-        if 'sources' in kwargs:
-            sources += listify(kwargs['sources'])
+        # Avoid mutating, since there could be other references to sources
+        sources = sources + kwargs['sources']
         if any(isinstance(s, build.BuildTarget) for s in sources):
             FeatureBroken.single_use('passing references to built targets as a source file', '1.1.0', self.subproject,
                                      'Consider using `link_with` or `link_whole` if you meant to link, or dropping them as otherwise they are ignored.',

mesonbuild/interpreter/kwargs.py

@@ -16,7 +16,7 @@
 from ..mesonlib import EnvironmentVariables, MachineChoice, File, FileMode, FileOrString, OptionKey
 from ..modules.cmake import CMakeSubprojectOptions
 from ..programs import ExternalProgram
-from .type_checking import PkgConfigDefineType
+from .type_checking import PkgConfigDefineType, SourcesVarargsType
 
 class FuncAddProjectArgs(TypedDict):
 
@@ -332,6 +332,7 @@ class _BuildTarget(_BaseBuildTarget):
     """Arguments shared by non-JAR functions"""
 
     rust_dependency_map: T.Dict[str, str]
+    sources: SourcesVarargsType
 
 
 class _LibraryMixin(TypedDict):
@@ -390,6 +391,7 @@ class Jar(_BaseBuildTarget):
 
     main_class: str
     java_resources: T.Optional[build.StructuredSources]
+    sources: T.Union[str, File, build.CustomTarget, build.CustomTargetIndex, build.GeneratedList, build.ExtractedObjects, build.BuildTarget]
 
 
 class FuncDeclareDependency(TypedDict):

mesonbuild/interpreter/type_checking.py

@@ -467,6 +467,13 @@ def link_whole_validator(values: T.List[T.Union[StaticLibrary, CustomTarget, Cus
 
 SOURCES_VARARGS = (str, File, CustomTarget, CustomTargetIndex, GeneratedList, StructuredSources, ExtractedObjects, BuildTarget)
 
+BT_SOURCES_KW: KwargInfo[SourcesVarargsType] = KwargInfo(
+    'sources',
+    ContainerTypeInfo(list, SOURCES_VARARGS),
+    listify=True,
+    default=[],
+)
+
 VARIABLES_KW: KwargInfo[T.Dict[str, str]] = KwargInfo(
     'variables',
     # str is listified by validator/convertor, cannot use listify=True here because
@@ -527,6 +534,7 @@ def link_whole_validator(values: T.List[T.Union[StaticLibrary, CustomTarget, Cus
 # Applies to all build_target classes except jar
 _BUILD_TARGET_KWS: T.List[KwargInfo] = [
     *_ALL_TARGET_KWS,
+    BT_SOURCES_KW,
     RUST_CRATE_TYPE_KW,
     KwargInfo(
         'rust_dependency_map',
@@ -665,6 +673,12 @@ def _convert_darwin_versions(val: T.List[T.Union[str, int]]) -> T.Optional[T.Tup
 JAR_KWS = [
     *_ALL_TARGET_KWS,
     *_EXCLUSIVE_JAR_KWS,
+    KwargInfo(
+        'sources',
+        ContainerTypeInfo(list, (str, File, CustomTarget, CustomTargetIndex, GeneratedList, ExtractedObjects, BuildTarget)),
+        listify=True,
+        default=[],
+    )
 ]
 
 # Arguments used by both_library and library