aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2022-01-26 19:51:13 -0500
committerDylan Baker <dylan@pnwbakers.com>2022-01-27 13:01:48 -0800
commit7e0004d8cf895237f4fb0ccc725fcbc2eccff966 (patch)
treed40c399dd865a2adf266459e23ffab61cc892887
parentff7a30c0eac523dec93ab8981da56914f08a8b72 (diff)
downloadmeson-7e0004d8cf895237f4fb0ccc725fcbc2eccff966.zip
meson-7e0004d8cf895237f4fb0ccc725fcbc2eccff966.tar.gz
meson-7e0004d8cf895237f4fb0ccc725fcbc2eccff966.tar.bz2
move the version info for build_always* directly into the kwarginfo
Rather than pointlessly evolving it in the exactly one place which it is used. It's not clear what the purpose for this was.
-rw-r--r--mesonbuild/interpreter/interpreter.py4
-rw-r--r--mesonbuild/interpreter/type_checking.py9
2 files changed, 9 insertions, 4 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py
index 0366cd1..20e1902 100644
--- a/mesonbuild/interpreter/interpreter.py
+++ b/mesonbuild/interpreter/interpreter.py
@@ -1715,8 +1715,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_ALWAYS,
+ CT_BUILD_ALWAYS_STALE,
CT_BUILD_BY_DEFAULT,
CT_INPUT_KW,
CT_INSTALL_DIR_KW,
diff --git a/mesonbuild/interpreter/type_checking.py b/mesonbuild/interpreter/type_checking.py
index 9ba61f9..897315d 100644
--- a/mesonbuild/interpreter/type_checking.py
+++ b/mesonbuild/interpreter/type_checking.py
@@ -282,10 +282,15 @@ 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: KwargInfo[T.Optional[bool]] = KwargInfo(
+ 'build_always', (bool, NoneType),
+ deprecated='0.47.0',
+)
CT_BUILD_ALWAYS_STALE: KwargInfo[T.Optional[bool]] = KwargInfo(
- 'build_always_stale', (bool, NoneType))
+ 'build_always_stale', (bool, NoneType),
+ since='0.47.0',
+)
INCLUDE_DIRECTORIES: KwargInfo[T.List[T.Union[str, IncludeDirs]]] = KwargInfo(
'include_dirs',