aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2021-05-16 17:54:43 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2021-06-08 10:18:12 +0200
commita87e32d1817ba750b054774e589b595135fb9145 (patch)
tree2118719c756142508f3b5f84cd59dbc6d6aa8f3c
parent2f2d99e1d88c9f14fa139d450cb6f55173d73c9a (diff)
downloadmeson-a87e32d1817ba750b054774e589b595135fb9145.zip
meson-a87e32d1817ba750b054774e589b595135fb9145.tar.gz
meson-a87e32d1817ba750b054774e589b595135fb9145.tar.bz2
interpreter: add feature.disable_auto_if()
Add a method to downgrade an option to disabled if it is not used. This is useful to avoid unnecessary search for dependencies; for example dep = dependency('dep', required: get_option('feature').disable_auto_if(not foo)) can be used instead of the more verbose and complex if get_option('feature').auto() and not foo then dep = dependency('', required: false) else dep = dependency('dep', required: get_option('feature')) endif or to avoid unnecessary dependency searches: dep1 = dependency('dep1', required: get_option('foo')) # dep2 is only used together with dep1 dep2 = dependency('dep2', required: get_option('foo').disable_auto_if(not dep1.found())) ``` Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--docs/markdown/Reference-manual.md9
-rw-r--r--mesonbuild/interpreter/interpreterobjects.py9
-rw-r--r--test cases/common/192 feature option/meson.build6
3 files changed, 24 insertions, 0 deletions
diff --git a/docs/markdown/Reference-manual.md b/docs/markdown/Reference-manual.md
index 12ddfce..111a6f0 100644
--- a/docs/markdown/Reference-manual.md
+++ b/docs/markdown/Reference-manual.md
@@ -2819,6 +2819,15 @@ The following methods are defined for all [`feature` options](Build-options.md#f
- `disabled()`: returns whether the feature was set to `'disabled'`
- `auto()`: returns whether the feature was set to `'auto'`
- `allowed()` *(since 0.59.0)*: returns whether the feature was set to `'enabled'` or `'auto'`
+- `disable_auto_if(value)` *(since 0.59.0)*: returns the feature, with
+ `'auto'` converted to `'disabled'` if value is true.
+
+ | Feature / Condition | True | False |
+ | ------------------- | ---- | ----- |
+ | Enabled | Enabled | Enabled |
+ | Disabled | Disabled | Disabled |
+ | Auto | Disabled | Auto |
+
- `require(value, error_message: '')` *(since 0.59.0)*: returns
the object itself if the value is true; an error if the object is
`'enabled'` and the value is false; a disabled feature if the object
diff --git a/mesonbuild/interpreter/interpreterobjects.py b/mesonbuild/interpreter/interpreterobjects.py
index 0bf188c..37f486a 100644
--- a/mesonbuild/interpreter/interpreterobjects.py
+++ b/mesonbuild/interpreter/interpreterobjects.py
@@ -75,6 +75,7 @@ class FeatureOptionHolder(InterpreterObject, ObjectHolder[coredata.UserFeatureOp
'allowed': self.allowed_method,
'auto': self.auto_method,
'require': self.require_method,
+ 'disable_auto_if': self.disable_auto_if_method,
})
@property
@@ -122,6 +123,14 @@ class FeatureOptionHolder(InterpreterObject, ObjectHolder[coredata.UserFeatureOp
raise InterpreterException(prefix + error_message)
return self.as_disabled()
+ @permittedKwargs({})
+ def disable_auto_if_method(self, args, kwargs):
+ if len(args) != 1:
+ raise InvalidArguments('Expected 1 argument, got %d.' % (len(args), ))
+ if not isinstance(args[0], bool):
+ raise InvalidArguments('boolean argument expected.')
+ return self if self.value != 'auto' or not args[0] else self.as_disabled()
+
class RunProcess(InterpreterObject):
diff --git a/test cases/common/192 feature option/meson.build b/test cases/common/192 feature option/meson.build
index 6d26deb..b5e26fa 100644
--- a/test cases/common/192 feature option/meson.build
+++ b/test cases/common/192 feature option/meson.build
@@ -15,6 +15,8 @@ assert(not required_opt.disabled(), 'Should be enabled option')
assert(not required_opt.auto(), 'Should be enabled option')
assert(required_opt.allowed(), 'Should be enabled option')
assert(required_opt.require(true, error_message: 'xyz').enabled(), 'Should be enabled option')
+assert(required_opt.disable_auto_if(true).enabled(), 'Should be enabled option')
+assert(required_opt.disable_auto_if(false).enabled(), 'Should be enabled option')
assert(not optional_opt.enabled(), 'Should be auto option')
assert(not optional_opt.disabled(), 'Should be auto option')
@@ -22,6 +24,8 @@ assert(optional_opt.auto(), 'Should be auto option')
assert(optional_opt.allowed(), 'Should be auto option')
assert(optional_opt.require(true).auto(), 'Should be auto option')
assert(optional_opt.require(false, error_message: 'xyz').disabled(), 'Should be disabled auto option')
+assert(optional_opt.disable_auto_if(true).disabled(), 'Should be disabled auto option')
+assert(optional_opt.disable_auto_if(false).auto(), 'Should be auto option')
assert(not disabled_opt.enabled(), 'Should be disabled option')
assert(disabled_opt.disabled(), 'Should be disabled option')
@@ -29,6 +33,8 @@ assert(not disabled_opt.auto(), 'Should be disabled option')
assert(not disabled_opt.allowed(), 'Should be disabled option')
assert(disabled_opt.require(true).disabled(), 'Should be disabled option')
assert(disabled_opt.require(false, error_message: 'xyz').disabled(), 'Should be disabled option')
+assert(disabled_opt.disable_auto_if(true).disabled(), 'Should be disabled option')
+assert(disabled_opt.disable_auto_if(false).disabled(), 'Should be disabled option')
dep = dependency('threads', required : required_opt)
assert(dep.found(), 'Should find required "threads" dep')