diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2022-01-28 11:54:10 -0800 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2022-03-01 15:17:59 -0500 |
| commit | 272308ff055f73828ac3d0d76d20d6c0b83aeb75 (patch) | |
| tree | 49a81245208b86314b62c8ab14330806ca3c4f45 /mesonbuild/interpreter/interpreter.py | |
| parent | f03c712d17213535f96f2ddece1253ea9abbdf6a (diff) | |
| download | meson-272308ff055f73828ac3d0d76d20d6c0b83aeb75.zip meson-272308ff055f73828ac3d0d76d20d6c0b83aeb75.tar.gz meson-272308ff055f73828ac3d0d76d20d6c0b83aeb75.tar.bz2 | |
interpreter: use a shared KwargInfo for install_tag
The kind that takes a single argument, not the custom_target version
that takes an array
Diffstat (limited to 'mesonbuild/interpreter/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 88b6bfb..4f1b0ed 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -68,6 +68,7 @@ from .type_checking import ( INSTALL_KW, INSTALL_MODE_KW, CT_INSTALL_TAG_KW, + INSTALL_TAG_KW, LANGUAGE_KW, NATIVE_KW, OVERRIDE_OPTIONS_KW, REQUIRED_KW, @@ -2061,7 +2062,7 @@ external dependencies (including libraries) must go to "dependencies".''') 'install_symlink', KwargInfo('pointing_to', str, required=True), KwargInfo('install_dir', str, required=True), - KwargInfo('install_tag', (str, NoneType)), + INSTALL_TAG_KW, ) def func_install_symlink(self, node: mparser.BaseNode, args: T.Tuple[T.List[str]], @@ -2159,7 +2160,7 @@ external dependencies (including libraries) must go to "dependencies".''') KwargInfo('sources', ContainerTypeInfo(list, (str, mesonlib.File)), listify=True, default=[]), KwargInfo('rename', ContainerTypeInfo(list, str), default=[], listify=True, since='0.46.0'), INSTALL_MODE_KW.evolve(since='0.38.0'), - KwargInfo('install_tag', (str, NoneType), since='0.60.0'), + INSTALL_TAG_KW.evolve(since='0.60.0'), ) def func_install_data(self, node: mparser.BaseNode, args: T.Tuple[T.List['mesonlib.FileOrString']], @@ -2197,7 +2198,6 @@ external dependencies (including libraries) must go to "dependencies".''') @typed_kwargs( 'install_subdir', KwargInfo('install_dir', str, required=True), - KwargInfo('install_tag', (str, NoneType), since='0.60.0'), KwargInfo('strip_directory', bool, default=False), KwargInfo('exclude_files', ContainerTypeInfo(list, str), default=[], listify=True, since='0.42.0', @@ -2206,6 +2206,7 @@ external dependencies (including libraries) must go to "dependencies".''') default=[], listify=True, since='0.42.0', validator=lambda x: 'cannot be absolute' if any(os.path.isabs(d) for d in x) else None), INSTALL_MODE_KW.evolve(since='0.38.0'), + INSTALL_TAG_KW.evolve(since='0.60.0'), ) def func_install_subdir(self, node: mparser.BaseNode, args: T.Tuple[str], kwargs: 'kwargs.FuncInstallSubdir') -> build.InstallDir: |