From ecede89b5d3b804fafcec0bab68fec1cfab519aa Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Sat, 11 Aug 2018 17:25:33 +0530 Subject: Fix FeatureNew false positive in vcs_tag Fixes https://github.com/mesonbuild/meson/issues/3904 --- mesonbuild/interpreter.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'mesonbuild/interpreter.py') diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index fd0385d..50d6148 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -3098,7 +3098,7 @@ root and issuing %s. regex_selector] + vcs_cmd kwargs.setdefault('build_by_default', True) kwargs.setdefault('build_always_stale', True) - return self.func_custom_target(node, [kwargs['output']], kwargs) + return self._func_custom_target_impl(node, [kwargs['output']], kwargs) @FeatureNew('subdir_done', '0.46.0') @stringArgs @@ -3119,6 +3119,10 @@ root and issuing %s. raise InterpreterException('custom_target: Only one positional argument is allowed, and it must be a string name') if 'depfile' in kwargs and ('@BASENAME@' in kwargs['depfile'] or '@PLAINNAME@' in kwargs['depfile']): FeatureNew('substitutions in custom_target depfile', '0.47.0').use(self.subproject) + return self._func_custom_target_impl(node, args, kwargs) + + def _func_custom_target_impl(self, node, args, kwargs): + 'Implementation-only, without FeatureNew checks, for internal use' name = args[0] kwargs['install_mode'] = self._get_kwarg_install_mode(kwargs) tg = CustomTargetHolder(build.CustomTarget(name, self.subdir, self.subproject, kwargs), self) -- cgit v1.1