From df29f760dd1c8e22ae431ba01b07faf55bf1ff60 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 19 Oct 2020 07:04:39 -0400 Subject: [PATCH] switch gui_app deprecation to FeatureDeprecatedKwargs The deprecation message for "gui_app" is appearing for every target rather than just once, and even if the required version is older than 0.56.0. Use @FeatureDeprecatedKwargs to fix both issues. --- mesonbuild/build.py | 1 - mesonbuild/interpreter.py | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 472363616..78292f20a 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -929,7 +929,6 @@ This will become a hard error in a future Meson release.''') # was not specified and win_subsystem should be used instead. self.gui_app = None if 'gui_app' in kwargs: - mlog.deprecation('The gui_app kwarg is deprecated, use win_subsystem instead.') if 'win_subsystem' in kwargs: raise InvalidArguments('Can specify only gui_app or win_subsystem for a target, not both.') self.gui_app = kwargs['gui_app'] diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 0dc38f393..c67341aee 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -3874,6 +3874,7 @@ external dependencies (including libraries) must go to "dependencies".''') @FeatureNewKwargs('executable', '0.42.0', ['implib']) @permittedKwargs(permitted_kwargs['executable']) + @FeatureDeprecatedKwargs('executable', '0.56.0', ['gui_app'], extra_message="Use 'win_subsystem' instead.") def func_executable(self, node, args, kwargs): return self.build_target(node, args, kwargs, ExecutableHolder)