diff options
| author | Salamandar <felix@piedallu.me> | 2018-04-27 17:04:48 +0200 |
|---|---|---|
| committer | Salamandar <felix@piedallu.me> | 2018-06-01 14:23:24 +0200 |
| commit | c90885de6d92ed0ffea286f11337346129ca0a35 (patch) | |
| tree | 99e21f8fec1c31f1ed64fa6de9ef0dae431e4812 | |
| parent | 2056172595a593fc532f97d76445e710354e7f17 (diff) | |
| download | meson-c90885de6d92ed0ffea286f11337346129ca0a35.zip meson-c90885de6d92ed0ffea286f11337346129ca0a35.tar.gz meson-c90885de6d92ed0ffea286f11337346129ca0a35.tar.bz2 | |
Add 0.44.0 features
| -rw-r--r-- | mesonbuild/interpreter.py | 5 | ||||
| -rw-r--r-- | mesonbuild/modules/qt.py | 1 | ||||
| -rw-r--r-- | mesonbuild/optinterpreter.py | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 509c5a9..1baeb81 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -272,6 +272,7 @@ This will become a hard error in the future''') return args[1] raise InterpreterException('Entry %s not in configuration data.' % name) + @FeatureNew('get_unquoted', '0.44.0') def get_unquoted_method(self, args, kwargs): if len(args) < 1 or len(args) > 2: raise InterpreterException('Get method takes one or two arguments.') @@ -344,6 +345,7 @@ class DependencyHolder(InterpreterObject, ObjectHolder): raise InterpreterException('Variable name must be a string.') return self.held_object.get_pkgconfig_variable(varname, kwargs) + @FeatureNew('get_configtool_variable', '0.44.0') @permittedKwargs({}) def configtool_method(self, args, kwargs): args = listify(args) @@ -2335,6 +2337,7 @@ to directly access options of other subprojects.''') argstr = self.get_message_string_arg(node) mlog.log(mlog.bold('Message:'), argstr) + @FeatureNew('warning()', '0.44.0') @noKwargs def func_warning(self, node, args, kwargs): argstr = self.get_message_string_arg(node) @@ -2724,6 +2727,7 @@ to directly access options of other subprojects.''') self.coredata.deps[identifier] = dep return DependencyHolder(dep) + @FeatureNew('disabler', '0.44.0') @noKwargs @noPosargs def func_disabler(self, node, args, kwargs): @@ -3049,6 +3053,7 @@ root and issuing %s. self.build.man.append(m) return m + @FeatureNewKwargs('subdir', '0.44.0', ['if_found']) @permittedKwargs(permitted_kwargs['subdir']) def func_subdir(self, node, args, kwargs): self.validate_arguments(args, 1, [str]) diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py index f8d43a7..ccf0930 100644 --- a/mesonbuild/modules/qt.py +++ b/mesonbuild/modules/qt.py @@ -116,6 +116,7 @@ class QtBaseModule: except Exception: return [] + @FeatureNewKwargs('qt.preprocess', '0.44.0', ['moc_extra_arguments']) @permittedKwargs({'moc_headers', 'moc_sources', 'moc_extra_arguments', 'include_directories', 'ui_files', 'qresources', 'method'}) def preprocess(self, state, args, kwargs): rcc_files, ui_files, moc_headers, moc_sources, moc_extra_arguments, sources, include_directories \ diff --git a/mesonbuild/optinterpreter.py b/mesonbuild/optinterpreter.py index b4156ff..e5ecc6f 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: |