Properly support multi-line entires (such as OBJS=) when building

mhagander · mhagander · commit 12bc72db6053 · 2010-05-13T15:56:22.000Z
PROGRAM, not just MODULE, in contrib.
diff --git 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)
         {

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package Mkvcbuild;`
`3`	`3`	`#`
`4`	`4`	`# Package that generates build files for msvc build`
`5`	`5`	`#`
`6`		`-# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.55 2010/05/13 13:40:03 adunstan Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.56 2010/05/13 15:56:22 mha Exp $`
`7`	`7`	`#`
`8`	`8`	`use Carp;`
`9`	`9`	`use Win32;`
`@@ -515,7 +515,8 @@ sub AddContrib`
`515`	`515`	`elsif ($mf =~ /^PROGRAM\s=\s(.*)$/mg)`
`516`	`516`	`{`
`517`	`517`	`my $proj = $solution->AddProject($1, 'exe', 'contrib');`
`518`		`- $mf =~ /^OBJS\s=\s(.*)$/gm \|\| croak "Could not find objects in MODULE_big for $n\n";`
	`518`	`+ $mf =~ s{\\\s*[\r\n]+}{}mg;`
	`519`	`+ $mf =~ /^OBJS\s=\s(.*)$/gm \|\| croak "Could not find objects in PROGRAM for $n\n";`
`519`	`520`	`my $objs = $1;`
`520`	`521`	`while ($objs =~ /\b([\w-]+\.o)\b/g)`
`521`	`522`	`{`