diff options
| author | Magnus Hagander <magnus@hagander.net> | 2009-12-30 12:26:41 +0000 |
|---|---|---|
| committer | Magnus Hagander <magnus@hagander.net> | 2009-12-30 12:26:41 +0000 |
| commit | 50a4054d63ac8114df0bc280a99458f7b451114c (patch) | |
| tree | 5a44bf30ddb62d20f7ea646a3bb892cc5cbbb116 | |
| parent | ff1e1e45b913e7c94a9a972645dbd016cf6368fc (diff) | |
| download | postgresql-50a4054d63ac8114df0bc280a99458f7b451114c.tar.gz postgresql-50a4054d63ac8114df0bc280a99458f7b451114c.zip | |
Exclude part of the product name string that is localized in Japanese versions
of MSVC when detecting MSVC version.
Hiroshi Inoue
| -rw-r--r-- | src/tools/msvc/Solution.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index 13bfb7bb0eb..d01a81f71a1 100644 --- 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' } |