diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-08-11 17:25:33 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-08-24 03:22:27 +0530 |
| commit | 93c9d638ecb83918e5a0d85c71e0cb4dc46829e0 (patch) | |
| tree | 4fcfa4498d4ba5d4bcb31c4efc94209b77c43efa /mesonbuild | |
| parent | 928f0a2e62a984c2e576f9f743fb97aec1e7c6c9 (diff) | |
| download | meson-93c9d638ecb83918e5a0d85c71e0cb4dc46829e0.zip meson-93c9d638ecb83918e5a0d85c71e0cb4dc46829e0.tar.gz meson-93c9d638ecb83918e5a0d85c71e0cb4dc46829e0.tar.bz2 | |
Fix FeatureNew false positive in vcs_tag
Fixes https://github.com/mesonbuild/meson/issues/3904
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/interpreter.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 3aa3b23..a49a619 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -3087,7 +3087,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 @@ -3107,6 +3107,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) |