diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-04-06 23:10:20 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-04-06 23:10:20 +0300 |
| commit | cab5ce4fc0eeee6024632cfb3815a7b6e3b70885 (patch) | |
| tree | 70ce279332b2c3730204ffa7dc2e9b01059c5921 /mesonbuild/optinterpreter.py | |
| parent | 5d53c6b7415b62f2172129a61770cf38aa3f3c1d (diff) | |
| parent | 3f3fcace3d91da7d2643354e06a4b8d3c7143f86 (diff) | |
| download | meson-cab5ce4fc0eeee6024632cfb3815a7b6e3b70885.zip meson-cab5ce4fc0eeee6024632cfb3815a7b6e3b70885.tar.gz meson-cab5ce4fc0eeee6024632cfb3815a7b6e3b70885.tar.bz2 | |
Merge pull request #438 from trhd/testing_options
New options for controlling test output.
Diffstat (limited to 'mesonbuild/optinterpreter.py')
| -rw-r--r-- | mesonbuild/optinterpreter.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mesonbuild/optinterpreter.py b/mesonbuild/optinterpreter.py index e2f7ca5..409f9dc 100644 --- a/mesonbuild/optinterpreter.py +++ b/mesonbuild/optinterpreter.py @@ -14,9 +14,10 @@ from . import mparser from . import coredata +from . import mesonlib import os, re -forbidden_option_names = coredata.builtin_options +forbidden_option_names = coredata.get_builtin_options() forbidden_prefixes = {'c_': True, 'cpp_': True, 'rust_': True, @@ -37,7 +38,7 @@ def is_invalid_name(name): return True return False -class OptionException(coredata.MesonException): +class OptionException(mesonlib.MesonException): pass optname_regex = re.compile('[^a-zA-Z0-9_-]') @@ -77,7 +78,7 @@ class OptionInterpreter: def process(self, option_file): try: ast = mparser.Parser(open(option_file, 'r', encoding='utf8').read()).parse() - except coredata.MesonException as me: + except mesonlib.MesonException as me: me.file = option_file raise me if not isinstance(ast, mparser.CodeBlockNode): |