Merge pull request #6999 from evva-sfw/feature/extend_error_warning_msg_as_link

Extend feature which displays errors/warnings as Link
pull/7166/head
Cruz Monrreal 2018-06-07 10:11:23 -05:00 committed by GitHub
commit a25b9f390f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions

View File

@ -19,7 +19,7 @@ from past.builtins import basestring
import re
import sys
from os import getcwd
from os.path import basename
from os.path import (basename, abspath)
from . import Notifier
from ..settings import (PRINT_COMPILER_OUTPUT_AS_LINK,
@ -87,7 +87,7 @@ class TerminalNotifier(Notifier):
event['severity'] = event['severity'].title()
if PRINT_COMPILER_OUTPUT_AS_LINK:
event['file'] = getcwd() + event['file'].strip('.')
event['file'] = abspath(event['file'])
return '[{severity}] {file}:{line}:{col}: {message}'.format(
**event)
else:

View File

@ -431,7 +431,7 @@ class mbedToolchain:
self.build_all = False
# Build output dir
self.build_dir = build_dir
self.build_dir = abspath(build_dir) if PRINT_COMPILER_OUTPUT_AS_LINK else build_dir
self.timestamp = time()
# Number of concurrent build jobs. 0 means auto (based on host system cores)
@ -986,6 +986,8 @@ class mbedToolchain:
_, ext = splitext(source)
ext = ext.lower()
source = abspath(source) if PRINT_COMPILER_OUTPUT_AS_LINK else source
if ext == '.c' or ext == '.cpp':
base, _ = splitext(object)
dep_path = base + '.d'