aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2021-08-10 16:02:19 -0700
committerDaniel Mensinger <daniel@mensinger-ka.de>2021-09-30 21:01:38 +0200
commita3e63a4269e6deb6653e1ba5e397a5a2322dfd88 (patch)
treec0de68b2fcafce6679c59e239e64c05b119055c4
parent16986f1853673776f76ff97acb5d8b5b9f02a788 (diff)
downloadmeson-a3e63a4269e6deb6653e1ba5e397a5a2322dfd88.zip
meson-a3e63a4269e6deb6653e1ba5e397a5a2322dfd88.tar.gz
meson-a3e63a4269e6deb6653e1ba5e397a5a2322dfd88.tar.bz2
interpreter: move KwargInfo('depends') to type_checking
-rw-r--r--mesonbuild/interpreter/interpreter.py8
-rw-r--r--mesonbuild/interpreter/type_checking.py9
2 files changed, 10 insertions, 7 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py
index 37c9c1d..68e5430 100644
--- a/mesonbuild/interpreter/interpreter.py
+++ b/mesonbuild/interpreter/interpreter.py
@@ -50,6 +50,7 @@ from .interpreterobjects import (
NullSubprojectInterpreter,
)
from .type_checking import (
+ DEPENDS_KW,
DEPFILE_KW,
ENV_KW,
INSTALL_MODE_KW,
@@ -1676,12 +1677,7 @@ This will become a hard error in the future.''' % kwargs['input'], location=self
listify=True,
default=[],
),
- KwargInfo(
- 'depends',
- ContainerTypeInfo(list, (build.BuildTarget, build.CustomTarget)),
- listify=True,
- default=[],
- ),
+ DEPENDS_KW,
ENV_KW.evolve(since='0.57.0'),
)
def func_run_target(self, node: mparser.FunctionNode, args: T.Tuple[str],
diff --git a/mesonbuild/interpreter/type_checking.py b/mesonbuild/interpreter/type_checking.py
index d855954..db346af 100644
--- a/mesonbuild/interpreter/type_checking.py
+++ b/mesonbuild/interpreter/type_checking.py
@@ -6,7 +6,7 @@
import typing as T
from .. import compilers
-from ..build import EnvironmentVariables
+from ..build import EnvironmentVariables, CustomTarget, BuildTarget
from ..coredata import UserFeatureOption
from ..interpreterbase import TYPE_var
from ..interpreterbase.decorators import KwargInfo, ContainerTypeInfo
@@ -183,3 +183,10 @@ DEPFILE_KW: KwargInfo[T.Optional[str]] = KwargInfo(
(str, type(None)),
validator=lambda x: 'Depfile must be a plain filename with a subdirectory' if has_path_sep(x) else None
)
+
+DEPENDS_KW: KwargInfo[T.List[T.Union[BuildTarget, CustomTarget]]] = KwargInfo(
+ 'depends',
+ ContainerTypeInfo(list, (BuildTarget, CustomTarget)),
+ listify=True,
+ default=[],
+)