From: Magnus Hagander <magnus@hagander.net>
Date: Wed, 30 Dec 2009 12:26:41 +0000 (+0000)
Subject: Exclude part of the product name string that is localized in Japanese versions
X-Git-Tag: REL9_0_ALPHA4~391
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=50a4054d63ac8114df0bc280a99458f7b451114c;p=postgresql

Exclude part of the product name string that is localized in Japanese versions
of MSVC when detecting MSVC version.

Hiroshi Inoue
---

diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index 13bfb7bb0e..d01a81f71a 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' }