Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

interpreter: use typed_kwargs for build_target.build_by_default 

This allows a little bit of cleanup in the build layer, since there is
code now that would always be true and we shouldn't do that.
This commit is contained in:
Dylan Baker 2023-09-29 12:14:48 -07:00
parent bd0ab92bba
commit 507d8bf4d7
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mesonbuild/build.py
View File

@ -652,7 +652,8 @@ class Target(HoldableObject, metaclass=abc.ABCMeta):
self.build_by_default = kwargs['build_by_default'] self.build_by_default = kwargs['build_by_default']
if not isinstance(self.build_by_default, bool): if not isinstance(self.build_by_default, bool):
raise InvalidArguments('build_by_default must be a boolean value.') raise InvalidArguments('build_by_default must be a boolean value.')
elif kwargs.get('install', False):
if not self.build_by_default and kwargs.get('install', False):
# For backward compatibility, if build_by_default is not explicitly # For backward compatibility, if build_by_default is not explicitly
# set, use the value of 'install' if it's enabled. # set, use the value of 'install' if it's enabled.
self.build_by_default = True self.build_by_default = True

1
mesonbuild/interpreter/interpreter.py
View File

@ -3314,7 +3314,6 @@ class Interpreter(InterpreterBase, HoldableObject):
targetclass: T.Type[T.Union[build.Executable, build.StaticLibrary, build.SharedModule, build.SharedLibrary, build.Jar]] targetclass: T.Type[T.Union[build.Executable, build.StaticLibrary, build.SharedModule, build.SharedLibrary, build.Jar]]
) -> T.Union[build.Executable, build.StaticLibrary, build.SharedModule, build.SharedLibrary, build.Jar]: ) -> T.Union[build.Executable, build.StaticLibrary, build.SharedModule, build.SharedLibrary, build.Jar]:
@FeatureNewKwargs('build target', '0.42.0', ['build_rpath', 'implicit_include_directories']) @FeatureNewKwargs('build target', '0.42.0', ['build_rpath', 'implicit_include_directories'])
@FeatureNewKwargs('build target', '0.38.0', ['build_by_default'])
@FeatureNewKwargs('build target', '0.48.0', ['gnu_symbol_visibility']) @FeatureNewKwargs('build target', '0.48.0', ['gnu_symbol_visibility'])
def build_target_decorator_caller(self, node, args, kwargs): def build_target_decorator_caller(self, node, args, kwargs):
return True return True

1
mesonbuild/interpreter/kwargs.py
View File

@ -325,6 +325,7 @@ class _BaseBuildTarget(TypedDict):
BuildTarget functions. BuildTarget functions.
""" """
build_by_default: bool
override_options: T.Dict[OptionKey, T.Union[str, int, bool, T.List[str]]] override_options: T.Dict[OptionKey, T.Union[str, int, bool, T.List[str]]]
depend_files: NotRequired[T.List[File]] depend_files: NotRequired[T.List[File]]

1
mesonbuild/interpreter/type_checking.py
View File

@ -552,6 +552,7 @@ _JAVA_LANG_KW: KwargInfo[T.List[str]] = _BASE_LANG_KW.evolve(
# Applies to all build_target like classes # Applies to all build_target like classes
_ALL_TARGET_KWS: T.List[KwargInfo] = [ _ALL_TARGET_KWS: T.List[KwargInfo] = [
OVERRIDE_OPTIONS_KW, OVERRIDE_OPTIONS_KW,
KwargInfo('build_by_default', bool, default=True, since='0.38.0'),
] ]
# Applies to all build_target classes except jar # Applies to all build_target classes except jar