diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-05-22 17:08:44 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-22 17:08:44 +0300 |
| commit | 2b1ca518cfce52dc5e8da086efca563677c353e4 (patch) | |
| tree | 899bafe2681288744975fe7cb6affd9cd756ddf0 /mesonbuild/build.py | |
| parent | 2fd838d62dc16af0687b4be7da4ffb28cb6a9725 (diff) | |
| parent | cb4e4f625f8f191eb5ed1bd435a263b0c7bd11cf (diff) | |
| download | meson-2b1ca518cfce52dc5e8da086efca563677c353e4.zip meson-2b1ca518cfce52dc5e8da086efca563677c353e4.tar.gz meson-2b1ca518cfce52dc5e8da086efca563677c353e4.tar.bz2 | |
Merge pull request #7123 from dcbaker/use-feature-deprecated
Use FeatureDeprecated (and other cleanups)
Diffstat (limited to 'mesonbuild/build.py')
| -rw-r--r-- | mesonbuild/build.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 360285e..d7f3b66 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -778,7 +778,7 @@ class BuildTarget(Target): if isinstance(src, str): src = File(False, self.subdir, src) elif isinstance(src, File): - FeatureNew('File argument for extract_objects', '0.50.0').use(self.subproject) + FeatureNew.single_use('File argument for extract_objects', '0.50.0', self.subproject) else: raise MesonException('Object extraction arguments must be strings or Files.') # FIXME: It could be a generated source @@ -2162,7 +2162,7 @@ class CustomTarget(Target): 'when installing a target') if isinstance(kwargs['install_dir'], list): - FeatureNew('multiple install_dir for custom_target', '0.40.0').use(self.subproject) + FeatureNew.single_use('multiple install_dir for custom_target', '0.40.0', self.subproject) # If an item in this list is False, the output corresponding to # the list index of that item will not be installed self.install_dir = typeslistify(kwargs['install_dir'], (str, bool)) @@ -2174,7 +2174,6 @@ class CustomTarget(Target): if 'build_always' in kwargs and 'build_always_stale' in kwargs: raise InvalidArguments('build_always and build_always_stale are mutually exclusive. Combine build_by_default and build_always_stale.') elif 'build_always' in kwargs: - mlog.deprecation('build_always is deprecated. Combine build_by_default and build_always_stale instead.') if 'build_by_default' not in kwargs: self.build_by_default = kwargs['build_always'] self.build_always_stale = kwargs['build_always'] |