Remaining pieces of fix for contrib makefiles

adunstan · adunstan · commit a86a9bf9fe12 · 2008-05-10T15:30:11.000Z
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.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);
         }

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.28 2008/05/09 16:01:05 adunstan Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.29 2008/05/10 15:30:11 adunstan Exp $`
`7`	`7`	`#`
`8`	`8`	`use Carp;`
`9`	`9`	`use Win32;`
`@@ -414,8 +414,10 @@ sub AddContrib`
`414`	`414`	`$mf2 =~ s{\\\s*[\r\n]+}{}mg;`
`415`	`415`	`$mf2 =~ /^SUBOBJS\s=\s(.*)$/gm`
`416`	`416`	`\|\| croak "Could not find objects in MODULE_big for $n, subdir $d\n";`
`417`		`- foreach my $o (split /\s+/, $1)`
`418`		`- {`
	`417`	`+ $objs = $1;`
	`418`	`+ while ($objs =~ /\b([\w-]+\.o)\b/g)`
	`419`	`+ {`
	`420`	`+ my $o = $1;`
`419`	`421`	`$o =~ s/\.o$/.c/;`
`420`	`422`	`$proj->AddFile('contrib\\' . $n . '\\' . $d . '\\' . $o);`
`421`	`423`	`}`
`@@ -437,8 +439,10 @@ sub AddContrib`
`437`	`439`	`{`
`438`	`440`	`my $proj = $solution->AddProject($1, 'exe', 'contrib');`
`439`	`441`	`$mf =~ /^OBJS\s=\s(.*)$/gm \|\| croak "Could not find objects in MODULE_big for $n\n";`
`440`		`- foreach my $o (split /\s+/, $1)`
	`442`	`+ my $objs = $1;`
	`443`	`+ while ($objs =~ /\b([\w-]+\.o)\b/g)`
`441`	`444`	`{`
	`445`	`+ my $o = $1;`
`442`	`446`	`$o =~ s/\.o$/.c/;`
`443`	`447`	`$proj->AddFile('contrib\\' . $n . '\\' . $o);`
`444`	`448`	`}`