From accea4889b5ad115e1854560a052ef03c148e89c Mon Sep 17 00:00:00 2001 From: Salamandar Date: Fri, 27 Apr 2018 16:08:14 +0200 Subject: Add 0.37.0 features --- mesonbuild/modules/gnome.py | 4 +++- mesonbuild/modules/i18n.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'mesonbuild/modules') diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index ea8ff3f83..d6f6a7be6 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -30,7 +30,7 @@ from . import ExtensionModule from . import ModuleReturnValue from ..mesonlib import MesonException, OrderedSet, Popen_safe, extract_as_list from ..dependencies import Dependency, PkgConfigDependency, InternalDependency -from ..interpreterbase import noKwargs, permittedKwargs +from ..interpreterbase import noKwargs, permittedKwargs, FeatureNew, FeatureNewKwargs # gresource compilation is broken due to the way # the resource compiler and Ninja clash about it @@ -95,6 +95,7 @@ class GnomeModule(ExtensionModule): mlog.bold('https://github.com/mesonbuild/meson/issues/1387')) gdbuswarning_printed = True + @FeatureNewKwargs('gnome.compile_resources', '0.37.0', ['gresource_bundle', 'export', 'install_header']) @permittedKwargs({'source_dir', 'c_name', 'dependencies', 'export', 'gresource_bundle', 'install_header', 'install', 'install_dir', 'extra_args', 'build_by_default'}) def compile_resources(self, state, args, kwargs): @@ -721,6 +722,7 @@ This will become a hard error in the future.''') rv = [inscript, pottarget, potarget] return ModuleReturnValue(None, rv) + @FeatureNewKwargs('gnome.gtkdoc', '0.37.0', ['namespace', 'mode']) @permittedKwargs({'main_xml', 'main_sgml', 'src_dir', 'dependencies', 'install', 'install_dir', 'scan_args', 'scanobjs_args', 'gobject_typesfile', 'fixxref_args', 'html_args', 'html_assets', 'content_files', diff --git a/mesonbuild/modules/i18n.py b/mesonbuild/modules/i18n.py index 4281200cb..b44fbea5f 100644 --- a/mesonbuild/modules/i18n.py +++ b/mesonbuild/modules/i18n.py @@ -19,7 +19,7 @@ from .. import coredata, mesonlib, build from ..mesonlib import MesonException from . import ModuleReturnValue from . import ExtensionModule -from ..interpreterbase import permittedKwargs +from ..interpreterbase import permittedKwargs, FeatureNew, FeatureNewKwargs PRESET_ARGS = { 'glib': [ @@ -55,6 +55,7 @@ class I18nModule(ExtensionModule): src_dir = path.join(state.environment.get_source_dir(), state.subdir) return [path.join(src_dir, d) for d in dirs] + @FeatureNew('i18n.merge_file', '0.37.0') @permittedKwargs({'languages', 'data_dirs', 'preset', 'args', 'po_dir', 'type', 'input', 'output', 'install', 'install_dir'}) def merge_file(self, state, args, kwargs): @@ -82,6 +83,7 @@ class I18nModule(ExtensionModule): ct = build.CustomTarget(kwargs['output'] + '_merge', state.subdir, state.subproject, kwargs) return ModuleReturnValue(ct, [ct]) + @FeatureNewKwargs('i18n.gettext', '0.37.0', ['preset']) @permittedKwargs({'po_dir', 'data_dirs', 'type', 'languages', 'args', 'preset', 'install'}) def gettext(self, state, args, kwargs): if len(args) != 1: -- cgit v1.2.3 From fa6550b277f26f5625c11b9c98902241a2901b41 Mon Sep 17 00:00:00 2001 From: Salamandar Date: Fri, 27 Apr 2018 16:23:55 +0200 Subject: Add 0.40.0 features --- mesonbuild/build.py | 5 +++++ mesonbuild/interpreter.py | 5 +++++ mesonbuild/modules/gnome.py | 3 +++ mesonbuild/modules/qt.py | 3 ++- 4 files changed, 15 insertions(+), 1 deletion(-) (limited to 'mesonbuild/modules') diff --git a/mesonbuild/build.py b/mesonbuild/build.py index b6399bbad..bd3c03487 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -25,6 +25,7 @@ from .mesonlib import typeslistify, stringlistify, classify_unity_sources from .mesonlib import get_filenames_templates_dict, substitute_values from .mesonlib import for_windows, for_darwin, for_cygwin, for_android, has_path_sep from .compilers import is_object, clike_langs, sort_clike, lang_suffixes +from .interpreterbase import FeatureNew, FeatureNewKwargs pch_kwargs = set(['c_pch', 'cpp_pch']) @@ -330,6 +331,7 @@ a hard error in the future.''' % name) myid = subdir_part + '@@' + myid return myid + @FeatureNewKwargs('build target', '0.40.0', ['build_by_default']) def process_kwargs(self, kwargs): if 'build_by_default' in kwargs: self.build_by_default = kwargs['build_by_default'] @@ -1763,6 +1765,9 @@ class CustomTarget(Target): if 'install_dir' not in kwargs: raise InvalidArguments('"install_dir" must be specified ' 'when installing a target') + + if isinstance(kwargs['install_dir'], list): + FeatureNew('multiple install_dir for custom_target', '0.40.0').use() # If an item in this list is False, the output corresponding to # the list index of that item will not be installed self.install_dir = typeslistify(kwargs['install_dir'], (str, bool)) diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 1b23ff2fe..55faddc9f 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1097,6 +1097,7 @@ class CompilerHolder(InterpreterObject): mlog.log('Checking for type "', mlog.bold(typename), '": ', hadtxt, sep='') return had + @FeatureNew('compiler.compute_int', '0.40.0') @permittedKwargs({ 'prefix', 'low', @@ -1151,6 +1152,7 @@ class CompilerHolder(InterpreterObject): mlog.log('Checking for size of "%s": %d' % (element, esize)) return esize + @FeatureNew('compiler.get_define', '0.40.0') @permittedKwargs({ 'prefix', 'no_builtin_args', @@ -2655,6 +2657,7 @@ to directly access options of other subprojects.''') 'dep {}'.format(found, dirname, wanted, name)) return None + @FeatureNewKwargs('dependency', '0.40.0', ['method']) @FeatureNewKwargs('dependency', '0.38.0', ['default_options']) @permittedKwargs(permitted_kwargs['dependency']) def func_dependency(self, node, args, kwargs): @@ -2833,6 +2836,7 @@ root and issuing %s. def func_jar(self, node, args, kwargs): return self.build_target(node, args, kwargs, JarHolder) + @FeatureNewKwargs('build_target', '0.40.0', ['link_whole', 'override_options']) @permittedKwargs(permitted_kwargs['build_target']) def func_build_target(self, node, args, kwargs): if 'target_type' not in kwargs: @@ -2899,6 +2903,7 @@ root and issuing %s. raise SubdirDoneRequest() @stringArgs + @FeatureNewKwargs('build target', '0.40.0', ['build_by_default']) @permittedKwargs(permitted_kwargs['custom_target']) def func_custom_target(self, node, args, kwargs): if len(args) != 1: diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index d6f6a7be6..d1c43bc90 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -385,6 +385,7 @@ class GnomeModule(ExtensionModule): ldflags = fixed_ldflags return cflags, ldflags, gi_includes + @FeatureNewKwargs('build target', '0.40.0', ['build_by_default']) @permittedKwargs({'sources', 'nsversion', 'namespace', 'symbol_prefix', 'identifier_prefix', 'export_packages', 'includes', 'dependencies', 'link_with', 'include_directories', 'install', 'install_dir_gir', 'install_dir_typelib', 'extra_args', @@ -636,6 +637,7 @@ class GnomeModule(ExtensionModule): rv = [scan_target, typelib_target] return ModuleReturnValue(rv, rv) + @FeatureNewKwargs('build target', '0.40.0', ['build_by_default']) @permittedKwargs({'build_by_default', 'depend_files'}) def compile_schemas(self, state, args, kwargs): if args: @@ -877,6 +879,7 @@ This will become a hard error in the future.''') return [] + @FeatureNewKwargs('build target', '0.40.0', ['build_by_default']) @permittedKwargs({'interface_prefix', 'namespace', 'object_manager', 'build_by_default', 'annotations', 'docbook', 'install_header', 'install_dir', 'sources'}) def gdbus_codegen(self, state, args, kwargs): diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py index 39c65ed30..f8d43a781 100644 --- a/mesonbuild/modules/qt.py +++ b/mesonbuild/modules/qt.py @@ -19,7 +19,7 @@ from ..mesonlib import MesonException, Popen_safe, extract_as_list, File from ..dependencies import Qt4Dependency, Qt5Dependency import xml.etree.ElementTree as ET from . import ModuleReturnValue, get_include_args -from ..interpreterbase import permittedKwargs +from ..interpreterbase import permittedKwargs, FeatureNewKwargs _QT_DEPS_LUT = { 4: Qt4Dependency, @@ -181,6 +181,7 @@ class QtBaseModule: sources.append(moc_output) return ModuleReturnValue(sources, sources) + @FeatureNewKwargs('build target', '0.40.0', ['build_by_default']) @permittedKwargs({'ts_files', 'install', 'install_dir', 'build_by_default', 'method'}) def compile_translations(self, state, args, kwargs): ts_files, install_dir = extract_as_list(kwargs, 'ts_files', 'install_dir', pop=True) -- cgit v1.2.3 From d5207e1c4faf65aac9c88585476fff5245672fec Mon Sep 17 00:00:00 2001 From: Salamandar Date: Fri, 27 Apr 2018 16:32:08 +0200 Subject: Add 0.41.0 features --- mesonbuild/build.py | 1 + mesonbuild/interpreter.py | 3 +++ mesonbuild/modules/pkgconfig.py | 5 ++++- 3 files changed, 8 insertions(+), 1 deletion(-) (limited to 'mesonbuild/modules') diff --git a/mesonbuild/build.py b/mesonbuild/build.py index bd3c03487..ac5c82429 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 55faddc9f..379afca59 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 365d3cd37..c138ad8dc 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 -- cgit v1.2.3 From 4741f1e2437edaa9b5bfa204c703027fd0a9efa4 Mon Sep 17 00:00:00 2001 From: Salamandar Date: Fri, 27 Apr 2018 16:46:18 +0200 Subject: 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(+) (limited to 'mesonbuild/modules') 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') -- cgit v1.2.3 From c90885de6d92ed0ffea286f11337346129ca0a35 Mon Sep 17 00:00:00 2001 From: Salamandar Date: Fri, 27 Apr 2018 17:04:48 +0200 Subject: Add 0.44.0 features --- mesonbuild/interpreter.py | 5 +++++ mesonbuild/modules/qt.py | 1 + mesonbuild/optinterpreter.py | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) (limited to 'mesonbuild/modules') diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 509c5a977..1baeb8104 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 f8d43a781..ccf0930cf 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 b4156ffe0..e5ecc6f57 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: -- cgit v1.2.3 From 364b8a37b9da0a0b318f4c60be67f37dfa51a295 Mon Sep 17 00:00:00 2001 From: Salamandar Date: Fri, 27 Apr 2018 17:26:07 +0200 Subject: Add 0.45.0 features --- mesonbuild/interpreter.py | 2 ++ mesonbuild/modules/unstable_icestorm.py | 2 ++ mesonbuild/optinterpreter.py | 4 ++++ 3 files changed, 8 insertions(+) (limited to 'mesonbuild/modules') diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 1baeb8104..9b2908625 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 bf06314db..051dc5f1c 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 e5ecc6f57..3da5dadac 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') -- cgit v1.2.3 From 2fb601876355587afd39691b361a4de6d30f9344 Mon Sep 17 00:00:00 2001 From: Salamandar Date: Fri, 27 Apr 2018 17:46:02 +0200 Subject: Add 0.46.0 features --- mesonbuild/dependencies/misc.py | 1 + mesonbuild/interpreter.py | 15 +++++++++++++++ mesonbuild/modules/gnome.py | 1 + mesonbuild/modules/pkgconfig.py | 3 ++- mesonbuild/modules/python.py | 5 ++++- 5 files changed, 23 insertions(+), 2 deletions(-) (limited to 'mesonbuild/modules') diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index bf290ceb9..a6281510a 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -252,6 +252,7 @@ class OpenMPDependency(ExternalDependency): '199810': '1.0', } + @FeatureNew('OpenMP Dependency', '0.46.0') def __init__(self, environment, kwargs): language = kwargs.get('language') super().__init__('openmp', environment, language, kwargs) diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 9b2908625..24a0a29e0 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -356,6 +356,7 @@ class DependencyHolder(InterpreterObject, ObjectHolder): raise InterpreterException('Variable name must be a string.') return self.held_object.get_configtool_variable(varname) + @FeatureNew('dep.partial_dependency', '0.46.0') @noPosargs @permittedKwargs(permitted_method_kwargs['partial_dependency']) def partial_dependency_method(self, args, kwargs): @@ -380,6 +381,7 @@ class InternalDependencyHolder(InterpreterObject, ObjectHolder): def version_method(self, args, kwargs): return self.held_object.get_version() + @FeatureNew('dep.partial_dependency', '0.46.0') @noPosargs @permittedKwargs(permitted_method_kwargs['partial_dependency']) def partial_dependency_method(self, args, kwargs): @@ -439,6 +441,7 @@ class ExternalLibraryHolder(InterpreterObject, ObjectHolder): def get_exe_args(self): return self.held_object.get_exe_args() + @FeatureNew('dep.partial_dependency', '0.46.0') @noPosargs @permittedKwargs(permitted_method_kwargs['partial_dependency']) def partial_dependency_method(self, args, kwargs): @@ -690,6 +693,7 @@ class BuildTargetHolder(TargetHolder): gobjs = self.held_object.extract_objects(args) return GeneratedObjectsHolder(gobjs) + @FeatureNewKwargs('extract_all_objects', '0.46.0', ['recursive']) @noPosargs @permittedKwargs({'recursive'}) def extract_all_objects_method(self, args, kwargs): @@ -1378,6 +1382,7 @@ class CompilerHolder(InterpreterObject): mlog.log('First supported argument:', mlog.red('None')) return [] + @FeatureNew('has_link_argument', '0.46.0') @permittedKwargs({}) def has_link_argument_method(self, args, kwargs): args = mesonlib.stringlistify(args) @@ -1385,6 +1390,7 @@ class CompilerHolder(InterpreterObject): raise InterpreterException('has_link_argument takes exactly one argument.') return self.has_multi_link_arguments_method(args, kwargs) + @FeatureNew('has_multi_link_argument', '0.46.0') @permittedKwargs({}) def has_multi_link_arguments_method(self, args, kwargs): args = mesonlib.stringlistify(args) @@ -1399,6 +1405,7 @@ class CompilerHolder(InterpreterObject): h) return result + @FeatureNew('get_supported_link_arguments_method', '0.46.0') @permittedKwargs({}) def get_supported_link_arguments_method(self, args, kwargs): args = mesonlib.stringlistify(args) @@ -1408,6 +1415,7 @@ class CompilerHolder(InterpreterObject): supported_args.append(arg) return supported_args + @FeatureNew('first_supported_link_argument_method', '0.46.0') @permittedKwargs({}) def first_supported_link_argument_method(self, args, kwargs): for i in mesonlib.stringlistify(args): @@ -1627,6 +1635,7 @@ class MesonMain(InterpreterObject): raise InterpreterException('Argument must be a string.') self.build.dep_manifest_name = args[0] + @FeatureNew('override_find_program', '0.46.0') @permittedKwargs({}) def override_find_program_method(self, args, kwargs): if len(args) != 2: @@ -1944,6 +1953,7 @@ class Interpreter(InterpreterBase): def func_files(self, node, args, kwargs): return [mesonlib.File.from_source_file(self.environment.source_dir, self.subdir, fname) for fname in args] + @FeatureNewKwargs('declare_dependency', '0.46.0', ['link_whole']) @permittedKwargs(permitted_kwargs['declare_dependency']) @noPosargs def func_declare_dependency(self, node, args, kwargs): @@ -2904,6 +2914,7 @@ root and issuing %s. kwargs.setdefault('build_always', True) return self.func_custom_target(node, [kwargs['output']], kwargs) + @FeatureNew('subdir_done', '0.46.0') @stringArgs def func_subdir_done(self, node, args, kwargs): if len(kwargs) > 0: @@ -2965,6 +2976,7 @@ root and issuing %s. def func_benchmark(self, node, args, kwargs): self.add_test(node, args, kwargs, False) + @FeatureNewKwargs('test', '0.46.0', ['depends']) @permittedKwargs(permitted_kwargs['test']) def func_test(self, node, args, kwargs): self.add_test(node, args, kwargs, True) @@ -3119,6 +3131,7 @@ root and issuing %s. 'permissions arg to be a string or false') return FileMode(*install_mode) + @FeatureNewKwargs('install_data', '0.46.0', ['rename']) @FeatureNewKwargs('install_data', '0.38.0', ['install_mode']) @permittedKwargs(permitted_kwargs['install_data']) def func_install_data(self, node, args, kwargs): @@ -3186,6 +3199,7 @@ root and issuing %s. self.build.install_dirs.append(idir) return idir + @FeatureNewKwargs('configure_file', '0.46.0', ['format']) @FeatureNewKwargs('configure_file', '0.41.0', ['capture']) @permittedKwargs(permitted_kwargs['configure_file']) def func_configure_file(self, node, args, kwargs): @@ -3562,6 +3576,7 @@ different subdirectory. if idname not in self.coredata.target_guids: self.coredata.target_guids[idname] = str(uuid.uuid4()).upper() + @FeatureNew('both_libraries', '0.46.0') def build_both_libraries(self, node, args, kwargs): shared_holder = self.build_target(node, args, kwargs, SharedLibraryHolder) diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 6bd0977a4..0c5da17f9 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -879,6 +879,7 @@ This will become a hard error in the future.''') return [] + @FeatureNewKwargs('build target', '0.46.0', ['install_header', 'install_dir', 'sources']) @FeatureNewKwargs('build target', '0.40.0', ['build_by_default']) @permittedKwargs({'interface_prefix', 'namespace', 'object_manager', 'build_by_default', 'annotations', 'docbook', 'install_header', 'install_dir', 'sources'}) diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index 10431a42d..68c2dc587 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, FeatureNewKwargs, FeatureNew +from ..interpreterbase import permittedKwargs, FeatureNew, FeatureNewKwargs class DependenciesHelper: def __init__(self, name): @@ -318,6 +318,7 @@ class PkgConfigModule(ExtensionModule): default_name = None mainlib = None if len(args) == 1: + FeatureNew('pkgconfig.generate optional positional argument', '0.46.0').use() mainlib = getattr(args[0], 'held_object', args[0]) if not isinstance(mainlib, (build.StaticLibrary, build.SharedLibrary)): raise mesonlib.MesonException('Pkgconfig_gen first positional argument must be a library object') diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py index a70510903..b30a1e6ba 100644 --- a/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py @@ -22,7 +22,8 @@ from mesonbuild.modules import ModuleReturnValue from . import permittedSnippetKwargs from ..interpreterbase import ( noPosargs, noKwargs, permittedKwargs, - InterpreterObject, InvalidArguments + InterpreterObject, InvalidArguments, + FeatureNew ) from ..interpreter import ExternalProgramHolder from ..interpreterbase import flatten @@ -49,6 +50,8 @@ def run_command(python, command): class PythonDependency(ExternalDependency): + + @FeatureNew('Python Module', '0.46.0') def __init__(self, python_holder, environment, kwargs): super().__init__('python', environment, None, kwargs) self.name = 'python' -- cgit v1.2.3