ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rework cc_verbose

pull/6781/head
Jimmy Brisson 2018-04-30 14:06:36 -05:00
parent bfc598d041
commit c686c6cb8b
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/notifier/__init__.py
View File

@ -78,7 +78,7 @@ class Notifier(object):
def cc_verbose(self, message, file=""): def cc_verbose(self, message, file=""):
self.notify({ self.notify({
'type': 'info', 'type': 'cc',
'severity': 'verbose', 'severity': 'verbose',
'file': file, 'file': file,
'message': message 'message': message

18
tools/notifier/term.py
View File

@ -79,7 +79,7 @@ class TerminalNotifier(Notifier):
def print_notify(self, event): def print_notify(self, event):
""" Command line notification """ Command line notification
""" """
if event['type'] == 'tool_error': if event['type'] in ('tool_error', 'info'):
return event['message'] return event['message']
elif event['type'] == 'cc' and event['severity'] != 'verbose': elif event['type'] == 'cc' and event['severity'] != 'verbose':
@ -106,21 +106,13 @@ class TerminalNotifier(Notifier):
def print_notify_verbose(self, event): def print_notify_verbose(self, event):
""" Command line notification with more verbose mode """ Command line notification with more verbose mode
""" """
if event['type'] == 'info': if event['type'] == 'info' or (event['type'] == 'cc' and
event['severity'] == 'verbose'):
return event['message'] return event['message']
elif event['type'] == 'debug': elif event['type'] == 'debug':
return "[DEBUG] {message}".format(**event) return "[DEBUG] {message}".format(**event)
elif event['type'] == 'cc': elif event['type'] in ('progress', 'cc'):
event['severity'] = event['severity'].title() return self.print_notify(event)
event['file'] = basename(event['file'])
event['mcu_name'] = "None"
event['tgt_name'] = event.get('target_name', 'unknown').upper()
event['tc_name'] = event.get('toolchain_name', 'unknown').upper()
return ('[{severity}] {tgt_name}::{tc_name}::{file}@{line}: '
'{message}'.format(**event))
elif event['type'] == 'progress':
return self.print_notify(event) # standard handle
COLOR_MATCHER = re.compile(r"(\w+)(\W+on\W+\w+)?") COLOR_MATCHER = re.compile(r"(\w+)(\W+on\W+\w+)?")
def colorstring_to_escapecode(self, color_string): def colorstring_to_escapecode(self, color_string):