--- doc/src/sgml/install-win32.sgml.orig Fri Jan 6 14:09:29 2006
+++ doc/src/sgml/install-win32.sgml Fri Jan 6 15:06:49 2006
@@ -83,13 +83,27 @@
+ bin\pg_config\Release\pg_config.exe
bin\psql\Release\psql.exe
+ bin\pg_dump\Release\pg_dump.exe
+ bin\pg_dump\Release\pg_dumpall.exe
+ bin\pg_dump\Release\pg_restore.exe
+ bin\scripts\Release\clusterdb.exe
+ bin\scripts\Release\createdb.exe
+ bin\scripts\Release\createuser.exe
+ bin\scripts\Release\createlang.exe
+ bin\scripts\Release\dropdb.exe
+ bin\scripts\Release\dropuser.exe
+ bin\scripts\Release\droplang.exe
+ bin\scripts\Release\vacuumdb.exe
+ bin\scripts\Release\reindexdb.exe
- The PostgreSQL interactive terminal
+ The PostgreSQL client applications and utilities.
+
--- src/bin/pg_dump/pg_backup_archiver.c.orig Thu Jan 5 15:09:55 2006
+++ src/bin/pg_dump/pg_backup_archiver.c Thu Jan 5 15:10:50 2006
@@ -27,7 +27,10 @@
#include "dumputils.h"
#include
+
+#ifndef WIN32_CLIENT_ONLY
#include
+#endif
#ifdef WIN32
#include
--- src/bin/pg_dump/pg_backup_db.c.orig Thu Jan 5 15:09:55 2006
+++ src/bin/pg_dump/pg_backup_db.c Thu Jan 5 15:11:01 2006
@@ -15,7 +15,10 @@
#include "pg_backup_db.h"
#include "dumputils.h"
+#ifndef WIN32_CLIENT_ONLY
#include
+#endif
+
#include
#ifdef HAVE_TERMIOS_H
--- src/bin/pg_dump/pg_backup_null.c.orig Thu Jan 5 15:09:55 2006
+++ src/bin/pg_dump/pg_backup_null.c Thu Jan 5 15:11:13 2006
@@ -25,7 +25,9 @@
#include "pg_backup.h"
#include "pg_backup_archiver.h"
+#ifndef WIN32_CLIENT_ONLY
#include /* for dup */
+#endif
#include "libpq/libpq-fs.h"
--- src/bin/pg_dump/pg_backup_tar.c.orig Thu Jan 5 15:09:55 2006
+++ src/bin/pg_dump/pg_backup_tar.c Thu Jan 5 15:11:25 2006
@@ -27,7 +27,10 @@
#include
#include
+
+#ifndef WIN32_CLIENT_ONLY
#include
+#endif
static void _ArchiveEntry(ArchiveHandle *AH, TocEntry *te);
static void _StartData(ArchiveHandle *AH, TocEntry *te);
--- src/bin/pg_dump/pg_dump.c.orig Thu Jan 5 15:09:55 2006
+++ src/bin/pg_dump/pg_dump.c Thu Jan 5 15:11:36 2006
@@ -24,7 +24,10 @@
*/
#include "postgres.h"
+#ifndef WIN32_CLIENT_ONLY
#include
+#endif
+
#include
#ifdef ENABLE_NLS
#include
--- src/bin/pg_dump/pg_dumpall.c.orig Thu Jan 5 15:09:55 2006
+++ src/bin/pg_dump/pg_dumpall.c Thu Jan 5 15:11:54 2006
@@ -14,7 +14,11 @@
#include "postgres_fe.h"
#include
+
+#ifndef WIN32_CLIENT_ONLY
#include
+#endif
+
#ifdef ENABLE_NLS
#include
#endif
--- src/bin/pg_dump/pg_restore.c.orig Thu Jan 5 15:09:55 2006
+++ src/bin/pg_dump/pg_restore.c Thu Jan 5 15:12:06 2006
@@ -53,7 +53,9 @@
#include
#endif
+#ifndef WIN32_CLIENT_ONLY
#include
+#endif
#include "getopt_long.h"
--- src/bin/pg_dump/win32.mak.orig Thu Jan 5 15:20:24 2006
+++ src/bin/pg_dump/win32.mak Fri Jan 6 10:49:49 2006
@@ -0,0 +1,186 @@
+# Makefile for Microsoft Visual C++ 5.0 (or compat)
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+CPP=cl.exe
+PERL=perl.exe
+FLEX=flex.exe
+YACC=bison.exe
+MV=move
+
+!IFDEF DEBUG
+OPT=/Od /Zi /MDd
+LOPT=/DEBUG
+DEBUGDEF=/D _DEBUG
+OUTDIR=.\Debug
+INTDIR=.\Debug
+!ELSE
+OPT=/O2 /MD
+LOPT=
+DEBUGDEF=/D NDEBUG
+OUTDIR=.\Release
+INTDIR=.\Release
+!ENDIF
+
+REFDOCDIR= ../../../doc/src/sgml/ref
+
+CPP_PROJ=/nologo $(OPT) /W3 /GX /D "WIN32" $(DEBUGDEF) /D "_CONSOLE" /D\
+ "_MBCS" /Fp"$(INTDIR)\pg_dump.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \
+ /I ..\..\include /I ..\..\interfaces\libpq /I ..\..\include\port\win32 /I ..\..\backend \
+ /D "HAVE_STRDUP" /D "FRONTEND"
+
+CPP_OBJS=$(INTDIR)/
+CPP_SBRS=.
+
+ALL : ..\..\backend\parser\parse.h "..\..\port\pg_config_paths.h" \
+ "$(OUTDIR)\pg_dump.exe" "$(OUTDIR)\pg_dumpall.exe" "$(OUTDIR)\pg_restore.exe"
+
+CLEAN :
+ -@erase "$(INTDIR)\pg_backup_archiver.obj"
+ -@erase "$(INTDIR)\pg_backup_db.obj"
+ -@erase "$(INTDIR)\pg_backup_custom.obj"
+ -@erase "$(INTDIR)\pg_backup_files.obj"
+ -@erase "$(INTDIR)\pg_backup_null.obj"
+ -@erase "$(INTDIR)\pg_backup_tar.obj"
+ -@erase "$(INTDIR)\dumputils.obj"
+ -@erase "$(INTDIR)\common.obj"
+ -@erase "$(INTDIR)\pg_dump_sort.obj"
+ -@erase "$(INTDIR)\keywords.obj"
+ -@erase "$(INTDIR)\exec.obj"
+ -@erase "$(INTDIR)\getopt.obj"
+ -@erase "$(INTDIR)\getopt_long.obj"
+ -@erase "$(INTDIR)\path.obj"
+ -@erase "$(INTDIR)\pgstrcasecmp.obj"
+ -@erase "$(INTDIR)\sprompt.obj"
+ -@erase "$(INTDIR)\pg_dump.pch"
+ -@erase "$(OUTDIR)\pg_dump.obj"
+ -@erase "$(OUTDIR)\pg_dump.exe"
+ -@erase "$(INTDIR)\pg_dumpall.obj"
+ -@erase "$(OUTDIR)\pg_dumpall.exe"
+ -@erase "$(INTDIR)\pg_restore.obj"
+ -@erase "$(OUTDIR)\pg_restore.exe"
+# -@erase "$(INTDIR)\..\..\port\pg_config_paths.h"
+# -@erase "$(INTDIR)\..\..\backend\parser\parse.h"
+# -@erase "$(INTDIR)\..\..\backend\parser\gram.c"
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
+ advapi32.lib shfolder.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
+ odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:no
+LINK32_FLAGS_DMP= \
+ /pdb:"$(OUTDIR)\pg_dump.pdb" /machine:I386 $(LOPT) /out:"$(OUTDIR)\pg_dump.exe"
+LINK32_FLAGS_ALL= \
+ /pdb:"$(OUTDIR)\pg_dumpall.pdb" /machine:I386 $(LOPT) /out:"$(OUTDIR)\pg_dumpall.exe"
+LINK32_FLAGS_RES= \
+ /pdb:"$(OUTDIR)\pg_restore.pdb" /machine:I386 $(LOPT) /out:"$(OUTDIR)\pg_restore.exe"
+
+LINK32_OBJS= \
+ "$(INTDIR)\pg_backup_archiver.obj" \
+ "$(INTDIR)\pg_backup_db.obj" \
+ "$(INTDIR)\pg_backup_custom.obj" \
+ "$(INTDIR)\pg_backup_files.obj" \
+ "$(INTDIR)\pg_backup_null.obj" \
+ "$(INTDIR)\pg_backup_tar.obj" \
+ "$(INTDIR)\dumputils.obj" \
+ "$(INTDIR)\keywords.obj" \
+ "$(INTDIR)\exec.obj" \
+ "$(INTDIR)\getopt.obj" \
+ "$(INTDIR)\getopt_long.obj" \
+ "$(INTDIR)\path.obj" \
+ "$(INTDIR)\pgstrcasecmp.obj" \
+ "$(INTDIR)\sprompt.obj"
+
+LINK32_OBJS_DMP= \
+ "$(INTDIR)\common.obj" \
+ "$(INTDIR)\pg_dump_sort.obj" \
+ "$(INTDIR)\pg_dump.obj"
+LINK32_OBJS_RES= "$(INTDIR)\pg_restore.obj"
+LINK32_OBJS_ALL= "$(INTDIR)\pg_dumpall.obj"
+
+!IFDEF DEBUG
+LINK32_OBJS = $(LINK32_OBJS) "..\..\interfaces\libpq\Debug\libpqddll.lib"
+!ELSE
+LINK32_OBJS = $(LINK32_OBJS) "..\..\interfaces\libpq\Release\libpqdll.lib"
+!ENDIF
+
+"..\..\port\pg_config_paths.h":
+ echo #define PGBINDIR "" >$@
+ echo #define PGSHAREDIR "" >>$@
+ echo #define SYSCONFDIR "" >>$@
+ echo #define INCLUDEDIR "" >>$@
+ echo #define PKGINCLUDEDIR "" >>$@
+ echo #define INCLUDEDIRSERVER "" >>$@
+ echo #define LIBDIR "" >>$@
+ echo #define PKGLIBDIR "" >>$@
+ echo #define LOCALEDIR "" >>$@
+ echo #define DOCDIR "" >>$@
+ echo #define MANDIR "" >>$@
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+"$(OUTDIR)\pg_dump.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32_OBJS_DMP)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_FLAGS_DMP) $(LINK32_OBJS) $(LINK32_OBJS_DMP)
+<<
+
+"$(OUTDIR)\pg_dumpall.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32_OBJS_ALL)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_FLAGS_ALL) $(LINK32_OBJS) $(LINK32_OBJS_ALL)
+<<
+
+"$(OUTDIR)\pg_restore.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32_OBJS_RES)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_FLAGS_RES) $(LINK32_OBJS) $(LINK32_OBJS_RES)
+<<
+
+"$(INTDIR)\keywords.obj" : ..\..\backend\parser\keywords.c
+ $(CPP) @<<
+ $(CPP_PROJ) ..\..\backend\parser\keywords.c
+<<
+
+"$(INTDIR)\exec.obj" : ..\..\port\exec.c
+ $(CPP) @<<
+ $(CPP_PROJ) ..\..\port\exec.c
+<<
+
+"$(INTDIR)\getopt.obj" : "$(INTDIR)" ..\..\port\getopt.c
+ $(CPP) @<<
+ $(CPP_PROJ) ..\..\port\getopt.c
+<<
+
+"$(INTDIR)\getopt_long.obj" : "$(INTDIR)" ..\..\port\getopt_long.c
+ $(CPP) @<<
+ $(CPP_PROJ) ..\..\port\getopt_long.c
+<<
+
+"$(INTDIR)\path.obj" : "$(INTDIR)" ..\..\port\path.c
+ $(CPP) @<<
+ $(CPP_PROJ) ..\..\port\path.c
+<<
+
+"$(INTDIR)\pgstrcasecmp.obj" : ..\..\port\pgstrcasecmp.c
+ $(CPP) @<<
+ $(CPP_PROJ) ..\..\port\pgstrcasecmp.c
+<<
+
+"$(INTDIR)\sprompt.obj" : "$(INTDIR)" ..\..\port\sprompt.c
+ $(CPP) @<<
+ $(CPP_PROJ) ..\..\port\sprompt.c
+<<
+
+..\..\backend\parser\parse.h : ..\..\backend\parser\gram.y
+ $(YACC) -y -d ..\..\backend\parser\gram.y
+ $(MV) ..\..\backend\parser\y.tab.h ..\..\backend\parser\parse.h
+ $(MV) ..\..\backend\parser\y.tab.c ..\..\backend\parser\gram.c
+
+.c{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+
--- src/win32.mak.orig Thu Jan 5 15:18:30 2006
+++ src/win32.mak Fri Jan 6 13:32:54 2006
@@ -18,6 +18,10 @@
nmake /f win32.mak $(MAKEMACRO)
cd ..\..\bin\psql
nmake /f win32.mak $(MAKEMACRO)
+ cd ..\..\bin\pg_dump
+ nmake /f win32.mak $(MAKEMACRO)
+ cd ..\..\bin\scripts
+ nmake /f win32.mak $(MAKEMACRO)
cd ..\..\bin\pg_config
nmake /f win32.mak $(MAKEMACRO)
cd ..\..
@@ -27,6 +31,10 @@
cd interfaces\libpq
nmake /f win32.mak CLEAN
cd ..\..\bin\psql
+ nmake /f win32.mak CLEAN
+ cd ..\..\bin\pg_dump
+ nmake /f win32.mak CLEAN
+ cd ..\..\bin\scripts
nmake /f win32.mak CLEAN
cd ..\..\bin\pg_config
nmake /f win32.mak CLEAN
--- src/include/pg_config.h.win32.orig Thu Jan 5 15:13:30 2006
+++ src/include/pg_config.h.win32 Thu Jan 5 15:18:09 2006
@@ -23,6 +23,9 @@
#define HAVE_RANDOM
#endif
+#define INT64_FORMAT "%I64d"
+#define HAVE_DECL_VSNPRINTF 1
+
/* use _snprintf and _vsnprintf */
#define HAVE_DECL_SNPRINTF 1
#define snprintf _snprintf