Add 0.44.0 features

pull/3486/head
Salamandar 7 years ago
parent 2056172595
commit c90885de6d
  1. 5
      mesonbuild/interpreter.py
  2. 1
      mesonbuild/modules/qt.py
  3. 3
      mesonbuild/optinterpreter.py

@ -272,6 +272,7 @@ This will become a hard error in the future''')
return args[1] return args[1]
raise InterpreterException('Entry %s not in configuration data.' % name) raise InterpreterException('Entry %s not in configuration data.' % name)
@FeatureNew('get_unquoted', '0.44.0')
def get_unquoted_method(self, args, kwargs): def get_unquoted_method(self, args, kwargs):
if len(args) < 1 or len(args) > 2: if len(args) < 1 or len(args) > 2:
raise InterpreterException('Get method takes one or two arguments.') 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.') raise InterpreterException('Variable name must be a string.')
return self.held_object.get_pkgconfig_variable(varname, kwargs) return self.held_object.get_pkgconfig_variable(varname, kwargs)
@FeatureNew('get_configtool_variable', '0.44.0')
@permittedKwargs({}) @permittedKwargs({})
def configtool_method(self, args, kwargs): def configtool_method(self, args, kwargs):
args = listify(args) args = listify(args)
@ -2335,6 +2337,7 @@ to directly access options of other subprojects.''')
argstr = self.get_message_string_arg(node) argstr = self.get_message_string_arg(node)
mlog.log(mlog.bold('Message:'), argstr) mlog.log(mlog.bold('Message:'), argstr)
@FeatureNew('warning()', '0.44.0')
@noKwargs @noKwargs
def func_warning(self, node, args, kwargs): def func_warning(self, node, args, kwargs):
argstr = self.get_message_string_arg(node) argstr = self.get_message_string_arg(node)
@ -2724,6 +2727,7 @@ to directly access options of other subprojects.''')
self.coredata.deps[identifier] = dep self.coredata.deps[identifier] = dep
return DependencyHolder(dep) return DependencyHolder(dep)
@FeatureNew('disabler', '0.44.0')
@noKwargs @noKwargs
@noPosargs @noPosargs
def func_disabler(self, node, args, kwargs): def func_disabler(self, node, args, kwargs):
@ -3049,6 +3053,7 @@ root and issuing %s.
self.build.man.append(m) self.build.man.append(m)
return m return m
@FeatureNewKwargs('subdir', '0.44.0', ['if_found'])
@permittedKwargs(permitted_kwargs['subdir']) @permittedKwargs(permitted_kwargs['subdir'])
def func_subdir(self, node, args, kwargs): def func_subdir(self, node, args, kwargs):
self.validate_arguments(args, 1, [str]) self.validate_arguments(args, 1, [str])

@ -116,6 +116,7 @@ class QtBaseModule:
except Exception: except Exception:
return [] return []
@FeatureNewKwargs('qt.preprocess', '0.44.0', ['moc_extra_arguments'])
@permittedKwargs({'moc_headers', 'moc_sources', 'moc_extra_arguments', 'include_directories', 'ui_files', 'qresources', 'method'}) @permittedKwargs({'moc_headers', 'moc_sources', 'moc_extra_arguments', 'include_directories', 'ui_files', 'qresources', 'method'})
def preprocess(self, state, args, kwargs): def preprocess(self, state, args, kwargs):
rcc_files, ui_files, moc_headers, moc_sources, moc_extra_arguments, sources, include_directories \ rcc_files, ui_files, moc_headers, moc_sources, moc_extra_arguments, sources, include_directories \

@ -19,7 +19,7 @@ from . import mlog
from . import mparser from . import mparser
from . import coredata from . import coredata
from . import mesonlib from . import mesonlib
from .interpreterbase import FeatureNew
forbidden_option_names = coredata.get_builtin_options() forbidden_option_names = coredata.get_builtin_options()
forbidden_prefixes = {'c_', forbidden_prefixes = {'c_',
@ -106,6 +106,7 @@ def IntegerParser(name, description, kwargs):
kwargs['value'], kwargs['value'],
kwargs.get('yield', coredata.default_yielding)) kwargs.get('yield', coredata.default_yielding))
@FeatureNew('array type option()', '0.44.0')
@permitted_kwargs({'value', 'yield', 'choices'}) @permitted_kwargs({'value', 'yield', 'choices'})
def string_array_parser(name, description, kwargs): def string_array_parser(name, description, kwargs):
if 'choices' in kwargs: if 'choices' in kwargs:

Loading…
Cancel
Save