diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2023-07-19 13:28:51 -0700 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2023-07-20 14:20:46 -0400 |
| commit | 096869ad63157f666773bd93bd14bdd6bd0602aa (patch) | |
| tree | 2ad9c4a27d20d1052904f702e9079c177f48842f | |
| parent | 01b5581a100bbb5c608cd054dfccbec721285be9 (diff) | |
| download | meson-096869ad63157f666773bd93bd14bdd6bd0602aa.zip meson-096869ad63157f666773bd93bd14bdd6bd0602aa.tar.gz meson-096869ad63157f666773bd93bd14bdd6bd0602aa.tar.bz2 | |
interpreter: use typed_kwargs for jar(java_resources)
With the added bonus of adding the correct `since` checking values!
| -rw-r--r-- | mesonbuild/interpreter/kwargs.py | 1 | ||||
| -rw-r--r-- | mesonbuild/interpreter/type_checking.py | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/interpreter/kwargs.py b/mesonbuild/interpreter/kwargs.py index 95bf9bc..4254c30 100644 --- a/mesonbuild/interpreter/kwargs.py +++ b/mesonbuild/interpreter/kwargs.py @@ -354,3 +354,4 @@ class BuildTarget(Library): class Jar(_BaseBuildTarget): main_class: str + java_resources: T.Optional[build.StructuredSources] diff --git a/mesonbuild/interpreter/type_checking.py b/mesonbuild/interpreter/type_checking.py index cc1f944..38e4257 100644 --- a/mesonbuild/interpreter/type_checking.py +++ b/mesonbuild/interpreter/type_checking.py @@ -10,7 +10,7 @@ import typing as T from .. import compilers from ..build import (CustomTarget, BuildTarget, CustomTargetIndex, ExtractedObjects, GeneratedList, IncludeDirs, - BothLibraries, SharedLibrary, StaticLibrary, Jar, Executable) + BothLibraries, SharedLibrary, StaticLibrary, Jar, Executable, StructuredSources) from ..coredata import UserFeatureOption from ..dependencies import Dependency, InternalDependency from ..interpreterbase.decorators import KwargInfo, ContainerTypeInfo @@ -534,6 +534,7 @@ SHARED_MOD_KWS = [ # them into build_target easier _EXCLUSIVE_JAR_KWS: T.List[KwargInfo] = [ KwargInfo('main_class', str, default=''), + KwargInfo('java_resources', (StructuredSources, NoneType), since='0.62.0'), ] # The total list of arguments used by JAR |