Prep release 09.01.0100.

diff --git a/configure.ac b/configure.ac
index 435740919ca87ecd49c8fb2ba42f44a757bbbffa..327f73ef22b7792fa26e09d462761b4f3478481d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(psqlodbc, 09.00.0310, [pgsql-odbc@postgresql.org])
+AC_INIT(psqlodbc, 09.01.0100, [pgsql-odbc@postgresql.org])
 AC_PREREQ(2.57)
 AC_CONFIG_AUX_DIR(config)
 AM_INIT_AUTOMAKE

diff --git a/docs/release.html b/docs/release.html
index f284d56868e7652a21db281111a8eeb260454d11..63be461cedbca4e1da26639b1893081bf918241c 100644 (file)
--- a/docs/release.html
+++ b/docs/release.html
@@ -9,7 +9,7 @@
   
 <h1>psqlODBC release notes</h1>
 <hr>
-<h2>psqlODBC 09.XX.XXXX Release</h2>
+<h2>psqlODBC 09.01.0100 Release</h2>
 Changes:<br>
 1.) SQLStatistics() sets 'D' for the collation column when an reverse index is used.<br>
 2.) Fix the bug that PostgreSQL's function calls in queries cause a crash on SQL Server linked servers.<br>

diff --git a/installer/Make.bat b/installer/Make.bat
index f01c6ce716ecf6468a11019061734dd8df870766..b6cc61f3c9a8a9f43311cce0d8aa43852f310228 100644 (file)
--- a/installer/Make.bat
+++ b/installer/Make.bat
@@ -3,13 +3,13 @@
 REM Values to change include VERSION and SUBLOC, both below.
 
 REM The subdirectory to install into
-SET SUBLOC="0900"
+SET SUBLOC="0901"
 
 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="09.00.0310"
+SET VERSION="09.01.0100"
 
 echo.
 echo Version not specified - defaulting to %VERSION%

diff --git a/installer/MakeX64.bat b/installer/MakeX64.bat
index a47ed2769c5e5286c0680cc237b0f4ae83854c80..50830209e54a5ba916c0e5751ed154c42a1ca22c 100755 (executable)
--- a/installer/MakeX64.bat
+++ b/installer/MakeX64.bat
@@ -66,7 +66,7 @@ echo wix_dir=%wix_dir%
 rem Values to change include VERSION and SUBLOC, both below.
 
 rem The subdirectory to install into
-SET SUBLOC="0900"
+SET SUBLOC="0901"
 
 if NOT "%1"=="" SET VERSION="%1"
 if NOT "%1"=="" GOTO GOT_VERSION
@@ -86,7 +86,7 @@ GOTO EXIT
 
 :NORMAL_EXEC
 REM The full version number of the build in XXXX.XX.XX format
-SET VERSION="09.00.0310"
+SET VERSION="09.01.0100"
 
 echo.
 echo Version not specified - defaulting to %VERSION%

diff --git a/installer/README.txt b/installer/README.txt
index 2b2c2b7da47116f5281557c72462b013ae36744c..6ac43fb5b813e3677ee3ce1a18a51774ac1b8bc4 100644 (file)
--- a/installer/README.txt
+++ b/installer/README.txt
@@ -8,7 +8,7 @@ time writing. WiX may be downloaded from:
 In order to build the installer, first ensure that a suitable binary is in
 the $SRC\Release directory, then, from the $SRC\Installer directory run:
 
-C:\psqlODBC\Installer> make 09.00.0310
+C:\psqlODBC\Installer> make 09.01.0100
 
 The version number will default to a value set in the Make.bat batch file if
 not specified on the command line. 2 files will be built:

diff --git a/installer/upgrade.bat b/installer/upgrade.bat
index b26b45fecc775bebdbc9c040ddc87ec0b3c865ed..d34e27451e1d6b09f44a296d0805e9fbd91bf230 100644 (file)
--- a/installer/upgrade.bat
+++ b/installer/upgrade.bat
@@ -2,7 +2,7 @@
 cls
 echo This file will upgrade your psqlODBC installation.
 echo.
-echo You must have psqlODBC 09.00.xxxx installed 
+echo You must have psqlODBC 09.01.xxxx installed 
 echo from the official MSI installation to use this upgrade path.
 echo.
 echo If psqlODBC or any of it's components are in use

diff --git a/installer/upgrade_x64.bat b/installer/upgrade_x64.bat
index 751b63dc6945190dd152bf4b264a563ef96cd2da..23a29817e2f3da46948eb78231b0eb272a29c297 100755 (executable)
--- a/installer/upgrade_x64.bat
+++ b/installer/upgrade_x64.bat
@@ -2,7 +2,7 @@
 cls
 echo This file will upgrade your psqlODBC installation.
 echo.
-echo You must have psqlODBC 09.00.xxxx installed 
+echo You must have psqlODBC 09.01.xxxx installed 
 echo from the official MSI installation to use this upgrade path.
 echo.
 echo If psqlODBC or any of it's components are in use
@@ -13,7 +13,7 @@ echo Press Ctrl-C to abort the upgrade or
 pause
 
 REM Parameters described:
-REM  /i psqlodbc_x64.msi   - pick MSI file to install. All properties
+REM  /i psqlodbc_x64.msi       - pick MSI file to install. All properties
 REM                              will be read from existing installation.
 REM  REINSTALLMODE=vamus       - reinstall all files, regardless of version.
 REM                              This makes sure documentation and other

diff --git a/psqlodbc.dsp b/psqlodbc.dsp
index 36465e1aa370aa340ca2c0ba793c5dd55d8d2cc4..e748d8c57447f6b836b6662569a82edd335d0d56 100644 (file)
--- a/psqlodbc.dsp
+++ b/psqlodbc.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "USE_LIBPQ" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D ODBCVER=0x0351 /D "DRIVER_CURSOR_IMPLEMENT" /D "WIN_MULTITHREAD_SUPPORT" /D "DYNAMIC_LOAD" /D "MULTIBYTE" /D "UNICODE_SUPPORT" /Fp"psqlodbc.pch" /YX /FD /c\r
-# ADD CPP /nologo /W3 /GX /O2 /I "C:\Program Files\PostgreSQL\8.4\include" /I "C:\OpenSSL\include" /D "NDEBUG" /D "USE_LIBPQ" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D ODBCVER=0x0351 /D "DRIVER_CURSOR_IMPLEMENT" /D "WIN_MULTITHREAD_SUPPORT" /D "DYNAMIC_LOAD" /D "MULTIBYTE" /D "UNICODE_SUPPORT" /D "USE_SSL" /Fp"psqlodbc.pch" /YX /FD /D SSL_DLL="\"SSLEAY32.dll\"" /c\r
+# ADD CPP /nologo /W3 /GX /O2 /I "C:\Program Files\PostgreSQL\9.1\include" /I "C:\OpenSSL\include" /D "NDEBUG" /D "USE_LIBPQ" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D ODBCVER=0x0351 /D "DRIVER_CURSOR_IMPLEMENT" /D "WIN_MULTITHREAD_SUPPORT" /D "DYNAMIC_LOAD" /D "MULTIBYTE" /D "UNICODE_SUPPORT" /D "USE_SSL" /Fp"psqlodbc.pch" /YX /FD /D SSL_DLL="\"SSLEAY32.dll\"" /c\r
 # ADD BASE RSC /l 0x411 /d "NDEBUG"\r
 # ADD RSC /l 0x411 /i "." /d "NDEBUG"\r
 # SUBTRACT RSC /x\r
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib XOleHlp.lib winmm.lib /nologo /subsystem:windows /machine:I386\r
-# ADD LINK32 wsock32.lib XOleHlp.lib winmm.lib libpq.lib ssleay32.lib libeay32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /pdb:"psqlodbc35w.pdb" /machine:I386 /out:"psqlodbc35w.dll" /implib:"psqlodbc35w.lib" /libpath:"C:\Program Files\PostgreSQL\8.4\lib\ms" /libpath:"C:\OpenSSL\lib\VC"\r
+# ADD LINK32 wsock32.lib XOleHlp.lib winmm.lib libpq.lib ssleay32.lib libeay32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /pdb:"psqlodbc35w.pdb" /machine:I386 /out:"psqlodbc35w.dll" /implib:"psqlodbc35w.lib" /libpath:"C:\Program Files\PostgreSQL\9.1\lib\ms" /libpath:"C:\OpenSSL\lib\VC"\r
 # SUBTRACT LINK32 /pdb:none /nodefaultlib\r
 \r
 !ELSEIF  "$(CFG)" == "psqlODBC - Win32 Debug"\r
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /Od /D "USE_LIBPQ" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D ODBCVER=0x0351 /D "DRIVER_CURSOR_IMPLEMENT" /D "WIN_MULTITHREAD_SUPPORT" /D "DYNAMIC_LOAD" /D "MULTIBYTE" /D "UNICODE_SUPPORT" /YX /FD /c\r
-# ADD CPP /nologo /W3 /GX /O2 /I "C:\Program Files\PostgreSQL\8.4\include" /I "C:\OpenSSL\include" /D "_DEBUG" /D "USE_LIBPQ" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D ODBCVER=0x0351 /D "DRIVER_CURSOR_IMPLEMENT" /D "WIN_MULTITHREAD_SUPPORT" /D "DYNAMIC_LOAD" /D "MULTIBYTE" /D "UNICODE_SUPPORT" /D "USE_SSL" /FR /YX /FD /D SSL_DLL="\"SSLEAY32.dll\"" /c\r
+# ADD CPP /nologo /W3 /GX /O2 /I "C:\Program Files\PostgreSQL\9.1\include" /I "C:\OpenSSL\include" /D "_DEBUG" /D "USE_LIBPQ" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D ODBCVER=0x0351 /D "DRIVER_CURSOR_IMPLEMENT" /D "WIN_MULTITHREAD_SUPPORT" /D "DYNAMIC_LOAD" /D "MULTIBYTE" /D "UNICODE_SUPPORT" /D "USE_SSL" /FR /YX /FD /D SSL_DLL="\"SSLEAY32.dll\"" /c\r
 # SUBTRACT CPP /X\r
 # ADD BASE RSC /l 0x411 /d "_DEBUG"\r
 # ADD RSC /l 0x411 /i "." /d "_DEBUG"\r
@@ -78,7 +78,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib XOleHlp.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386\r
-# ADD LINK32 wsock32.lib XOleHlp.lib winmm.lib libpq.lib ssleay32.lib libeay32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /pdb:"psqlodbc35w.pdb" /debug /machine:I386 /out:"psqlodbc35w.dll" /implib:"psqlodbc35w.lib" /libpath:"C:\Program Files\PostgreSQL\8.4\lib\ms" /libpath:"C:\OpenSSL\lib\VC"\r
+# ADD LINK32 wsock32.lib XOleHlp.lib winmm.lib libpq.lib ssleay32.lib libeay32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /pdb:"psqlodbc35w.pdb" /debug /machine:I386 /out:"psqlodbc35w.dll" /implib:"psqlodbc35w.lib" /libpath:"C:\Program Files\PostgreSQL\9.1\lib\ms" /libpath:"C:\OpenSSL\lib\VC"\r
 # SUBTRACT LINK32 /pdb:none /nodefaultlib\r
 \r
 !ENDIF \r

diff --git a/psqlodbc.vcproj b/psqlodbc.vcproj
index a362590a7dab2f2f23445d5fc7e82c0307719021..6864d78e3e306e5ccb9c555c6f6d6340001f4439 100644 (file)
--- a/psqlodbc.vcproj
+++ b/psqlodbc.vcproj
@@ -44,7 +44,7 @@
                AdditionalOptions="/D SSL_DLL="\"SSLEAY32.dll\"""\r
                Optimization="2"\r
                InlineFunctionExpansion="1"\r
-               AdditionalIncludeDirectories=""C:\Program Files\PostgreSQL\8.4\include";"C:\OpenSSL\include""\r
+               AdditionalIncludeDirectories=""C:\Program Files\PostgreSQL\9.1\include";"C:\OpenSSL\include""\r
                PreprocessorDefinitions="NDEBUG;USE_LIBPQ;WIN32;_WINDOWS;_USRDLL;PSQLODBC_EXPORTS;ODBCVER=0x0351;DRIVER_CURSOR_IMPLEMENT;WIN_MULTITHREAD_SUPPORT;DYNAMIC_LOAD;MULTIBYTE;UNICODE_SUPPORT;USE_SSL;_CRT_SECURE_NO_DEPRECATE;USE_SSPI"\r
                StringPooling="true"\r
                RuntimeLibrary="0"\r
@@ -74,7 +74,7 @@
                OutputFile="psqlodbc35w.dll"\r
                LinkIncremental="1"\r
                SuppressStartupBanner="true"\r
-               AdditionalLibraryDirectories=""C:\Program Files\PostgreSQL\8.4\lib\ms";"C:\OpenSSL\lib\VC""\r
+               AdditionalLibraryDirectories=""C:\Program Files\PostgreSQL\9.1\lib\ms";"C:\OpenSSL\lib\VC""\r
                IgnoreAllDefaultLibraries="false"\r
                ModuleDefinitionFile=".\psqlodbc.def"\r
                DelayLoadDLLs="libpq.dll;ssleay32.dll;libeay32.dll;secur32.dll;crypt32.dll;XOLEHLP.DLL"\r
@@ -141,7 +141,7 @@
                AdditionalOptions="/D SSL_DLL="\"SSLEAY32.dll\"""\r
                Optimization="2"\r
                InlineFunctionExpansion="1"\r
-               AdditionalIncludeDirectories=""C:\Program Files\PostgreSQL\8.4\include";"C:\OpenSSL\include""\r
+               AdditionalIncludeDirectories=""C:\Program Files\PostgreSQL\9.1\include";"C:\OpenSSL\include""\r
                PreprocessorDefinitions="_DEBUG;USE_LIBPQ;WIN32;_WINDOWS;_USRDLL;PSQLODBC_EXPORTS;ODBCVER=0x0351;DRIVER_CURSOR_IMPLEMENT;WIN_MULTITHREAD_SUPPORT;DYNAMIC_LOAD;MULTIBYTE;UNICODE_SUPPORT;USE_SSL;_CRT_SECURE_NO_DEPRECATE;USE_SSPI"\r
                StringPooling="true"\r
                RuntimeLibrary="1"\r
@@ -172,7 +172,7 @@
                OutputFile="psqlodbc35w.dll"\r
                LinkIncremental="2"\r
                SuppressStartupBanner="true"\r
-               AdditionalLibraryDirectories=""C:\Program Files\PostgreSQL\8.4\lib\ms";"C:\OpenSSL\lib\VC""\r
+               AdditionalLibraryDirectories=""C:\Program Files\PostgreSQL\9.1\lib\ms";"C:\OpenSSL\lib\VC""\r
                IgnoreAllDefaultLibraries="false"\r
                ModuleDefinitionFile=".\psqlodbc.def"\r
                DelayLoadDLLs="libpq.dll;ssleay32.dll;libeay32.dll;secur32.dll;crypt32.dll;XOLEHLP.DLL"\r

diff --git a/version.h b/version.h
index 8cb893e6d749b730867ab31a67430278ceb3f02a..0415e6a78e84941e2051d9b096c7a5d78d414dc6 100644 (file)
--- a/version.h
+++ b/version.h
@@ -9,9 +9,9 @@
 #ifndef __VERSION_H__
 #define __VERSION_H__
 
-#define POSTGRESDRIVERVERSION      "09.00.0311"
-#define POSTGRES_RESOURCE_VERSION  "09.00.0311\0"
-#define PG_DRVFILE_VERSION     9,0,03,11
-#define PG_BUILD_VERSION       "201112030001"
+#define POSTGRESDRIVERVERSION      "09.01.0100"
+#define POSTGRES_RESOURCE_VERSION  "09.01.0100\0"
+#define PG_DRVFILE_VERSION     9,1,01,00
+#define PG_BUILD_VERSION       "201112290001"
 
 #endif

diff --git a/win32.mak b/win32.mak
index 95d7bb6f37994329a3b760aceb97915887ce0bef..c5e2621bc1e65c75af2007f006abb332a26d7213 100644 (file)
--- a/win32.mak
+++ b/win32.mak
@@ -40,12 +40,12 @@ CFG=Release
 #
 #
 !IF "$(PG_INC)" == ""
-PG_INC=$(PROGRAMFILES)\PostgreSQL\9.0\include
+PG_INC=$(PROGRAMFILES)\PostgreSQL\9.1\include
 !MESSAGE Using default PostgreSQL Include directory: $(PG_INC)
 !ENDIF
 
 !IF "$(PG_LIB)" == ""
-PG_LIB=$(PROGRAMFILES)\PostgreSQL\9.0\lib
+PG_LIB=$(PROGRAMFILES)\PostgreSQL\9.1\lib
 !MESSAGE Using default PostgreSQL Library directory: $(PG_LIB)
 !ENDIF
 

diff --git a/win64.mak b/win64.mak
index d9c4e8fb19a73d23d6b675d2fee7bfac45817164..216652803596f543954df7922e4e40bde228ba62 100755 (executable)
--- a/win64.mak
+++ b/win64.mak
@@ -52,7 +52,7 @@ ADD_DEFINES=/D _WIN64
 #  variables to appropriate ones. 
 #
 !IF "$(PG_INC)" == ""
-PG_INC=$(PROGRAMFILES)\PostgreSQL\9.0\include
+PG_INC=$(PROGRAMFILES)\PostgreSQL\9.1\include
 !MESSAGE Using default PostgreSQL Include directory: $(PG_INC)
 !ENDIF