diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-06-01 22:53:06 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-01 22:53:06 +0300 |
commit | bf2e21ec0edeaf8e86ff6fd46c2c2fcfcc4713ed (patch) | |
tree | 6601dfff032ff82eb414fc94c44bdd048142ce4b /mesonbuild/optinterpreter.py | |
parent | 0a035dea6d0b1416fc76e323bbd7b0ab5a60a4af (diff) | |
parent | c5e85e59cc2b16edb094fa598fb1a096cd0db4d5 (diff) | |
download | meson-bf2e21ec0edeaf8e86ff6fd46c2c2fcfcc4713ed.zip meson-bf2e21ec0edeaf8e86ff6fd46c2c2fcfcc4713ed.tar.gz meson-bf2e21ec0edeaf8e86ff6fd46c2c2fcfcc4713ed.tar.bz2 |
Merge pull request #3486 from Salamandar/salamandar/meson_version_introspection
Add FeatureNew and FeatureDeprecated, to alert the user of bad meson_version
Diffstat (limited to 'mesonbuild/optinterpreter.py')
-rw-r--r-- | mesonbuild/optinterpreter.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mesonbuild/optinterpreter.py b/mesonbuild/optinterpreter.py index b4156ff..3da5dad 100644 --- a/mesonbuild/optinterpreter.py +++ b/mesonbuild/optinterpreter.py @@ -19,7 +19,7 @@ from . import mlog from . import mparser from . import coredata from . import mesonlib - +from .interpreterbase import FeatureNew forbidden_option_names = coredata.get_builtin_options() forbidden_prefixes = {'c_', @@ -106,6 +106,7 @@ def IntegerParser(name, description, kwargs): kwargs['value'], kwargs.get('yield', coredata.default_yielding)) +@FeatureNew('array type option()', '0.44.0') @permitted_kwargs({'value', 'yield', 'choices'}) def string_array_parser(name, description, kwargs): if 'choices' in kwargs: @@ -230,6 +231,10 @@ class OptionInterpreter: if func_name != 'option': raise OptionException('Only calls to option() are allowed in option files.') (posargs, kwargs) = self.reduce_arguments(node.args) + + if 'yield' in kwargs: + FeatureNew('option yield', '0.45.0').use() + if 'type' not in kwargs: raise OptionException('Option call missing mandatory "type" keyword argument') opt_type = kwargs.pop('type') |