Fix msvc build for localized versions of Visual C++

mhagander · mhagander · commit cd0e82532169 · 2010-10-17T16:36:54.000+02:00
Look only at the non-localized part of the output from "vcbuild /?",
which is used to determine the version of Visual Studio in use. Different
languages seem to localize different amounts of the string, but we assume
the part "Microsoft Visual C++" won't be modified.
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
@@ -66,7 +66,7 @@ sub DetermineToolVersions
     open(P,"vcbuild /? |") || die "vcbuild command not found";
     my $line = <P>;
     close(P);
-    if ($line !~ /^Microsoft\s*\(R\) Visual C\+\+ Project Builder - \D+(\d+)\.00\.\d+/)
+    if ($line !~ /^Microsoft\s*\(R\) Visual C\+\+ [^-]+ - \D+(\d+)\.00\.\d+/)
     {
         die "Unable to determine vcbuild version from first line of output!";
     }

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ sub DetermineToolVersions`
`66`	`66`	`open(P,"vcbuild /? \|") \|\| die "vcbuild command not found";`
`67`	`67`	`my $line = <P>;`
`68`	`68`	`close(P);`
`69`		`- if ($line !~ /^Microsoft\s*\(R\) Visual C\+\+ Project Builder - \D+(\d+)\.00\.\d+/)`
	`69`	`+ if ($line !~ /^Microsoft\s*\(R\) Visual C\+\+ [^-]+ - \D+(\d+)\.00\.\d+/)`
`70`	`70`	`{`
`71`	`71`	`die "Unable to determine vcbuild version from first line of output!";`
`72`	`72`	`}`