Commit12bc72d

committed

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

PROGRAM, not just MODULE, in contrib.

1 parent10d66ac commit12bc72dCopy full SHA for 12bc72d

File tree

-2

lines changed

-2

lines changed

Lines changed: 3 additions & 2 deletions

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/1313:40:03 adunstan Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.56 2010/05/1315: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`	`{`

Comments

(0)