Teach MSVC build system about building foreign data wrappers.

mhagander · mhagander · commit 4fc6e2fdcfce · 2008-12-20T22:04:02.000Z
Should fix recent buildfarm breakage.
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.34 2008/12/02 10:39:31 mha Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.35 2008/12/20 22:04:02 mha Exp $
 #
 use Carp;
 use Win32;
@@ -312,6 +312,15 @@ sub mkvcbuild
         $p->AddReference($postgres);
     }
 
+    $mf = Project::read_file('src\backend\foreign\Makefile');
+    $mf =~ s{\\s*[\r\n]+}{}mg;
+    $mf =~ m{FDW\s*=\s*(.*)$}m || die 'Could not match in foreign makefile' . "\n";
+    foreach my $foreign (split /\s+/,$1)
+    {
+        my $proj = $solution->AddProject($foreign . '_fdw', 'dll', 'foreign', 'src\backend\foreign\\' . $foreign);
+        $proj->AddReference($postgres);
+    }
+
     $mf = Project::read_file('src\bin\scripts\Makefile');
     $mf =~ s{\\s*[\r\n]+}{}mg;
     $mf =~ m{PROGRAMS\s*=\s*(.*)$}m || die 'Could not match in bin\scripts\Makefile' . "\n";

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.34 2008/12/02 10:39:31 mha Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.35 2008/12/20 22:04:02 mha Exp $`
`7`	`7`	`#`
`8`	`8`	`use Carp;`
`9`	`9`	`use Win32;`
`@@ -312,6 +312,15 @@ sub mkvcbuild`
`312`	`312`	`$p->AddReference($postgres);`
`313`	`313`	`}`
`314`	`314`
	`315`	`+ $mf = Project::read_file('src\backend\foreign\Makefile');`
	`316`	`+ $mf =~ s{\\s*[\r\n]+}{}mg;`
	`317`	`+ $mf =~ m{FDW\s=\s(.*)$}m \|\| die 'Could not match in foreign makefile' . "\n";`
	`318`	`+ foreach my $foreign (split /\s+/,$1)`
	`319`	`+ {`
	`320`	`+ my $proj = $solution->AddProject($foreign . '_fdw', 'dll', 'foreign', 'src\backend\foreign\\' . $foreign);`
	`321`	`+ $proj->AddReference($postgres);`
	`322`	`+ }`
	`323`	`+`
`315`	`324`	`$mf = Project::read_file('src\bin\scripts\Makefile');`
`316`	`325`	`$mf =~ s{\\s*[\r\n]+}{}mg;`
`317`	`326`	`$mf =~ m{PROGRAMS\s=\s(.*)$}m \|\| die 'Could not match in bin\scripts\Makefile' . "\n";`