From d8809c1b1fcee024be0512a90bbd66ebc7954a65 Mon Sep 17 00:00:00 2001 From: Hiroshi Saito Date: Sat, 14 Dec 2013 22:49:40 +0900 Subject: [PATCH] Prep release 09.03.0100. --- configure.ac | 2 +- docs/release.html | 2 +- installer/Make.bat | 4 ++-- psqlodbc.dsp | 8 ++++---- psqlodbc.vcproj | 8 ++++---- version.h | 8 ++++---- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index 14450de..7d44a02 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(psqlodbc, 09.02.0100, [pgsql-odbc@postgresql.org]) +AC_INIT(psqlodbc, 09.03.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 8879dce..bbd612a 100644 --- a/docs/release.html +++ b/docs/release.html @@ -9,7 +9,7 @@

psqlODBC release notes


-

psqlODBC 09.03.XXXX Release (NOT YET RELEASED)

+

psqlODBC 09.03.0100 Release

Changes:
    diff --git a/installer/Make.bat b/installer/Make.bat index e3c116f..4633e4f 100755 --- a/installer/Make.bat +++ b/installer/Make.bat @@ -15,10 +15,10 @@ SET X86COMMONFILES=%CommonProgramFiles(x86)% :: echo X86COMMONFILES=%X86COMMONFILES% :: :: When you reference PG server's libpq related dlls, set the -:: version to the variable PGVERSION (default 9.2) and call +:: version to the variable PGVERSION (default 9.3) and call :: this batch file. :: -if "%PGVERSION%" == "" SET PGVERSION=9.2 +if "%PGVERSION%" == "" SET PGVERSION=9.3 :: :: When you placed libpq related dlls in the folder other than :: the default one, set the folder name to the variable LIBPQBINDIR diff --git a/psqlodbc.dsp b/psqlodbc.dsp index 1bb6c4a..e7993dd 100644 --- a/psqlodbc.dsp +++ b/psqlodbc.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # 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 -# ADD CPP /nologo /W3 /GX /O2 /I "C:\Program Files\PostgreSQL\9.2\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 +# ADD CPP /nologo /W3 /GX /O2 /I "C:\Program Files\PostgreSQL\9.3\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 # ADD BASE RSC /l 0x411 /d "NDEBUG" # ADD RSC /l 0x411 /i "." /d "NDEBUG" # SUBTRACT RSC /x @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # 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 -# 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.2\lib\ms" /libpath:"C:\OpenSSL\lib\VC" +# 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.3\lib\ms" /libpath:"C:\OpenSSL\lib\VC" # SUBTRACT LINK32 /pdb:none /nodefaultlib !ELSEIF "$(CFG)" == "psqlODBC - Win32 Debug" @@ -68,7 +68,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # 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 -# ADD CPP /nologo /W3 /GX /O2 /I "C:\Program Files\PostgreSQL\9.2\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 +# ADD CPP /nologo /W3 /GX /O2 /I "C:\Program Files\PostgreSQL\9.3\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 # SUBTRACT CPP /X # ADD BASE RSC /l 0x411 /d "_DEBUG" # ADD RSC /l 0x411 /i "." /d "_DEBUG" @@ -78,7 +78,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # 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 -# 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.2\lib\ms" /libpath:"C:\OpenSSL\lib\VC" +# 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.3\lib\ms" /libpath:"C:\OpenSSL\lib\VC" # SUBTRACT LINK32 /pdb:none /nodefaultlib !ENDIF diff --git a/psqlodbc.vcproj b/psqlodbc.vcproj index b90d638..31570cd 100644 --- a/psqlodbc.vcproj +++ b/psqlodbc.vcproj @@ -44,7 +44,7 @@ AdditionalOptions="/D SSL_DLL="\"SSLEAY32.dll\""" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories=""C:\Program Files\PostgreSQL\9.2\include";"C:\OpenSSL\include"" + AdditionalIncludeDirectories=""C:\Program Files\PostgreSQL\9.3\include";"C:\OpenSSL\include"" 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" StringPooling="true" RuntimeLibrary="0" @@ -74,7 +74,7 @@ OutputFile="psqlodbc35w.dll" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories=""C:\Program Files\PostgreSQL\9.2\lib\ms";"C:\OpenSSL\lib\VC"" + AdditionalLibraryDirectories=""C:\Program Files\PostgreSQL\9.3\lib\ms";"C:\OpenSSL\lib\VC"" IgnoreAllDefaultLibraries="false" ModuleDefinitionFile=".\psqlodbc.def" DelayLoadDLLs="libpq.dll;ssleay32.dll;libeay32.dll;secur32.dll;crypt32.dll;XOLEHLP.DLL" @@ -141,7 +141,7 @@ AdditionalOptions="/D SSL_DLL="\"SSLEAY32.dll\""" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories=""C:\Program Files\PostgreSQL\9.2\include";"C:\OpenSSL\include"" + AdditionalIncludeDirectories=""C:\Program Files\PostgreSQL\9.3\include";"C:\OpenSSL\include"" 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" StringPooling="true" RuntimeLibrary="1" @@ -172,7 +172,7 @@ OutputFile="psqlodbc35w.dll" LinkIncremental="2" SuppressStartupBanner="true" - AdditionalLibraryDirectories=""C:\Program Files\PostgreSQL\9.2\lib\ms";"C:\OpenSSL\lib\VC"" + AdditionalLibraryDirectories=""C:\Program Files\PostgreSQL\9.3\lib\ms";"C:\OpenSSL\lib\VC"" IgnoreAllDefaultLibraries="false" ModuleDefinitionFile=".\psqlodbc.def" DelayLoadDLLs="libpq.dll;ssleay32.dll;libeay32.dll;secur32.dll;crypt32.dll;XOLEHLP.DLL" diff --git a/version.h b/version.h index 889e287..d50b405 100644 --- a/version.h +++ b/version.h @@ -9,9 +9,9 @@ #ifndef __VERSION_H__ #define __VERSION_H__ -#define POSTGRESDRIVERVERSION "09.02.0100" -#define POSTGRES_RESOURCE_VERSION "09.02.0100\0" -#define PG_DRVFILE_VERSION 9,2,01,00 -#define PG_BUILD_VERSION "201306020000" +#define POSTGRESDRIVERVERSION "09.03.0100" +#define POSTGRES_RESOURCE_VERSION "09.03.0100\0" +#define PG_DRVFILE_VERSION 9,3,01,00 +#define PG_BUILD_VERSION "201312140000" #endif -- 2.39.5