database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-05 09:19:17 +03:00
Code

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

Browse Source 
PROGRAM, not just MODULE, in contrib.
This commit is contained in:
Magnus Hagander 2010-05-13 15:56:22 +00:00
parent 10d66ac8f6
commit 12bc72db60
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tools/msvc/Mkvcbuild.pm
View File

@ -3,7 +3,7 @@ package Mkvcbuild;
# #
# Package that generates build files for msvc build # 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 Carp;
use Win32; use Win32;
@ -515,7 +515,8 @@ sub AddContrib
elsif ($mf =~ /^PROGRAM\s*=\s*(.*)$/mg) elsif ($mf =~ /^PROGRAM\s*=\s*(.*)$/mg)
{ {
my $proj = $solution->AddProject($1, 'exe', 'contrib'); 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; my $objs = $1;
while ($objs =~ /\b([\w-]+\.o)\b/g) while ($objs =~ /\b([\w-]+\.o)\b/g)
{ {