From 4741f1e2437edaa9b5bfa204c703027fd0a9efa4 Mon Sep 17 00:00:00 2001 From: Salamandar Date: Fri, 27 Apr 2018 16:46:18 +0200 Subject: [PATCH] Add 0.42.0 features --- mesonbuild/build.py | 1 + mesonbuild/dependencies/misc.py | 5 +++++ mesonbuild/dependencies/ui.py | 3 +++ mesonbuild/interpreter.py | 2 ++ mesonbuild/modules/gnome.py | 1 + mesonbuild/modules/pkgconfig.py | 1 + mesonbuild/modules/unstable_simd.py | 3 +++ 7 files changed, 16 insertions(+) diff --git a/mesonbuild/build.py b/mesonbuild/build.py index ac5c82429..1b3861b71 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.42.0', ['rust_crate_type', 'build_rpath', 'implicit_include_directories']) @FeatureNewKwargs('build target', '0.41.0', ['rust_args']) @FeatureNewKwargs('build target', '0.40.0', ['build_by_default']) def process_kwargs(self, kwargs): diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index cf84123dc..bf290ceb9 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -31,8 +31,11 @@ from .base import ( ConfigToolDependency, ) +from ..interpreterbase import FeatureNew class MPIDependency(ExternalDependency): + + @FeatureNew('MPI Dependency', '0.42.0') def __init__(self, environment, kwargs): language = kwargs.get('language', 'c') super().__init__('mpi', environment, language, kwargs) @@ -428,6 +431,8 @@ class Python3Dependency(ExternalDependency): class PcapDependency(ExternalDependency): + + @FeatureNew('Pcap Dependency', '0.42.0') def __init__(self, environment, kwargs): super().__init__('pcap', environment, None, kwargs) diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index d6547ffca..b07b0ae9f 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -33,6 +33,7 @@ from .base import ExternalDependency, ExternalProgram from .base import ExtraFrameworkDependency, PkgConfigDependency from .base import ConfigToolDependency +from ..interpreterbase import FeatureNew class GLDependency(ExternalDependency): def __init__(self, environment, kwargs): @@ -514,6 +515,8 @@ class WxDependency(ConfigToolDependency): class VulkanDependency(ExternalDependency): + + @FeatureNew('Vulkan Dependency', '0.42.0') def __init__(self, environment, kwargs): super().__init__('vulkan', environment, None, kwargs) diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 379afca59..b342415fd 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2805,6 +2805,7 @@ root and issuing %s. mlog.bold(subproj_path), 'found:', mlog.green('YES')) return dep + @FeatureNewKwargs('executable', '0.42.0', 'implib') @permittedKwargs(permitted_kwargs['executable']) def func_executable(self, node, args, kwargs): return self.build_target(node, args, kwargs, ExecutableHolder) @@ -3132,6 +3133,7 @@ root and issuing %s. self.build.data.append(data.held_object) return data + @FeatureNewKwargs('install_subdir', '0.42.0', ['exclude_files', 'exclude_directories']) @FeatureNewKwargs('install_subdir', '0.38.0', ['install_mode']) @permittedKwargs(permitted_kwargs['install_subdir']) @stringArgs diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index d1c43bc90..6bd0977a4 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -1095,6 +1095,7 @@ This will become a hard error in the future.''') else: return ModuleReturnValue(targets, targets) + @FeatureNew('gnome.mkenums_simple', '0.42.0') def mkenums_simple(self, state, args, kwargs): hdr_filename = args[0] + '.h' body_filename = args[0] + '.c' diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index c138ad8dc..10431a42d 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -304,6 +304,7 @@ class PkgConfigModule(ExtensionModule): ofile.write(self._escape(f)) ofile.write('\n') + @FeatureNewKwargs('pkgconfig.generate', '0.42.0', ['extra_cflags']) @FeatureNewKwargs('pkgconfig.generate', '0.41.0', ['variables']) @permittedKwargs({'libraries', 'version', 'name', 'description', 'filebase', 'subdirs', 'requires', 'requires_private', 'libraries_private', diff --git a/mesonbuild/modules/unstable_simd.py b/mesonbuild/modules/unstable_simd.py index c41e96c50..b64242aae 100644 --- a/mesonbuild/modules/unstable_simd.py +++ b/mesonbuild/modules/unstable_simd.py @@ -16,8 +16,11 @@ from .. import mesonlib, compilers, mlog from . import ExtensionModule +from ..interpreterbase import FeatureNew + class SimdModule(ExtensionModule): + @FeatureNew('SIMD module', '0.42.0') def __init__(self, interpreter): super().__init__(interpreter) self.snippets.add('check')