From: Magnus Hagander <magnus@hagander.net>
Date: Thu, 13 May 2010 15:56:22 +0000 (+0000)
Subject: Properly support multi-line entires (such as OBJS=) when building
X-Git-Tag: REL9_0_BETA2~133
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=12bc72db6053987bb39f781b7952d02a795d5e9b;p=postgresql

Properly support multi-line entires (such as OBJS=) when building
PROGRAM, not just MODULE, in contrib.
---

diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 04766e3e60..4eb2eee2bc 100644
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -3,7 +3,7 @@ package Mkvcbuild;
 #
 # Package that generates build files for msvc build
 #
-# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.55 2010/05/13 13:40:03 adunstan Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.56 2010/05/13 15:56:22 mha Exp $
 #
 use Carp;
 use Win32;
@@ -515,7 +515,8 @@ sub AddContrib
     elsif ($mf =~ /^PROGRAM\s*=\s*(.*)$/mg)
     {
         my $proj = $solution->AddProject($1, 'exe', 'contrib');
-        $mf =~ /^OBJS\s*=\s*(.*)$/gm || croak "Could not find objects in MODULE_big for $n\n";
+        $mf =~ s{\\\s*[\r\n]+}{}mg;
+        $mf =~ /^OBJS\s*=\s*(.*)$/gm || croak "Could not find objects in PROGRAM for $n\n";
         my $objs = $1;
         while ($objs =~ /\b([\w-]+\.o)\b/g)
         {