mconf: User newline instead of printing empty string

pull/3177/head
Sander Sweers 7 years ago
parent f805f8e109
commit 84d382f963
  1. 25
      mesonbuild/mconf.py

@ -130,8 +130,7 @@ class Conf:
print('Core properties:') print('Core properties:')
print(' Source dir', self.build.environment.source_dir) print(' Source dir', self.build.environment.source_dir)
print(' Build dir ', self.build.environment.build_dir) print(' Build dir ', self.build.environment.build_dir)
print('') print('\nCore options:\n')
print('Core options:')
carr = [] 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({'name': key, carr.append({'name': key,
@ -139,7 +138,6 @@ class Conf:
'value': self.coredata.get_builtin_option(key), 'value': self.coredata.get_builtin_option(key),
'choices': coredata.get_builtin_option_choices(key)}) 'choices': coredata.get_builtin_option_choices(key)})
self.print_aligned(carr) self.print_aligned(carr)
print('')
bekeys = sorted(self.coredata.backend_options) bekeys = sorted(self.coredata.backend_options)
if not bekeys: if not bekeys:
print(' No backend options\n') print(' No backend options\n')
@ -149,8 +147,7 @@ class Conf:
o = self.coredata.backend_options[k] o = self.coredata.backend_options[k]
bearr.append({'name': k, 'descr': o.description, 'value': o.value, 'choices': ''}) bearr.append({'name': k, 'descr': o.description, 'value': o.value, 'choices': ''})
self.print_aligned(bearr) self.print_aligned(bearr)
print('') print('\nBase options:')
print('Base options:')
okeys = sorted(self.coredata.base_options) okeys = sorted(self.coredata.base_options)
if not okeys: if not okeys:
print(' No base options\n') print(' No base options\n')
@ -160,16 +157,13 @@ class Conf:
o = self.coredata.base_options[k] o = self.coredata.base_options[k]
coarr.append({'name': k, 'descr': o.description, 'value': o.value, 'choices': o.choices}) coarr.append({'name': k, 'descr': o.description, 'value': o.value, 'choices': o.choices})
self.print_aligned(coarr) self.print_aligned(coarr)
print('') print('\nCompiler arguments:')
print('Compiler arguments:')
for (lang, args) in self.coredata.external_args.items(): for (lang, args) in self.coredata.external_args.items():
print(' ' + lang + '_args', str(args)) print(' ' + lang + '_args', str(args))
print('') print('\nLinker args:')
print('Linker args:')
for (lang, args) in self.coredata.external_link_args.items(): for (lang, args) in self.coredata.external_link_args.items():
print(' ' + lang + '_link_args', str(args)) print(' ' + lang + '_link_args', str(args))
print('') print('\nCompiler options:')
print('Compiler options:')
okeys = sorted(self.coredata.compiler_options) okeys = sorted(self.coredata.compiler_options)
if not okeys: if not okeys:
print(' No compiler options\n') print(' No compiler options\n')
@ -179,8 +173,7 @@ class Conf:
o = self.coredata.compiler_options[k] o = self.coredata.compiler_options[k]
coarr.append({'name': k, 'descr': o.description, 'value': o.value, 'choices': ''}) coarr.append({'name': k, 'descr': o.description, 'value': o.value, 'choices': ''})
self.print_aligned(coarr) self.print_aligned(coarr)
print('') print('\nDirectories:')
print('Directories:')
parr = [] parr = []
for key in ['prefix', for key in ['prefix',
'libdir', 'libdir',
@ -201,8 +194,7 @@ class Conf:
'value': self.coredata.get_builtin_option(key), 'value': self.coredata.get_builtin_option(key),
'choices': coredata.get_builtin_option_choices(key)}) 'choices': coredata.get_builtin_option_choices(key)})
self.print_aligned(parr) self.print_aligned(parr)
print('') print('\nProject options:')
print('Project options:')
if not self.coredata.user_options: if not self.coredata.user_options:
print(' This project does not have any options') print(' This project does not have any options')
else: else:
@ -221,8 +213,7 @@ class Conf:
'value': opt.value, 'value': opt.value,
'choices': choices}) 'choices': choices})
self.print_aligned(optarr) self.print_aligned(optarr)
print('') print('\nTesting options:')
print('Testing options:')
tarr = [] tarr = []
for key in ['stdsplit', 'errorlogs']: for key in ['stdsplit', 'errorlogs']:
tarr.append({'name': key, tarr.append({'name': key,

Loading…
Cancel
Save