From 2890c33084ab7ef3fe985cb72cb46ac5fe5ebf02 Mon Sep 17 00:00:00 2001
From: Magnus Hagander <magnus@hagander.net>
Date: Wed, 3 Oct 2007 13:43:24 +0000
Subject: [PATCH] Build two more .DEF files for ecpg instead of using default
 ones.

---
 src/tools/msvc/Mkvcbuild.pm | 4 +++-
 src/tools/msvc/Solution.pm  | 4 +++-
 src/tools/msvc/clean.bat    | 5 ++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 6cabc8c41b..58c51652c8 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.20 2007/10/03 12:34:29 mha Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.21 2007/10/03 13:43:24 mha Exp $
 #
 use Carp;
 use Win32;
@@ -137,6 +137,7 @@ sub mkvcbuild
       $solution->AddProject('libpgtypes','dll','interfaces','src\interfaces\ecpg\pgtypeslib');
     $pgtypes->AddDefine('FRONTEND');
     $pgtypes->AddReference($libpgport);
+    $pgtypes->UseDef('src\interfaces\ecpg\pgtypeslib\pgtypeslib.def');
     $pgtypes->AddIncludeDir('src\interfaces\ecpg\include');
 
     my $libecpg =$solution->AddProject('libecpg','dll','interfaces','src\interfaces\ecpg\ecpglib');
@@ -152,6 +153,7 @@ sub mkvcbuild
       $solution->AddProject('libecpg_compat','dll','interfaces','src\interfaces\ecpg\compatlib');
     $libecpgcompat->AddIncludeDir('src\interfaces\ecpg\include');
     $libecpgcompat->AddIncludeDir('src\interfaces\libpq');
+    $libecpgcompat->UseDef('src\interfaces\ecpg\compatlib\compatlib.def');
     $libecpgcompat->AddReference($pgtypes,$libecpg,$libpgport);
 
     my $ecpg = $solution->AddProject('ecpg','exe','interfaces','src\interfaces\ecpg\preproc');
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index 95f91332c5..3521d1442d 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -3,7 +3,7 @@ package Solution;
 #
 # Package that encapsulates a Visual C++ solution file generation
 #
-# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.33 2007/10/03 12:11:00 mha Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.34 2007/10/03 13:43:24 mha Exp $
 #
 use Carp;
 use strict;
@@ -141,6 +141,8 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY
 
     $self->GenerateDefFile("src\\interfaces\\libpq\\libpqdll.def","src\\interfaces\\libpq\\exports.txt","LIBPQ");
     $self->GenerateDefFile("src\\interfaces\\ecpg\\ecpglib\\ecpglib.def","src\\interfaces\\ecpg\\ecpglib\\exports.txt","LIBECPG");
+    $self->GenerateDefFile("src\\interfaces\\ecpg\\compatlib\\compatlib.def","src\\interfaces\\ecpg\\compatlib\\exports.txt","LIBECPG_COMPAT");
+    $self->GenerateDefFile("src\\interfaces\\ecpg\\pgtypeslib\\pgtypeslib.def","src\\interfaces\\ecpg\\pgtypeslib\\exports.txt","LIBPGTYPES");
 
     if (IsNewer("src\\backend\\utils\\fmgrtab.c","src\\include\\catalog\\pg_proc.h"))
     {
diff --git a/src/tools/msvc/clean.bat b/src/tools/msvc/clean.bat
index f3db698b3c..ef43ea6444 100755
--- a/src/tools/msvc/clean.bat
+++ b/src/tools/msvc/clean.bat
@@ -1,5 +1,5 @@
 @echo off
-REM $PostgreSQL: pgsql/src/tools/msvc/clean.bat,v 1.6 2007/07/07 07:43:21 mha Exp $
+REM $PostgreSQL: pgsql/src/tools/msvc/clean.bat,v 1.7 2007/10/03 13:43:24 mha Exp $
 
 set D=%CD%
 if exist ..\msvc if exist ..\..\..\src cd ..\..\..
@@ -31,7 +31,10 @@ call :del src\bin\psql\sql_help.h
 
 call :del src\interfaces\libpq\libpq.rc
 call :del src\interfaces\libpq\libpqdll.def
+call :del src\interfaces\ecpg\compatlib\compatlib.def
+call :del src\interfaces\ecpg\ecpglib\ecpglib.def
 call :del src\interfaces\ecpg\include\ecpg_config.h
+call :del src\interfaces\ecpg\pgtypeslib\pgtypeslib.def
 call :del src\interfaces\ecpg\preproc\preproc.c
 call :del src\interfaces\ecpg\preproc\preproc.h
 
-- 
2.11.0