diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-12-05 01:10:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-05 01:10:50 +0200 |
| commit | bc83c58d37421b84c5420356a79e04ade2b851a7 (patch) | |
| tree | 1c47671d6d458ac4d7ec367d3cac716abedf8da8 /mesonbuild/interpreter.py | |
| parent | 87e6201214eda0941d2a2279e12a575fc27d21bb (diff) | |
| parent | d3dcef7efc1df3b7a645eb6dc75c4a66a9131cb9 (diff) | |
| download | meson-bc83c58d37421b84c5420356a79e04ade2b851a7.zip meson-bc83c58d37421b84c5420356a79e04ade2b851a7.tar.gz meson-bc83c58d37421b84c5420356a79e04ade2b851a7.tar.bz2 | |
Merge pull request #2731 from mesonbuild/disabler
Created disabler object type
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 86d25ea..f33d437 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -27,7 +27,7 @@ from .dependencies import InternalDependency, Dependency, DependencyException from .interpreterbase import InterpreterBase from .interpreterbase import check_stringlist, noPosargs, noKwargs, stringArgs, permittedKwargs from .interpreterbase import InterpreterException, InvalidArguments, InvalidCode -from .interpreterbase import InterpreterObject, MutableInterpreterObject +from .interpreterbase import InterpreterObject, MutableInterpreterObject, Disabler from .modules import ModuleReturnValue import os, sys, shutil, uuid @@ -1451,6 +1451,7 @@ class Interpreter(InterpreterBase): 'custom_target': self.func_custom_target, 'declare_dependency': self.func_declare_dependency, 'dependency': self.func_dependency, + 'disabler': self.func_disabler, 'environment': self.func_environment, 'error': self.func_error, 'executable': self.func_executable, @@ -2203,6 +2204,11 @@ to directly access options of other subprojects.''') self.coredata.deps[identifier] = dep return DependencyHolder(dep) + @noKwargs + @noPosargs + def func_disabler(self, node, args, kwargs): + return Disabler() + def get_subproject_infos(self, kwargs): fbinfo = kwargs['fallback'] check_stringlist(fbinfo) |