diff options
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 6 | ||||
| -rw-r--r-- | mesonbuild/interpreter/type_checking.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/i18n.py | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 8411285..05614aa 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -57,7 +57,7 @@ from .type_checking import ( CT_BUILD_BY_DEFAULT, CT_INPUT_KW, CT_INSTALL_DIR_KW, - CT_OUTPUT_KW, + MULTI_OUTPUT_KW, OUTPUT_KW, DEFAULT_OPTIONS, DEPENDS_KW, @@ -1761,7 +1761,7 @@ class Interpreter(InterpreterBase, HoldableObject): @typed_kwargs( 'vcs_tag', CT_INPUT_KW.evolve(required=True), - CT_OUTPUT_KW, + MULTI_OUTPUT_KW, # Cannot use the COMMAND_KW because command is allowed to be empty KwargInfo( 'command', @@ -1851,7 +1851,7 @@ class Interpreter(InterpreterBase, HoldableObject): CT_INPUT_KW, CT_INSTALL_DIR_KW, CT_INSTALL_TAG_KW, - CT_OUTPUT_KW, + MULTI_OUTPUT_KW, DEPENDS_KW, DEPEND_FILES_KW, DEPFILE_KW, diff --git a/mesonbuild/interpreter/type_checking.py b/mesonbuild/interpreter/type_checking.py index e83624c..5075f85 100644 --- a/mesonbuild/interpreter/type_checking.py +++ b/mesonbuild/interpreter/type_checking.py @@ -268,7 +268,7 @@ def _output_validator(outputs: T.List[str]) -> T.Optional[str]: return None -CT_OUTPUT_KW: KwargInfo[T.List[str]] = KwargInfo( +MULTI_OUTPUT_KW: KwargInfo[T.List[str]] = KwargInfo( 'output', ContainerTypeInfo(list, str, allow_empty=False), listify=True, diff --git a/mesonbuild/modules/i18n.py b/mesonbuild/modules/i18n.py index 3052f73..4ea5772 100644 --- a/mesonbuild/modules/i18n.py +++ b/mesonbuild/modules/i18n.py @@ -20,7 +20,7 @@ from . import ExtensionModule, ModuleReturnValue from .. import build from .. import mesonlib from .. import mlog -from ..interpreter.type_checking import CT_BUILD_BY_DEFAULT, CT_INPUT_KW, CT_INSTALL_DIR_KW, CT_INSTALL_TAG_KW, CT_OUTPUT_KW, INSTALL_KW, NoneType, in_set_validator +from ..interpreter.type_checking import CT_BUILD_BY_DEFAULT, CT_INPUT_KW, CT_INSTALL_DIR_KW, CT_INSTALL_TAG_KW, MULTI_OUTPUT_KW, INSTALL_KW, NoneType, in_set_validator from ..interpreterbase import FeatureNew from ..interpreterbase.decorators import ContainerTypeInfo, KwargInfo, noPosargs, typed_kwargs, typed_pos_args from ..scripts.gettext import read_linguas @@ -154,7 +154,7 @@ class I18nModule(ExtensionModule): CT_INPUT_KW, CT_INSTALL_DIR_KW, CT_INSTALL_TAG_KW, - CT_OUTPUT_KW, + MULTI_OUTPUT_KW, INSTALL_KW, _ARGS.evolve(since='0.51.0'), _DATA_DIRS.evolve(since='0.41.0'), @@ -323,7 +323,7 @@ class I18nModule(ExtensionModule): CT_INPUT_KW, CT_INSTALL_DIR_KW, CT_INSTALL_TAG_KW, - CT_OUTPUT_KW, + MULTI_OUTPUT_KW, INSTALL_KW, _ARGS.evolve(), KwargInfo('its_files', ContainerTypeInfo(list, str)), |