aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSalamandar <felix@piedallu.me>2018-04-27 17:26:07 +0200
committerSalamandar <felix@piedallu.me>2018-06-01 14:23:24 +0200
commit364b8a37b9da0a0b318f4c60be67f37dfa51a295 (patch)
treea3f6a12548be3416c151fe377f71f02a0db216a6
parentc90885de6d92ed0ffea286f11337346129ca0a35 (diff)
downloadmeson-364b8a37b9da0a0b318f4c60be67f37dfa51a295.zip
meson-364b8a37b9da0a0b318f4c60be67f37dfa51a295.tar.gz
meson-364b8a37b9da0a0b318f4c60be67f37dfa51a295.tar.bz2
Add 0.45.0 features
-rw-r--r--mesonbuild/interpreter.py2
-rw-r--r--mesonbuild/modules/unstable_icestorm.py2
-rw-r--r--mesonbuild/optinterpreter.py4
3 files changed, 8 insertions, 0 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 1baeb81..9b29086 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -451,6 +451,7 @@ class GeneratorHolder(InterpreterObject, ObjectHolder):
ObjectHolder.__init__(self, build.Generator(args, kwargs))
self.methods.update({'process': self.process_method})
+ @FeatureNewKwargs('generator.process', '0.45.0', ['preserve_path_from'])
@permittedKwargs({'extra_args', 'preserve_path_from'})
def process_method(self, args, kwargs):
extras = mesonlib.stringlistify(kwargs.get('extra_args', []))
@@ -1652,6 +1653,7 @@ class MesonMain(InterpreterObject):
def project_version_method(self, args, kwargs):
return self.build.dep_manifest[self.interpreter.active_projectname]['version']
+ @FeatureNew('meson.project_license()', '0.45.0')
@noPosargs
@permittedKwargs({})
def project_license_method(self, args, kwargs):
diff --git a/mesonbuild/modules/unstable_icestorm.py b/mesonbuild/modules/unstable_icestorm.py
index bf06314..051dc5f 100644
--- a/mesonbuild/modules/unstable_icestorm.py
+++ b/mesonbuild/modules/unstable_icestorm.py
@@ -14,11 +14,13 @@
from .. import mesonlib
from ..interpreterbase import flatten
+from ..interpreterbase import FeatureNew
from . import ExtensionModule
class IceStormModule(ExtensionModule):
+ @FeatureNew('FPGA/Icestorm Module', '0.45.0')
def __init__(self, interpreter):
super().__init__(interpreter)
self.snippets.add('project')
diff --git a/mesonbuild/optinterpreter.py b/mesonbuild/optinterpreter.py
index e5ecc6f..3da5dad 100644
--- a/mesonbuild/optinterpreter.py
+++ b/mesonbuild/optinterpreter.py
@@ -231,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')