Exclude part of the product name string that is localized in Japanese versions

mhagander · mhagander · commit 50a4054d63ac · 2009-12-30T12:26:41.000Z
of MSVC when detecting MSVC version.

Hiroshi Inoue
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
@@ -3,7 +3,7 @@ package Solution;
 #
 # Package that encapsulates a Visual C++ solution file generation
 #
-# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.49 2009/12/23 13:27:04 mha Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.50 2009/12/30 12:26:41 mha Exp $
 #
 use Carp;
 use strict;
@@ -66,7 +66,7 @@ sub DetermineToolVersions
     open(P,"vcbuild /? |") || die "vcbuild command not found";
     my $line = <P>;
     close(P);
-    if ($line !~ /^Microsoft \(R\) Visual C\+\+ Project Builder - Command Line Version (\d+)\.00\.\d+/) {
+    if ($line !~ /^Microsoft\s*\(R\) Visual C\+\+ Project Builder - \D+(\d+)\.00\.\d+/) {
        die "Unable to determine vcbuild version from first line of output!";
     }
     if ($1 == 8) { $self->{vcver} = '8.00' }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package Solution;`
`3`	`3`	`#`
`4`	`4`	`# Package that encapsulates a Visual C++ solution file generation`
`5`	`5`	`#`
`6`		`-# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.49 2009/12/23 13:27:04 mha Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.50 2009/12/30 12:26:41 mha Exp $`
`7`	`7`	`#`
`8`	`8`	`use Carp;`
`9`	`9`	`use strict;`
`@@ -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 \(R\) Visual C\+\+ Project Builder - Command Line Version (\d+)\.00\.\d+/) {`
	`69`	`+ if ($line !~ /^Microsoft\s*\(R\) Visual C\+\+ Project Builder - \D+(\d+)\.00\.\d+/) {`
`70`	`70`	`die "Unable to determine vcbuild version from first line of output!";`
`71`	`71`	`}`
`72`	`72`	`if ($1 == 8) { $self->{vcver} = '8.00' }`