Generate the various .def files for libpq DLLs from a single list of

exportable functions.  The .def files are removed from CVS, but will
still be present in distribution tarballs, since we can't assume that
Windows boxes will have sed.

src/interfaces/libpq/.cvsignore

+libpqdll.def
+libpqddll.def
+blibpqdll.def

src/interfaces/libpq/Makefile

@@ -2,9 +2,10 @@
 #
 # Makefile for src/interfaces/libpq library
 #
-# Copyright (c) 1994, Regents of the University of California
+# Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
+# Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.118 2004/10/16 03:26:43 momjian Exp $
+# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.119 2004/10/16 20:10:56 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -52,7 +53,7 @@ SHLIB_LINK += -lwsock32 -lws2_32 $(filter -leay32 -lssleay32, $(LIBS))
 endif
 
 
-all: $(PTHREAD_H_WIN32) $(top_builddir)/src/port/pg_config_paths.h all-lib
+all: $(PTHREAD_H_WIN32) $(top_builddir)/src/port/pg_config_paths.h def-files all-lib
 
 # Shared library stuff
 include $(top_srcdir)/src/Makefile.shlib
@@ -79,6 +80,42 @@ encnames.c wchar.c : % : $(backend_src)/utils/mb/%
 	rm -f $@ && $(LN_S) $< .
 
 
+# We need several not-quite-identical variants of .DEF files to build libpq
+# DLLs for Windows.  These are made from the single source file exports.txt.
+# Since we can't assume that Windows boxes will have sed, the .DEF files are
+# always built and included in distribution tarballs.
+
+distprep: def-files
+
+.PHONY: def-files
+
+def-files: $(srcdir)/libpqdll.def $(srcdir)/libpqddll.def $(srcdir)/blibpqdll.def
+
+$(srcdir)/libpqdll.def: exports.txt
+	echo '; DEF file for MS VC++' > $@
+	echo 'LIBRARY LIBPQ' >> $@
+	echo 'DESCRIPTION "PostgreSQL Client Library"' >> $@
+	echo 'EXPORTS' >> $@
+	sed -e '/^#/d' -e 's/^\(.* \)\([0-9][0-9]*\)/    \1@ \2/' < $< >> $@
+
+$(srcdir)/libpqddll.def: exports.txt
+	echo '; DEF file for MS VC++' > $@
+	echo 'LIBRARY LIBPQD' >> $@
+	echo 'DESCRIPTION "PostgreSQL Client Library"' >> $@
+	echo 'EXPORTS' >> $@
+	sed -e '/^#/d' -e 's/^\(.* \)\([0-9][0-9]*\)/    \1@ \2/' < $< >> $@
+
+$(srcdir)/blibpqdll.def: exports.txt
+	echo '; DEF file for Borland C++ Builder' > $@
+	echo 'LIBRARY BLIBPQ' >> $@
+	echo 'DESCRIPTION "PostgreSQL Client Library"' >> $@
+	echo 'EXPORTS' >> $@
+	sed -e '/^#/d' -e 's/^\(.* \)\([0-9][0-9]*\)/    _\1@ \2/' < $< >> $@
+	echo '' >> $@
+	echo '; Aliases for MS compatible names' >> $@
+	sed -e '/^#/d' -e 's/^\(.* \)\([0-9][0-9]*\)/    \1= _\1/' < $< | sed 's/ *$$//' >> $@
+
+
 ifneq ($(PTHREAD_H_WIN32), "")
 pthread.h : % : $(top_srcdir)/src/interfaces/libpq/pthread.h.win
 	rm -f $@ && $(LN_S) $< .
@@ -99,5 +136,8 @@ installdirs:
 uninstall: uninstall-lib
 	rm -f $(DESTDIR)$(includedir)/libpq-fe.h $(DESTDIR)$(includedir_internal)/libpq-int.h $(DESTDIR)$(includedir_internal)/pqexpbuffer.h
 
-clean distclean maintainer-clean: clean-lib
+clean distclean: clean-lib
 	rm -f $(OBJS) crypt.c getaddrinfo.c inet_aton.c noblock.c pgstrcasecmp.c snprintf.c strerror.c open.c thread.c dllist.c md5.c ip.c encnames.c wchar.c pthread.h
+
+maintainer-clean: distclean
+	rm -f $(srcdir)/libpqdll.def $(srcdir)/libpqddll.def $(srcdir)/blibpqdll.def

src/interfaces/libpq/exports.txt

+# Functions to be exported by libpq DLLs
+PQconnectdb               1
+PQsetdbLogin              2
+PQconndefaults            3
+PQfinish                  4
+PQreset                   5
+PQrequestCancel           6
+PQdb                      7
+PQuser                    8
+PQpass                    9
+PQhost                    10
+PQport                    11
+PQtty                     12
+PQoptions                 13
+PQstatus                  14
+PQerrorMessage            15
+PQsocket                  16
+PQbackendPID              17
+PQtrace                   18
+PQuntrace                 19
+PQsetNoticeProcessor      20
+PQexec                    21
+PQnotifies                22
+PQsendQuery               23
+PQgetResult               24
+PQisBusy                  25
+PQconsumeInput            26
+PQgetline                 27
+PQputline                 28
+PQgetlineAsync            29
+PQputnbytes               30
+PQendcopy                 31
+PQfn                      32
+PQresultStatus            33
+PQntuples                 34
+PQnfields                 35
+PQbinaryTuples            36
+PQfname                   37
+PQfnumber                 38
+PQftype                   39
+PQfsize                   40
+PQfmod                    41
+PQcmdStatus               42
+PQoidStatus               43
+PQcmdTuples               44
+PQgetvalue                45
+PQgetlength               46
+PQgetisnull               47
+PQclear                   48
+PQmakeEmptyPGresult       49
+PQprint                   50
+PQdisplayTuples           51
+PQprintTuples             52
+lo_open                   53
+lo_close                  54
+lo_read                   55
+lo_write                  56
+lo_lseek                  57
+lo_creat                  58
+lo_tell                   59
+lo_unlink                 60
+lo_import                 61
+lo_export                 62
+pgresStatus               63
+PQmblen                   64
+PQresultErrorMessage      65
+PQresStatus               66
+termPQExpBuffer           67
+appendPQExpBufferChar     68
+initPQExpBuffer           69
+resetPQExpBuffer          70
+PQoidValue                71
+PQclientEncoding          72
+PQenv2encoding            73
+appendBinaryPQExpBuffer   74
+appendPQExpBufferStr      75
+destroyPQExpBuffer        76
+createPQExpBuffer         77
+PQconninfoFree            78
+PQconnectPoll             79
+PQconnectStart            80
+PQflush                   81
+PQisnonblocking           82
+PQresetPoll               83
+PQresetStart              84
+PQsetClientEncoding       85
+PQsetnonblocking          86
+PQfreeNotify              87
+PQescapeString            88
+PQescapeBytea             89
+printfPQExpBuffer         90
+appendPQExpBuffer         91
+pg_encoding_to_char       92
+pg_utf_mblen              93
+PQunescapeBytea           94
+PQfreemem                 95
+PQtransactionStatus       96
+PQparameterStatus         97
+PQprotocolVersion         98
+PQsetErrorVerbosity       99
+PQsetNoticeReceiver       100
+PQexecParams              101
+PQsendQueryParams         102
+PQputCopyData             103
+PQputCopyEnd              104
+PQgetCopyData             105
+PQresultErrorField        106
+PQftable                  107
+PQftablecol               108
+PQfformat                 109
+PQexecPrepared            110
+PQsendQueryPrepared       111
+PQdsplen                  112
+PQserverVersion           113
+PQgetssl                  114
+pg_char_to_encoding       115
+pg_valid_server_encoding  116
+pqsignal                  117

src/interfaces/libpq/libpqddll.def

-; DEF file for MS VC++
-LIBRARY LIBPQD
-DESCRIPTION "PostgreSQL Client Library"
-EXPORTS
-    PQconnectdb             @ 1
-    PQsetdbLogin            @ 2
-    PQconndefaults          @ 3
-    PQfinish                @ 4
-    PQreset                 @ 5
-    PQrequestCancel         @ 6
-    PQdb                    @ 7
-    PQuser                  @ 8
-    PQpass                  @ 9
-    PQhost                  @ 10
-    PQport                  @ 11
-    PQtty                   @ 12
-    PQoptions               @ 13
-    PQstatus                @ 14
-    PQerrorMessage          @ 15
-    PQsocket                @ 16
-    PQbackendPID            @ 17
-    PQtrace                 @ 18
-    PQuntrace               @ 19
-    PQsetNoticeProcessor    @ 20
-    PQexec                  @ 21
-    PQnotifies              @ 22
-    PQsendQuery             @ 23
-    PQgetResult             @ 24
-    PQisBusy                @ 25
-    PQconsumeInput          @ 26
-    PQgetline               @ 27
-    PQputline               @ 28
-    PQgetlineAsync          @ 29
-    PQputnbytes             @ 30
-    PQendcopy               @ 31
-    PQfn                    @ 32
-    PQresultStatus          @ 33
-    PQntuples               @ 34
-    PQnfields               @ 35
-    PQbinaryTuples          @ 36
-    PQfname                 @ 37
-    PQfnumber               @ 38
-    PQftype                 @ 39
-    PQfsize                 @ 40
-    PQfmod                  @ 41
-    PQcmdStatus             @ 42
-    PQoidStatus             @ 43
-    PQcmdTuples             @ 44
-    PQgetvalue              @ 45
-    PQgetlength             @ 46
-    PQgetisnull             @ 47
-    PQclear                 @ 48
-    PQmakeEmptyPGresult     @ 49
-    PQprint                 @ 50
-    PQdisplayTuples         @ 51
-    PQprintTuples           @ 52
-    lo_open                 @ 53
-    lo_close                @ 54
-    lo_read                 @ 55
-    lo_write                @ 56
-    lo_lseek                @ 57
-    lo_creat                @ 58
-    lo_tell                 @ 59
-    lo_unlink               @ 60
-    lo_import               @ 61
-    lo_export               @ 62
-    pgresStatus             @ 63
-    PQmblen                 @ 64
-    PQresultErrorMessage    @ 65
-    PQresStatus             @ 66
-    termPQExpBuffer         @ 67
-    appendPQExpBufferChar   @ 68
-    initPQExpBuffer         @ 69
-    resetPQExpBuffer        @ 70
-    PQoidValue              @ 71
-    PQclientEncoding        @ 72
-    PQenv2encoding          @ 73
-    appendBinaryPQExpBuffer @ 74
-    appendPQExpBufferStr    @ 75
-    destroyPQExpBuffer      @ 76
-    createPQExpBuffer       @ 77
-    PQconninfoFree          @ 78
-    PQconnectPoll           @ 79
-    PQconnectStart          @ 80
-    PQflush                 @ 81
-    PQisnonblocking         @ 82
-    PQresetPoll             @ 83
-    PQresetStart            @ 84
-    PQsetClientEncoding     @ 85
-    PQsetnonblocking        @ 86
-    PQfreeNotify            @ 87
-    PQescapeString          @ 88
-    PQescapeBytea           @ 89
-    printfPQExpBuffer       @ 90
-    appendPQExpBuffer       @ 91
-    pg_encoding_to_char     @ 92
-    pg_utf_mblen            @ 93
-    PQunescapeBytea         @ 94
-    PQfreemem               @ 95
-    PQtransactionStatus     @ 96
-    PQparameterStatus       @ 97
-    PQprotocolVersion       @ 98
-    PQsetErrorVerbosity     @ 99
-    PQsetNoticeReceiver     @ 100
-    PQexecParams            @ 101
-    PQsendQueryParams       @ 102
-    PQputCopyData           @ 103
-    PQputCopyEnd            @ 104
-    PQgetCopyData           @ 105
-    PQresultErrorField      @ 106
-    PQftable                @ 107
-    PQftablecol             @ 108
-    PQfformat               @ 109
-    PQexecPrepared          @ 110
-    PQsendQueryPrepared     @ 111
-    PQdsplen                @ 112
-    PQserverVersion         @ 113
-    PQgetssl                @ 114
-    pg_char_to_encoding     @ 115
-    pg_valid_server_encoding @ 116
-    pqsignal                @ 117

src/interfaces/libpq/libpqdll.def

-; DEF file for MS VC++
-LIBRARY LIBPQ
-DESCRIPTION "PostgreSQL Client Library"
-EXPORTS
-    PQconnectdb             @ 1
-    PQsetdbLogin            @ 2
-    PQconndefaults          @ 3
-    PQfinish                @ 4
-    PQreset                 @ 5
-    PQrequestCancel         @ 6
-    PQdb                    @ 7
-    PQuser                  @ 8
-    PQpass                  @ 9
-    PQhost                  @ 10
-    PQport                  @ 11
-    PQtty                   @ 12
-    PQoptions               @ 13
-    PQstatus                @ 14
-    PQerrorMessage          @ 15
-    PQsocket                @ 16
-    PQbackendPID            @ 17
-    PQtrace                 @ 18
-    PQuntrace               @ 19
-    PQsetNoticeProcessor    @ 20
-    PQexec                  @ 21
-    PQnotifies              @ 22
-    PQsendQuery             @ 23
-    PQgetResult             @ 24
-    PQisBusy                @ 25
-    PQconsumeInput          @ 26
-    PQgetline               @ 27
-    PQputline               @ 28
-    PQgetlineAsync          @ 29
-    PQputnbytes             @ 30
-    PQendcopy               @ 31
-    PQfn                    @ 32
-    PQresultStatus          @ 33
-    PQntuples               @ 34
-    PQnfields               @ 35
-    PQbinaryTuples          @ 36
-    PQfname                 @ 37
-    PQfnumber               @ 38
-    PQftype                 @ 39
-    PQfsize                 @ 40
-    PQfmod                  @ 41
-    PQcmdStatus             @ 42
-    PQoidStatus             @ 43
-    PQcmdTuples             @ 44
-    PQgetvalue              @ 45
-    PQgetlength             @ 46
-    PQgetisnull             @ 47
-    PQclear                 @ 48
-    PQmakeEmptyPGresult     @ 49
-    PQprint                 @ 50
-    PQdisplayTuples         @ 51
-    PQprintTuples           @ 52
-    lo_open                 @ 53
-    lo_close                @ 54
-    lo_read                 @ 55
-    lo_write                @ 56
-    lo_lseek                @ 57
-    lo_creat                @ 58
-    lo_tell                 @ 59
-    lo_unlink               @ 60
-    lo_import               @ 61
-    lo_export               @ 62
-    pgresStatus             @ 63
-    PQmblen                 @ 64
-    PQresultErrorMessage    @ 65
-    PQresStatus             @ 66
-    termPQExpBuffer         @ 67
-    appendPQExpBufferChar   @ 68
-    initPQExpBuffer         @ 69
-    resetPQExpBuffer        @ 70
-    PQoidValue              @ 71
-    PQclientEncoding        @ 72
-    PQenv2encoding          @ 73
-    appendBinaryPQExpBuffer @ 74
-    appendPQExpBufferStr    @ 75
-    destroyPQExpBuffer      @ 76
-    createPQExpBuffer       @ 77
-    PQconninfoFree          @ 78
-    PQconnectPoll           @ 79
-    PQconnectStart          @ 80
-    PQflush                 @ 81
-    PQisnonblocking         @ 82
-    PQresetPoll             @ 83
-    PQresetStart            @ 84
-    PQsetClientEncoding     @ 85
-    PQsetnonblocking        @ 86
-    PQfreeNotify            @ 87
-    PQescapeString          @ 88
-    PQescapeBytea           @ 89
-    printfPQExpBuffer       @ 90
-    appendPQExpBuffer       @ 91
-    pg_encoding_to_char     @ 92
-    pg_utf_mblen            @ 93
-    PQunescapeBytea         @ 94
-    PQfreemem               @ 95
-    PQtransactionStatus     @ 96
-    PQparameterStatus       @ 97
-    PQprotocolVersion       @ 98
-    PQsetErrorVerbosity     @ 99
-    PQsetNoticeReceiver     @ 100
-    PQexecParams            @ 101
-    PQsendQueryParams       @ 102
-    PQputCopyData           @ 103
-    PQputCopyEnd            @ 104
-    PQgetCopyData           @ 105
-    PQresultErrorField      @ 106
-    PQftable                @ 107
-    PQftablecol             @ 108
-    PQfformat               @ 109
-    PQexecPrepared          @ 110
-    PQsendQueryPrepared     @ 111
-    PQdsplen                @ 112
-    PQserverVersion         @ 113
-    PQgetssl                @ 114
-    pg_char_to_encoding     @ 115
-    pg_valid_server_encoding @ 116
-    pqsignal                @ 117