aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/modules
diff options
context:
space:
mode:
authorSalamandar <felix@piedallu.me>2018-04-27 17:46:02 +0200
committerSalamandar <felix@piedallu.me>2018-06-01 14:23:24 +0200
commit2fb601876355587afd39691b361a4de6d30f9344 (patch)
tree353759d3703fd74dd7c751688a704c2a09ab8a63 /mesonbuild/modules
parent364b8a37b9da0a0b318f4c60be67f37dfa51a295 (diff)
downloadmeson-2fb601876355587afd39691b361a4de6d30f9344.zip
meson-2fb601876355587afd39691b361a4de6d30f9344.tar.gz
meson-2fb601876355587afd39691b361a4de6d30f9344.tar.bz2
Add 0.46.0 features
Diffstat (limited to 'mesonbuild/modules')
-rw-r--r--mesonbuild/modules/gnome.py1
-rw-r--r--mesonbuild/modules/pkgconfig.py3
-rw-r--r--mesonbuild/modules/python.py5
3 files changed, 7 insertions, 2 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index 6bd0977..0c5da17 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 10431a4..68c2dc5 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 a705109..b30a1e6 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'