diff options
| -rw-r--r-- | mesonbuild/compilers.py | 2 | ||||
| -rw-r--r-- | mesonbuild/coredata.py | 8 | ||||
| -rw-r--r-- | mesonbuild/mconf.py | 4 | ||||
| -rw-r--r-- | mesonbuild/mesonmain.py | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py index e9bad66..ac4bb0b 100644 --- a/mesonbuild/compilers.py +++ b/mesonbuild/compilers.py @@ -1923,7 +1923,7 @@ class VisualStudioCCompiler(CCompiler): def gen_pch_args(self, header, source, pchname): objname = os.path.splitext(pchname)[0] + '.obj' - return (objname, ['/Yc' + header, '/Fp' + pchname, '/Fo' + objname ]) + return (objname, ['/Yc' + header, '/Fp' + pchname, '/Fo' + objname]) def gen_import_library_args(self, implibname): "The name of the outputted import library" diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index c5c34da..a9dbcdd 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -43,7 +43,7 @@ class UserStringOption(UserOption): class UserBooleanOption(UserOption): def __init__(self, name, description, value): - super().__init__(name, description, [True, False ]) + super().__init__(name, description, [True, False]) self.set_value(value) def tobool(self, thing): @@ -134,7 +134,7 @@ class CoreData(): def init_builtins(self, options): self.builtins = {} for key in get_builtin_options(): - args = [key] + builtin_options[key][1:-1] + [getattr(options, key, get_builtin_option_default(key)) ] + args = [key] + builtin_options[key][1:-1] + [getattr(options, key, get_builtin_option_default(key))] self.builtins[key] = builtin_options[key][0](*args) def get_builtin_option(self, optname): @@ -179,7 +179,7 @@ def get_builtin_option_choices(optname): if builtin_options[optname][0] == UserStringOption: return None elif builtin_options[optname][0] == UserBooleanOption: - return [True, False ] + return [True, False] else: return builtin_options[optname][2] else: @@ -227,7 +227,7 @@ builtin_options = { 'localstatedir': [UserStringOption, 'Localstate data directory.', 'var'], 'sharedstatedir': [UserStringOption, 'Architecture-independent data directory.', 'com'], 'werror': [UserBooleanOption, 'Treat warnings as errors.', False], - 'warning_level': [UserComboOption, 'Compiler warning level to use.', ['1', '2', '3' ], '1'], + 'warning_level': [UserComboOption, 'Compiler warning level to use.', ['1', '2', '3'], '1'], 'layout': [UserComboOption, 'Build directory layout.', ['mirror', 'flat'], 'mirror'], 'default_library': [UserComboOption, 'Default library type.', ['shared', 'static'], 'shared'], 'backend': [UserComboOption, 'Backend to use.', backendlist, 'ninja'], diff --git a/mesonbuild/mconf.py b/mesonbuild/mconf.py index bfe7c08..d6b7624 100644 --- a/mesonbuild/mconf.py +++ b/mesonbuild/mconf.py @@ -128,7 +128,7 @@ class Conf: print('') print('Core options:') carr = [] - for key in ['buildtype', 'warning_level', 'werror', 'strip', 'unity', 'default_library' ]: + for key in ['buildtype', 'warning_level', 'werror', 'strip', 'unity', 'default_library']: carr.append([key, coredata.get_builtin_option_description(key), self.coredata.get_builtin_option(key), coredata.get_builtin_option_choices(key)]) self.print_aligned(carr) @@ -204,7 +204,7 @@ class Conf: print('') print('Testing options:') tarr = [] - for key in ['stdsplit', 'errorlogs' ]: + for key in ['stdsplit', 'errorlogs']: tarr.append([key, coredata.get_builtin_option_description(key), self.coredata.get_builtin_option(key), coredata.get_builtin_option_choices(key)]) self.print_aligned(tarr) diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py index cb8b247..23501f8 100644 --- a/mesonbuild/mesonmain.py +++ b/mesonbuild/mesonmain.py @@ -29,7 +29,7 @@ default_warning = '1' def add_builtin_argument(name, **kwargs): k = kwargs.get('dest', name.replace('-', '_')) c = coredata.get_builtin_option_choices(k) - b = True if kwargs.get('action', None) in ['store_true', 'store_false' ] else False + b = True if kwargs.get('action', None) in ['store_true', 'store_false'] else False h = coredata.get_builtin_option_description(k) if not b: h = h.rstrip('.') + ' (default: %s).' % coredata.get_builtin_option_default(k) |