Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Try to be locale-independent when we match VS output 

Different locales have a different number of ':' in the string
we want to match. Closes #1639.
This commit is contained in:
Paolo Borelli 2017-04-23 10:40:36 +02:00 committed by Jussi Pakkanen
parent d542b2c0cc
commit 83c5c738dd
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
authors.txt
View File

@ -83,3 +83,4 @@ Rafael Fontenelle
Michael Olbrich Michael Olbrich
Ernestas Kulik Ernestas Kulik
Thomas Hindoe Paaboel Andersen Thomas Hindoe Paaboel Andersen
Paolo Borelli

11
mesonbuild/backend/ninjabackend.py
View File

@ -175,11 +175,16 @@ int dummy;
stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout=subprocess.PIPE, stderr=subprocess.PIPE)
(stdo, _) = pc.communicate() (stdo, _) = pc.communicate()
# We want to match 'Note: including file: ' in the line
# 'Note: including file: d:\MyDir\include\stdio.h', however
# different locales have different messages with a different
# number of colons. Match up to the the drive name 'd:\'.
matchre = re.compile(rb"^(.*\s)[a-zA-Z]:\\.*stdio.h$")
for line in stdo.split(b'\r\n'): for line in stdo.split(b'\r\n'):
if line.endswith(b'stdio.h'): match = matchre.match(line)
matchstr = b':'.join(line.split(b':')[0:2]) + b':' if match:
with open(tempfilename, 'ab') as binfile: with open(tempfilename, 'ab') as binfile:
binfile.write(b'msvc_deps_prefix = ' + matchstr + b'\n') binfile.write(b'msvc_deps_prefix = ' + match.group(1) + b'\n')
return open(tempfilename, 'a') return open(tempfilename, 'a')
raise MesonException('Could not determine vs dep dependency prefix string.') raise MesonException('Could not determine vs dep dependency prefix string.')