Merge pull request #6270 from evva-sfw/error_warning_msg_as_link

Add parameter in tools settings to show error/warning as Link
pull/6378/head
Cruz Monrreal 2018-03-15 11:49:33 -05:00 committed by GitHub
commit 0828727643
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 4 deletions

View File

@ -43,3 +43,6 @@ from os.path import join, abspath, dirname
# mbed.org username
#MBED_ORG_USER = ""
# Print compiler warnings and errors as link format
#PRINT_COMPILER_OUTPUT_AS_LINK = False

View File

@ -54,6 +54,9 @@ BUILD_OPTIONS = []
# mbed.org username
MBED_ORG_USER = ""
# Print compiler warnings and errors as link format
PRINT_COMPILER_OUTPUT_AS_LINK = False
CLI_COLOR_MAP = {
"warning": "yellow",
"error" : "red"
@ -74,7 +77,7 @@ except ImportError:
# User Settings (env vars)
##############################################################################
_ENV_PATHS = ['ARM_PATH', 'GCC_ARM_PATH', 'GCC_CR_PATH', 'IAR_PATH',
'ARMC6_PATH']
'ARMC6_PATH', 'PRINT_COMPILER_OUTPUT_AS_LINK']
for _n in _ENV_PATHS:
if getenv('MBED_'+_n):

View File

@ -35,7 +35,7 @@ import fnmatch
from ..utils import (run_cmd, mkdir, rel_path, ToolException,
NotSupportedException, split_path, compile_worker)
from ..settings import MBED_ORG_USER
from ..settings import MBED_ORG_USER, PRINT_COMPILER_OUTPUT_AS_LINK
from .. import hooks
from ..memap import MemapParser
@ -462,8 +462,13 @@ class mbedToolchain:
elif event['type'] == 'cc':
event['severity'] = event['severity'].title()
event['file'] = basename(event['file'])
msg = '[%(severity)s] %(file)s@%(line)s,%(col)s: %(message)s' % event
if PRINT_COMPILER_OUTPUT_AS_LINK:
event['file'] = getcwd() + event['file'].strip('.')
msg = '[%(severity)s] %(file)s:%(line)s:%(col)s: %(message)s' % event
else:
event['file'] = basename(event['file'])
msg = '[%(severity)s] %(file)s@%(line)s,%(col)s: %(message)s' % event
elif event['type'] == 'progress':
if 'percent' in event: