From a86a9bf9fe1266c6025024c3f6b7479e27f8da83 Mon Sep 17 00:00:00 2001
From: Andrew Dunstan <andrew@dunslane.net>
Date: Sat, 10 May 2008 15:30:11 +0000
Subject: [PATCH] Remaining pieces of fix for contrib makefiles
---
src/tools/msvc/Mkvcbuild.pm | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index d9540ec5274..93bf58a65d3 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.28 2008/05/09 16:01:05 adunstan Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.29 2008/05/10 15:30:11 adunstan Exp $
#
use Carp;
use Win32;
@@ -414,8 +414,10 @@ sub AddContrib
$mf2 =~ s{\\\s*[\r\n]+}{}mg;
$mf2 =~ /^SUBOBJS\s*=\s*(.*)$/gm
|| croak "Could not find objects in MODULE_big for $n, subdir $d\n";
- foreach my $o (split /\s+/, $1)
- {
+ $objs = $1;
+ while ($objs =~ /\b([\w-]+\.o)\b/g)
+ {
+ my $o = $1;
$o =~ s/\.o$/.c/;
$proj->AddFile('contrib\\' . $n . '\\' . $d . '\\' . $o);
}
@@ -437,8 +439,10 @@ sub AddContrib
{
my $proj = $solution->AddProject($1, 'exe', 'contrib');
$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/;
$proj->AddFile('contrib\\' . $n . '\\' . $o);
}
--
GitLab