diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-03-26 00:12:56 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-03-26 00:12:56 +0200 |
| commit | 11a9f61e51dd8d2d9bef210b32e9f98639c3fb4d (patch) | |
| tree | e13976296c16b4343185f5d70ba3a013ceba204c | |
| parent | d53c00db13d144ee8c5430c11c490c1ec87f9fc7 (diff) | |
| download | meson-11a9f61e51dd8d2d9bef210b32e9f98639c3fb4d.zip meson-11a9f61e51dd8d2d9bef210b32e9f98639c3fb4d.tar.gz meson-11a9f61e51dd8d2d9bef210b32e9f98639c3fb4d.tar.bz2 | |
Renamed buildtype from "type" to "buildtype" for consistency.
| -rwxr-xr-x | mesonconf.py | 4 | ||||
| -rw-r--r-- | optinterpreter.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mesonconf.py b/mesonconf.py index e84c9e5..8773aa0 100755 --- a/mesonconf.py +++ b/mesonconf.py @@ -76,7 +76,7 @@ class Conf: if '=' not in o: raise ConfException('Value "%s" not of type "a=b".' % o) (k, v) = o.split('=', 1) - if k == 'type': + if k == 'buildtype': if v not in build_types: raise ConfException('Invalid build type %s.' % v) self.coredata.buildtype = v @@ -157,7 +157,7 @@ class Conf: print('') print('Core options\n') carr = [] - carr.append(['type', 'Build type', self.coredata.buildtype]) + carr.append(['buildtype', 'Build type', self.coredata.buildtype]) carr.append(['strip', 'Strip on install', self.coredata.strip]) carr.append(['coverage', 'Coverage report', self.coredata.coverage]) carr.append(['pch', 'Precompiled headers', self.coredata.use_pch]) diff --git a/optinterpreter.py b/optinterpreter.py index d30ddad..df5b111 100644 --- a/optinterpreter.py +++ b/optinterpreter.py @@ -16,7 +16,7 @@ import mparser import coredata import os, re -forbidden_option_names = {'type': True, +forbidden_option_names = {'buildtype': True, 'strip': True, 'coverage': True, 'pch': True, |