diff options
| author | Salamandar <felix@piedallu.me> | 2018-06-04 14:32:02 +0200 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-07-02 07:05:08 +0000 |
| commit | df1970d3add1f673f06f6269b45e8833a0bfd5c1 (patch) | |
| tree | e041aa74fdfc5ae3b831694ef055ef30a33ec83a /mesonbuild/build.py | |
| parent | 5113eb14b9ca4711c5fc197b150dc125eeaf77f6 (diff) | |
| download | meson-df1970d3add1f673f06f6269b45e8833a0bfd5c1.zip meson-df1970d3add1f673f06f6269b45e8833a0bfd5c1.tar.gz meson-df1970d3add1f673f06f6269b45e8833a0bfd5c1.tar.bz2 | |
Various bug fixes for FeatureNew
* Use _get_callee_args to unwrap function call arguments, needed for
module functions.
* Move some FeatureNewKwargs from build.py to interpreter.py
* Print a summary for featurenew only if conflicts were found. The
summary now only prints conflicting features.
* Report and store featurenew/featuredeprecated only once
* Fix version comparison: use le/ge and resize arrays to not fail on
'0.47.0>=0.47'
Closes https://github.com/mesonbuild/meson/issues/3660
Diffstat (limited to 'mesonbuild/build.py')
| -rw-r--r-- | mesonbuild/build.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 6ee13d2..2b22521 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -25,7 +25,7 @@ from .mesonlib import typeslistify, stringlistify, classify_unity_sources from .mesonlib import get_filenames_templates_dict, substitute_values from .mesonlib import for_windows, for_darwin, for_cygwin, for_android, has_path_sep from .compilers import is_object, clink_langs, sort_clink, lang_suffixes -from .interpreterbase import FeatureNew, FeatureNewKwargs +from .interpreterbase import FeatureNew pch_kwargs = set(['c_pch', 'cpp_pch']) @@ -332,9 +332,6 @@ a hard error in the future.''' % name) myid = subdir_part + '@@' + myid return myid - @FeatureNewKwargs('build target', '0.42.0', ['rust_crate_type', 'build_rpath', 'implicit_include_directories']) - @FeatureNewKwargs('build target', '0.41.0', ['rust_args']) - @FeatureNewKwargs('build target', '0.40.0', ['build_by_default']) def process_kwargs(self, kwargs): if 'build_by_default' in kwargs: self.build_by_default = kwargs['build_by_default'] @@ -1095,7 +1092,6 @@ recommended as it is not supported on some platforms''') return class Generator: - @FeatureNewKwargs('generator', '0.43.0', ['capture']) def __init__(self, args, kwargs): if len(args) != 1: raise InvalidArguments('Generator requires exactly one positional argument: the executable') |