aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/interpreter.py
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2020-02-25 10:19:50 -0500
committerXavier Claessens <xavier.claessens@collabora.com>2020-02-26 14:24:12 -0500
commitc175e97a8862be5c87196aa94cb911975c84cf84 (patch)
tree8d91387586ce9714bc9d8ec30bff09b2322652a3 /mesonbuild/interpreter.py
parentf66b04b0996eae5cd7b0ad007435d5a51f28b691 (diff)
downloadmeson-c175e97a8862be5c87196aa94cb911975c84cf84.zip
meson-c175e97a8862be5c87196aa94cb911975c84cf84.tar.gz
meson-c175e97a8862be5c87196aa94cb911975c84cf84.tar.bz2
summary: Add list_sep keyword argument
This allows having lists on a single line instead of having each value aligned on a new line.
Diffstat (limited to 'mesonbuild/interpreter.py')
-rw-r--r--mesonbuild/interpreter.py21
1 files changed, 13 insertions, 8 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index c29ed89..c9e559c 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -1791,6 +1791,9 @@ class Summary:
bool_yn = kwargs.get('bool_yn', False)
if not isinstance(bool_yn, bool):
raise InterpreterException('bool_yn keyword argument must be boolean')
+ list_sep = kwargs.get('list_sep')
+ if list_sep is not None and not isinstance(list_sep, str):
+ raise InterpreterException('list_sep keyword argument must be string')
for k, v in values.items():
if k in self.sections[section]:
raise InterpreterException('Summary section {!r} already have key {!r}'.format(section, k))
@@ -1803,9 +1806,7 @@ class Summary:
formatted_values.append(mlog.green('YES') if i else mlog.red('NO'))
else:
formatted_values.append(i)
- if not formatted_values:
- formatted_values = ['']
- self.sections[section][k] = formatted_values
+ self.sections[section][k] = (formatted_values, list_sep)
self.max_key_len = max(self.max_key_len, len(k))
def dump(self):
@@ -1815,11 +1816,14 @@ class Summary:
if section:
mlog.log(' ', mlog.bold(section))
for k, v in values.items():
+ v, list_sep = v
indent = self.max_key_len - len(k) + 3
- mlog.log(' ' * indent, k + ':', v[0])
- indent = self.max_key_len + 5
- for i in v[1:]:
- mlog.log(' ' * indent, i)
+ end = ' ' if v else ''
+ mlog.log(' ' * indent, k + ':', end=end)
+ if list_sep is None:
+ indent = self.max_key_len + 6
+ list_sep = '\n' + ' ' * indent
+ mlog.log(*v, sep=list_sep)
mlog.log('') # newline
@@ -2949,7 +2953,8 @@ external dependencies (including libraries) must go to "dependencies".''')
mlog.log(mlog.bold('Message:'), *args)
@noArgsFlattening
- @permittedKwargs({'section', 'bool_yn'})
+ @FeatureNewKwargs('summary', '0.54.0', ['list_sep'])
+ @permittedKwargs({'section', 'bool_yn', 'list_sep'})
@FeatureNew('summary', '0.53.0')
def func_summary(self, node, args, kwargs):
if len(args) == 1: