diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2022-05-26 13:15:13 -0700 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2022-06-01 22:49:10 -0400 |
| commit | 618b187f70f9267eaf5112373aa9925b38f44da0 (patch) | |
| tree | b459b5015e7f9f3fe4ff499fb9bd9b530aa50700 /mesonbuild/interpreter/interpreter.py | |
| parent | 50e9769403a8e3f7c281aff1ff8f9cad7bfe2276 (diff) | |
| download | meson-618b187f70f9267eaf5112373aa9925b38f44da0.zip meson-618b187f70f9267eaf5112373aa9925b38f44da0.tar.gz meson-618b187f70f9267eaf5112373aa9925b38f44da0.tar.bz2 | |
interpreter: use a shared KwargInfo for install_dir
CustomTarget allows multiple install dirs, while basically everything
else allows only one. So this provides a shared instance for that.
Diffstat (limited to 'mesonbuild/interpreter/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 6e25b9b..11eb816 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -68,6 +68,7 @@ from .type_checking import ( ENV_METHOD_KW, ENV_SEPARATOR_KW, INSTALL_KW, + INSTALL_DIR_KW, INSTALL_MODE_KW, CT_INSTALL_TAG_KW, INSTALL_TAG_KW, @@ -2093,10 +2094,10 @@ class Interpreter(InterpreterBase, HoldableObject): @typed_pos_args('install_headers', varargs=(str, mesonlib.File)) @typed_kwargs( 'install_headers', - KwargInfo('install_dir', (str, NoneType)), KwargInfo('preserve_path', bool, default=False, since='0.63.0'), KwargInfo('subdir', (str, NoneType)), INSTALL_MODE_KW.evolve(since='0.47.0'), + INSTALL_DIR_KW, ) def func_install_headers(self, node: mparser.BaseNode, args: T.Tuple[T.List['mesonlib.FileOrString']], @@ -2131,9 +2132,9 @@ class Interpreter(InterpreterBase, HoldableObject): @typed_pos_args('install_man', varargs=(str, mesonlib.File)) @typed_kwargs( 'install_man', - KwargInfo('install_dir', (str, NoneType)), KwargInfo('locale', (str, NoneType), since='0.58.0'), - INSTALL_MODE_KW.evolve(since='0.47.0') + INSTALL_MODE_KW.evolve(since='0.47.0'), + INSTALL_DIR_KW, ) def func_install_man(self, node: mparser.BaseNode, args: T.Tuple[T.List['mesonlib.FileOrString']], @@ -2296,11 +2297,11 @@ class Interpreter(InterpreterBase, HoldableObject): @typed_pos_args('install_data', varargs=(str, mesonlib.File)) @typed_kwargs( 'install_data', - KwargInfo('install_dir', (str, NoneType)), 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'), INSTALL_TAG_KW.evolve(since='0.60.0'), + INSTALL_DIR_KW, ) def func_install_data(self, node: mparser.BaseNode, args: T.Tuple[T.List['mesonlib.FileOrString']], |