FeatureNew: Fix method names for some feature checks

sgallagher · Jul 2, 2018 · 907a68b · 907a68b
1 parent 18cd3bd
commit 907a68b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
@@ -328,7 +328,7 @@ def get_method(self, args, kwargs):
             return args[1]
         raise InterpreterException('Entry %s not in configuration data.' % name)
 
-    @FeatureNew('get_unquoted', '0.44.0')
+    @FeatureNew('configuration_data.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.')
@@ -401,7 +401,7 @@ def pkgconfig_method(self, args, kwargs):
             raise InterpreterException('Variable name must be a string.')
         return self.held_object.get_pkgconfig_variable(varname, kwargs)
 
-    @FeatureNew('get_configtool_variable', '0.44.0')
+    @FeatureNew('dep.get_configtool_variable', '0.44.0')
     @permittedKwargs({})
     def configtool_method(self, args, kwargs):
         args = listify(args)
@@ -1312,7 +1312,7 @@ def links_method(self, args, kwargs):
             mlog.log('Checking if "', mlog.bold(testname), '" links: ', h, sep='')
         return result
 
-    @FeatureNew('check_header', '0.47.0')
+    @FeatureNew('compiler.check_header', '0.47.0')
     @permittedKwargs({
         'prefix',
         'no_builtin_args',
@@ -1461,15 +1461,15 @@ def first_supported_argument_method(self, args, kwargs):
         mlog.log('First supported argument:', mlog.red('None'))
         return []
 
-    @FeatureNew('has_link_argument', '0.46.0')
+    @FeatureNew('compiler.has_link_argument', '0.46.0')
     @permittedKwargs({})
     def has_link_argument_method(self, args, kwargs):
         args = mesonlib.stringlistify(args)
         if len(args) != 1:
             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')
+    @FeatureNew('compiler.has_multi_link_argument', '0.46.0')
     @permittedKwargs({})
     def has_multi_link_arguments_method(self, args, kwargs):
         args = mesonlib.stringlistify(args)
@@ -1484,7 +1484,7 @@ def has_multi_link_arguments_method(self, args, kwargs):
             h)
         return result
 
-    @FeatureNew('get_supported_link_arguments_method', '0.46.0')
+    @FeatureNew('compiler.get_supported_link_arguments_method', '0.46.0')
     @permittedKwargs({})
     def get_supported_link_arguments_method(self, args, kwargs):
         args = mesonlib.stringlistify(args)
@@ -1494,7 +1494,7 @@ def get_supported_link_arguments_method(self, args, kwargs):
                 supported_args.append(arg)
         return supported_args
 
-    @FeatureNew('first_supported_link_argument_method', '0.46.0')
+    @FeatureNew('compiler.first_supported_link_argument_method', '0.46.0')
     @permittedKwargs({})
     def first_supported_link_argument_method(self, args, kwargs):
         for i in mesonlib.stringlistify(args):
@@ -1714,7 +1714,7 @@ def install_dependency_manifest_method(self, args, kwargs):
             raise InterpreterException('Argument must be a string.')
         self.build.dep_manifest_name = args[0]
 
-    @FeatureNew('override_find_program', '0.46.0')
+    @FeatureNew('meson.override_find_program', '0.46.0')
     @permittedKwargs({})
     def override_find_program_method(self, args, kwargs):
         if len(args) != 2:
@@ -2478,7 +2478,7 @@ def func_message(self, node, args, kwargs):
         argstr = self.get_message_string_arg(node)
         mlog.log(mlog.bold('Message:'), argstr)
 
-    @FeatureNew('warning()', '0.44.0')
+    @FeatureNew('warning', '0.44.0')
     @noKwargs
     def func_warning(self, node, args, kwargs):
         argstr = self.get_message_string_arg(node)
@@ -2973,7 +2973,7 @@ def func_shared_lib(self, node, args, kwargs):
     def func_both_lib(self, node, args, kwargs):
         return self.build_both_libraries(node, args, kwargs)
 
-    @FeatureNew('Shared Modules', '0.37.0')
+    @FeatureNew('shared_module', '0.37.0')
     @permittedKwargs(permitted_kwargs['shared_module'])
     def func_shared_module(self, node, args, kwargs):
         return self.build_target(node, args, kwargs, SharedModuleHolder)

diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
@@ -50,7 +50,6 @@ 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'
@@ -432,6 +431,8 @@ def method_call(self, method_name, args, kwargs):
 
 
 class PythonModule(ExtensionModule):
+
+    @FeatureNew('Python Module', '0.46.0')
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.snippets.add('find_installation')