database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-24 14:22:24 +03:00
Code Activity

Improve logic for finding object files on OBJS lines in contrib Makefiles. If this unbreaks buildfarm mastodon, apply everywhere.

Browse Source
This commit is contained in:
Andrew Dunstan
2008-05-09 16:01:05 +00:00
parent 6b1b4641b8
commit 3159040627
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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.27 2008/04/16 14:19:56 adunstan Exp $ # $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.28 2008/05/09 16:01:05 adunstan Exp $
# #
use Carp; use Carp;
use Win32; use Win32;
@ -398,8 +398,10 @@ sub AddContrib
$mf =~ s{\\\s*[\r\n]+}{}mg; $mf =~ s{\\\s*[\r\n]+}{}mg;
my $proj = $solution->AddProject($dn, 'dll', 'contrib'); my $proj = $solution->AddProject($dn, 'dll', 'contrib');
$mf =~ /^OBJS\s*=\s*(.*)$/gm || croak "Could not find objects in MODULE_big for $n\n"; $mf =~ /^OBJS\s*=\s*(.*)$/gm || croak "Could not find objects in MODULE_big for $n\n";
foreach my $o (split /\s+/, $1) my $objs = $1;
while ($objs =~ /\b([\w-]+\.o)\b/g)
{ {
my $o = $1;
$o =~ s/\.o$/.c/; $o =~ s/\.o$/.c/;
$proj->AddFile('contrib\\' . $n . '\\' . $o); $proj->AddFile('contrib\\' . $n . '\\' . $o);
} }