diff options
| author | Salamandar <felix@piedallu.me> | 2018-04-27 16:32:08 +0200 |
|---|---|---|
| committer | Salamandar <felix@piedallu.me> | 2018-06-01 14:23:24 +0200 |
| commit | d5207e1c4faf65aac9c88585476fff5245672fec (patch) | |
| tree | 8bd35f4f0cc3920f91e36a1b3f5e69f8092b5ebf | |
| parent | fa6550b277f26f5625c11b9c98902241a2901b41 (diff) | |
| download | meson-d5207e1c4faf65aac9c88585476fff5245672fec.zip meson-d5207e1c4faf65aac9c88585476fff5245672fec.tar.gz meson-d5207e1c4faf65aac9c88585476fff5245672fec.tar.bz2 | |
Add 0.41.0 features
| -rw-r--r-- | mesonbuild/build.py | 1 | ||||
| -rw-r--r-- | mesonbuild/interpreter.py | 3 | ||||
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 5 |
3 files changed, 8 insertions, 1 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index bd3c034..ac5c824 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -331,6 +331,7 @@ a hard error in the future.''' % name) myid = subdir_part + '@@' + myid return myid + @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: diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 55faddc..379afca 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2861,6 +2861,8 @@ root and issuing %s. def func_vcs_tag(self, node, args, kwargs): if 'input' not in kwargs or 'output' not in kwargs: raise InterpreterException('Keyword arguments input and output must exist') + if 'fallback' not in kwargs: + FeatureNew('Optional fallback in vcs_tag', '0.41.0').use() fallback = kwargs.pop('fallback', self.project_version) if not isinstance(fallback, str): raise InterpreterException('Keyword argument fallback must be a string.') @@ -3174,6 +3176,7 @@ root and issuing %s. self.build.install_dirs.append(idir) return idir + @FeatureNewKwargs('configure_file', '0.41.0', ['capture']) @permittedKwargs(permitted_kwargs['configure_file']) def func_configure_file(self, node, args, kwargs): if len(args) > 0: diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index 365d3cd..c138ad8 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -21,7 +21,7 @@ from .. import mesonlib from .. import mlog from . import ModuleReturnValue from . import ExtensionModule -from ..interpreterbase import permittedKwargs +from ..interpreterbase import permittedKwargs, FeatureNewKwargs, FeatureNew class DependenciesHelper: def __init__(self, name): @@ -304,10 +304,13 @@ class PkgConfigModule(ExtensionModule): ofile.write(self._escape(f)) ofile.write('\n') + @FeatureNewKwargs('pkgconfig.generate', '0.41.0', ['variables']) @permittedKwargs({'libraries', 'version', 'name', 'description', 'filebase', 'subdirs', 'requires', 'requires_private', 'libraries_private', 'install_dir', 'extra_cflags', 'variables', 'url', 'd_module_versions'}) def generate(self, state, args, kwargs): + if 'variables' in kwargs: + FeatureNew('custom pkgconfig variables', '0.41.0').use() default_version = state.project_version['version'] default_install_dir = None default_description = None |