From b423adf55ae28cb6510d293dd0a2408499bd3350 Mon Sep 17 00:00:00 2001
From: Dave Page 
Date: Thu, 31 Aug 2006 08:38:20 +0000
Subject: [PATCH] Prep for 08.02.0100 release
---
 configure.ac            |  2 +-
 docs/faq.html           | 20 +++++++++++++++++++-
 docs/release.html       | 10 ++++++++++
 installer/Make.bat      |  2 +-
 installer/psqlodbcm.wxs | 30 +++++++++++++++++++++---------
 psqlodbc.rc             |  8 ++++----
 psqlodbc.reg            | 15 +++++++++++++--
 version.h               |  6 +++---
 win32.mak               |  6 +++---
 9 files changed, 75 insertions(+), 24 deletions(-)
diff --git a/configure.ac b/configure.ac
index 45e02ac..64799a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(psqlodbc, 08.02.0007, [pgsql-odbc@postgresql.org])
+AC_INIT(psqlodbc, 08.02.0100, [pgsql-odbc@postgresql.org])
 AC_PREREQ(2.52)
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([bind.c])
diff --git a/docs/faq.html b/docs/faq.html
index 80bbd14..9465eb9 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -9,7 +9,7 @@
   
     psqlODBC FAQ
 
-    Last updated: $Date: 2006/04/28 07:51:13 $
+    Last updated: $Date: 2006/08/31 08:38:20 $
 
     Current maintainer: Dave Page (dpage@postgresql.org)
 
@@ -31,6 +31,7 @@
     2.2) What's the difference between a File DSN, System DSN, and User DSN?
     2.3) How do I access more advanced driver and/or datasource options?
     2.4) Where can I discover more information about ODBC errors?
+    2.5) There are 2 drivers installed - which should I use?
 
     3) Connections
     3.1) Why do I get a message like "Failed to authenticate client as Postgres user using unknown authentication type:be_recvauth: unrecognized message type: 65536" when I try to connect to a datasource?
@@ -145,6 +146,23 @@
     This is good for applications that give misleading, little, or no descriptive information 
     when something goes wrong (VisData is a good example).
     
+    
+    2.5) There are 2 drivers installed - which should I use?
+    
+    PostgreSQL Unicode is a Unicode enabled driver that will work well with modern versions of
+    applications such as Microsoft Access, with character from a huge range of languages. You should
+    use this driver with PostgreSQL databases encoded as 'UNICODE' (more precisely known as 'UTF-8' in
+    PostgreSQL).
+    
+    
+    PostgreSQL ANSI is an ANSI driver which is also able to handle some multibyte character sets
+    such as EUC_JP, BIG5 and Shift-JIS. This driver should also be used with databases encoded using
+    any of the LATIN charactersets.
+    
+    
+    Note that some applications (notably Borland BDE) do not work properly with Unicode ODBC drivers.
+    In this case, you must use the ANSI driver.
+    
 
     3) Connections
     
diff --git a/docs/release.html b/docs/release.html
index 9da282f..6d18783 100644
--- a/docs/release.html
+++ b/docs/release.html
@@ -9,6 +9,16 @@
   
 psqlODBC release notes
 
+
+psqlODBC 08.02.0100 Release
+Notes: psqlODBC 08.02.0100
+Changes:
+1) Return to Unicode/ANSI driver distribution as some users still find one works better than the other for them.
+2) Improve connection error message in case of invalid protocol characters.
+3) Initial value has set MSDTC=no of VC6 (Support of MSDTC is only VC7 and VC8)
+4) Addition which is a driver name in a resource (Unicode or ANSI)
+
+
 Development snapshots
 Notes: psqlODBC 08.02.0007
 Changes:
diff --git a/installer/Make.bat b/installer/Make.bat
index bdf449a..e0816bc 100644
--- a/installer/Make.bat
+++ b/installer/Make.bat
@@ -9,7 +9,7 @@ if NOT "%1"=="" SET VERSION="%1"
 if NOT "%1"=="" GOTO GOT_VERSION
 
 REM The full version number of the build in XXXX.XX.XX format
-SET VERSION="08.02.0003"
+SET VERSION="08.02.0100"
 
 echo.
 echo Version not specified - defaulting to %VERSION%
diff --git a/installer/psqlodbcm.wxs b/installer/psqlodbcm.wxs
index 7ea094f..b08d945 100644
--- a/installer/psqlodbcm.wxs
+++ b/installer/psqlodbcm.wxs
@@ -22,7 +22,9 @@
         
 
           
+          
           
+          
           
           
           
@@ -39,15 +41,25 @@
           
           
           
-          
-          
-          
-          
-          
-          
-          
-          
-          
+          
+          
+          
+          
+          
+          
+          
+          
+          
+
+          
+          
+          
+          
+          
+          
+          
+          
+          
         
       
     
diff --git a/psqlodbc.rc b/psqlodbc.rc
index 612c2a4..3dd4385 100644
--- a/psqlodbc.rc
+++ b/psqlodbc.rc
@@ -347,14 +347,14 @@ BEGIN
 #ifdef UNICODE_SUPPORT
             VALUE "InternalName", "psqlodbc35w\0"
 #else
-            VALUE "InternalName", "psqlodbca\0"
+            VALUE "InternalName", "psqlodbc30a\0"
 #endif
             VALUE "LegalCopyright", "\0"
             VALUE "LegalTrademarks", "ODBC(TM) is a trademark of Microsoft Corporation.  Microsoft is a registered trademark of Microsoft Corporation. Windows(TM) is a trademark of Microsoft Corporation.\0"
 #ifdef UNICODE_SUPPORT
             VALUE "OriginalFilename", "psqlodbc35w.dll\0"
 #else
-            VALUE "OriginalFilename", "psqlodbca.dll\0"
+            VALUE "OriginalFilename", "psqlodbc30a.dll\0"
 #endif
             VALUE "PrivateBuild", "for Japanese by Hiroshi Inoue & Hiroshi Saito\0"
             VALUE "ProductName", "PostgreSQL\0"
@@ -693,14 +693,14 @@ BEGIN
 #ifdef UNICODE_SUPPORT
             VALUE "InternalName", "psqlodbc35w\0"
 #else
-            VALUE "InternalName", "psqlodbca\0"
+            VALUE "InternalName", "psqlodbc30a\0"
 #endif
             VALUE "LegalCopyright", "Copyright \0"
             VALUE "LegalTrademarks", "ODBC(TM) is a trademark of Microsoft Corporation.  Microsoft? is a registered trademark of Microsoft Corporation. Windows(TM) is a trademark of Microsoft Corporation.\0"
 #ifdef UNICODE_SUPPORT
             VALUE "OriginalFilename", "psqlodbc35w.dll\0"
 #else
-            VALUE "OriginalFilename", "psqlodbca.dll\0"
+            VALUE "OriginalFilename", "psqlodbc30a.dll\0"
 #endif
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "PostgreSQL\0"
diff --git a/psqlodbc.reg b/psqlodbc.reg
index a2f526f..ce99283 100644
--- a/psqlodbc.reg
+++ b/psqlodbc.reg
@@ -3,9 +3,20 @@ REGEDIT4
 [HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI]
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers]
-"PostgreSQL"="Installed"
+"PostgreSQL ANSI"="Installed"
+"PostgreSQL Unicode"="Installed"
 
-[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL]
+[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL ANSI]
+"APILevel"="1"
+"ConnectFunctions"="YYN"
+"Driver"="PSQLODBC30A.DLL"
+"DriverODBCVer"="03.00"
+"FileUsage"="0"
+"Setup"="PSQLODBC30A.DLL"
+"SQLLevel"="1"
+"UsageCount"=dword:00000001
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Unicode]
 "APILevel"="1"
 "ConnectFunctions"="YYN"
 "Driver"="PSQLODBC35W.DLL"
diff --git a/version.h b/version.h
index 36066b7..374a7e0 100644
--- a/version.h
+++ b/version.h
@@ -9,8 +9,8 @@
 #ifndef __VERSION_H__
 #define __VERSION_H__
 
-#define POSTGRESDRIVERVERSION		"08.02.0007"
-#define POSTGRES_RESOURCE_VERSION	"08.02.0007\0"
-#define PG_DRVFILE_VERSION		8,2,0,07
+#define POSTGRESDRIVERVERSION		"08.02.0100"
+#define POSTGRES_RESOURCE_VERSION	"08.02.0100\0"
+#define PG_DRVFILE_VERSION		8,2,01,00
 
 #endif
diff --git a/win32.mak b/win32.mak
index 3613b81..b29f651 100644
--- a/win32.mak
+++ b/win32.mak
@@ -95,7 +95,7 @@ NULL=nul
 !ENDIF
 
 !IF "$(ANSI_VERSION)" == "yes"
-MAINLIB = psqlodbca
+MAINLIB = psqlodbc30a
 !ELSE
 MAINLIB = psqlodbc35w
 !ENDIF
@@ -149,9 +149,9 @@ CLEAN :
 
 CPP=cl.exe
 !IF  "$(CFG)" == "Release"
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "$(PG_INC)" /I "$(SSL_INC)" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "$(PG_INC)" /I "$(SSL_INC)" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /D "PSQLODBC_EXPORTS" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 !ELSEIF  "$(CFG)" == "Debug"
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /I "$(PG_INC)" /I "$(SSL_INC)" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /I "$(PG_INC)" /I "$(SSL_INC)" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /D "PSQLODBC_EXPORTS" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
 !ENDIF
 
 .c{$(INTDIR)}.obj::
-- 
2.39.5