diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2021-11-18 10:32:05 -0800 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2021-12-07 16:12:23 -0500 |
| commit | f49c9c67fdc372dd6dc6c44db2c89b199caeba21 (patch) | |
| tree | 32e31776bad27bad1bcdfc765d0d099cccacee96 | |
| parent | bc8c938148a55910dd1bd454fc3c5e8ab7477baa (diff) | |
| download | meson-f49c9c67fdc372dd6dc6c44db2c89b199caeba21.zip meson-f49c9c67fdc372dd6dc6c44db2c89b199caeba21.tar.gz meson-f49c9c67fdc372dd6dc6c44db2c89b199caeba21.tar.bz2 | |
interpreter: move more custom_target keyword arguments to the type_checking module
These are going to be used in the gnome module.
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 6 | ||||
| -rw-r--r-- | mesonbuild/interpreter/type_checking.py | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 2a68aa0..8b8297c 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -51,7 +51,7 @@ from .interpreterobjects import ( NullSubprojectInterpreter, ) from .type_checking import ( - COMMAND_KW, + COMMAND_KW, CT_BUILD_ALWAYS, CT_BUILD_ALWAYS_STALE, CT_BUILD_BY_DEFAULT, CT_INPUT_KW, CT_INSTALL_DIR_KW, @@ -1706,6 +1706,8 @@ external dependencies (including libraries) must go to "dependencies".''') @typed_kwargs( 'custom_target', COMMAND_KW, + CT_BUILD_ALWAYS.evolve(deprecated='0.47.0'), + CT_BUILD_ALWAYS_STALE.evolve(since='0.47.0'), CT_BUILD_BY_DEFAULT, CT_INPUT_KW, CT_INSTALL_DIR_KW, @@ -1718,8 +1720,6 @@ external dependencies (including libraries) must go to "dependencies".''') INSTALL_KW, INSTALL_MODE_KW.evolve(since='0.47.0'), OVERRIDE_OPTIONS_KW, - KwargInfo('build_always', (bool, type(None)), deprecated='0.47.0'), - KwargInfo('build_always_stale', (bool, type(None)), since='0.47.0'), KwargInfo('feed', bool, default=False, since='0.59.0'), KwargInfo('capture', bool, default=False), KwargInfo('console', bool, default=False, since='0.48.0'), diff --git a/mesonbuild/interpreter/type_checking.py b/mesonbuild/interpreter/type_checking.py index 5391e9f..00532ef 100644 --- a/mesonbuild/interpreter/type_checking.py +++ b/mesonbuild/interpreter/type_checking.py @@ -281,6 +281,11 @@ CT_INSTALL_DIR_KW: KwargInfo[T.List[T.Union[str, bool]]] = KwargInfo( CT_BUILD_BY_DEFAULT: KwargInfo[T.Optional[bool]] = KwargInfo('build_by_default', (bool, type(None)), since='0.40.0') +CT_BUILD_ALWAYS: KwargInfo[T.Optional[bool]] = KwargInfo('build_always', (bool, NoneType)) + +CT_BUILD_ALWAYS_STALE: KwargInfo[T.Optional[bool]] = KwargInfo( + 'build_always_stale', (bool, NoneType)) + INCLUDE_DIRECTORIES: KwargInfo[T.List[T.Union[str, IncludeDirs]]] = KwargInfo( 'include_dirs', ContainerTypeInfo(list, (str, IncludeDirs)), |