Merge branch 'msvcdeps-logging' into 'master'

msvcdeps: Tweak debug output

See merge request ita1024/waf!2287
This commit is contained in:
Michael Vincent 2020-04-23 00:21:07 +00:00
commit 26b6f4178b
1 changed files with 5 additions and 2 deletions

View File

@ -211,11 +211,14 @@ def exec_command(self, cmd, **kw):
# get one from the exception object
ret = getattr(e, 'returncode', 1)
Logs.debug('msvcdeps: Running for: %s' % self.inputs[0])
for line in raw_out.splitlines():
if line.startswith(INCLUDE_PATTERN):
inc_path = line[len(INCLUDE_PATTERN):].strip()
# Only strip whitespace after log to preserve
# dependency structure in debug output
inc_path = line[len(INCLUDE_PATTERN):]
Logs.debug('msvcdeps: Regex matched %s', inc_path)
self.msvcdeps_paths.append(inc_path)
self.msvcdeps_paths.append(inc_path.strip())
else:
out.append(line)