diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2023-09-29 11:02:08 -0700 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2023-10-04 13:59:55 -0400 |
| commit | 922af7dfce1a57de9c56b4e5f6d2221524848822 (patch) | |
| tree | 978c756dc52b6737155d3c245a1f6da6a8916a4b | |
| parent | 00007e197ef7fa2c83fe8dcd4b9084afa5a7bb55 (diff) | |
| download | meson-922af7dfce1a57de9c56b4e5f6d2221524848822.tar.gz | |
interpreter: rename SOURCE_KW to DEPENDENCY_SOURCES_KW
Since that's what this actually is.
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 4 | ||||
| -rw-r--r-- | mesonbuild/interpreter/type_checking.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/gnome.py | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index cd3c5a59b..a65647580 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -89,7 +89,7 @@ from .type_checking import ( REQUIRED_KW, SHARED_LIB_KWS, SHARED_MOD_KWS, - SOURCES_KW, + DEPENDENCY_SOURCES_KW, SOURCES_VARARGS, STATIC_LIB_KWS, VARIABLES_KW, @@ -687,7 +687,7 @@ class Interpreter(InterpreterBase, HoldableObject): INCLUDE_DIRECTORIES, LINK_WITH_KW, LINK_WHOLE_KW.evolve(since='0.46.0'), - SOURCES_KW, + DEPENDENCY_SOURCES_KW, KwargInfo('extra_files', ContainerTypeInfo(list, (mesonlib.File, str)), listify=True, default=[], since='1.2.0'), VARIABLES_KW.evolve(since='0.54.0', since_values={list: '0.56.0'}), KwargInfo('version', (str, NoneType)), diff --git a/mesonbuild/interpreter/type_checking.py b/mesonbuild/interpreter/type_checking.py index 4fb11c497..166cb58e9 100644 --- a/mesonbuild/interpreter/type_checking.py +++ b/mesonbuild/interpreter/type_checking.py @@ -458,7 +458,7 @@ LINK_WHOLE_KW: KwargInfo[T.List[T.Union[BothLibraries, StaticLibrary, CustomTarg validator=link_whole_validator, ) -SOURCES_KW: KwargInfo[T.List[T.Union[str, File, CustomTarget, CustomTargetIndex, GeneratedList]]] = KwargInfo( +DEPENDENCY_SOURCES_KW: KwargInfo[T.List[T.Union[str, File, CustomTarget, CustomTargetIndex, GeneratedList]]] = KwargInfo( 'sources', ContainerTypeInfo(list, (str, File, CustomTarget, CustomTargetIndex, GeneratedList)), listify=True, diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index b0bca1590..d8367ddbe 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -35,7 +35,7 @@ from .. import mlog from ..build import CustomTarget, CustomTargetIndex, Executable, GeneratedList, InvalidArguments from ..dependencies import Dependency, InternalDependency from ..dependencies.pkgconfig import PkgConfigDependency, PkgConfigInterface -from ..interpreter.type_checking import DEPENDS_KW, DEPEND_FILES_KW, ENV_KW, INSTALL_DIR_KW, INSTALL_KW, NoneType, SOURCES_KW, in_set_validator +from ..interpreter.type_checking import DEPENDS_KW, DEPEND_FILES_KW, ENV_KW, INSTALL_DIR_KW, INSTALL_KW, NoneType, DEPENDENCY_SOURCES_KW, in_set_validator from ..interpreterbase import noPosargs, noKwargs, FeatureNew, FeatureDeprecated from ..interpreterbase import typed_kwargs, KwargInfo, ContainerTypeInfo from ..interpreterbase.decorators import typed_pos_args @@ -1593,7 +1593,7 @@ class GnomeModule(ExtensionModule): @typed_kwargs( 'gnome.gdbus_codegen', _BUILD_BY_DEFAULT.evolve(since='0.40.0'), - SOURCES_KW.evolve(since='0.46.0'), + DEPENDENCY_SOURCES_KW.evolve(since='0.46.0'), KwargInfo('extra_args', ContainerTypeInfo(list, str), since='0.47.0', default=[], listify=True), KwargInfo('interface_prefix', (str, NoneType)), KwargInfo('namespace', (str, NoneType)), |