Post release version number bump
authorDave Page <dpage@pgadmin.org>
Fri, 5 Aug 2005 12:37:20 +0000 (12:37 +0000)
committerDave Page <dpage@pgadmin.org>
Fri, 5 Aug 2005 12:37:20 +0000 (12:37 +0000)
configure.ac
installer/Make.bat
psqlodbc.rc
version.h

index e242d256ce30dfd4d16af719a710a1281fb1cdd2..bf0362a71d926e202b8e51269972d030056b06fe 100644 (file)
-# Process this file with autoconf to produce a configure script.
-AC_INIT(psqlodbclibpq, 08.01.0003, [pgsql-odbc@postgresql.org])
-AC_PREREQ(2.52)
-AM_INIT_AUTOMAKE
-AC_CONFIG_SRCDIR([bind.c])
-AM_CONFIG_HEADER([config.h])
-AM_MAINTAINER_MODE
-
-
-AC_DEFINE(DRIVER_CURSOR_IMPLEMENT, 1,
-          [Define to 1 to build with driver cursors option.])
-
-#
-# Decide which ODBC driver manager to use
-#
-PGAC_ARG_BOOL(with, unixodbc, no,
-              [  --with-unixodbc         build ODBC driver for unixODBC (default)],
-              [AC_CHECK_LIB(odbcinst, SQLGetPrivateProfileString, [],
-                            [AC_MSG_ERROR([unixODBC driver manager not found])])])
-
-PGAC_ARG_BOOL(with, iodbc, no,
-              [  --with-iodbc            build ODBC driver for iODBC],
-              [AC_CHECK_LIB(iodbcinst, SQLGetPrivateProfileString, [],
-                            [AC_MSG_ERROR([iODBC driver manager not found])])])
-
-if test "$with_unixodbc" = yes && test "$with_iodbc" = yes; then
-  AC_MSG_ERROR([ODBC driver cannot be built for both unixODBC and iODBC])
-fi
-
-if test "$with_unixodbc" != yes && test "$with_iodbc" != yes; then
-  AC_CHECK_LIB(odbcinst, SQLGetPrivateProfileString,
-               [with_unixodbc=yes],
-               [AC_CHECK_LIB(iodbcinst, SQLGetPrivateProfileString,
-                             [with_iodbc=yes],
-                             [AC_MSG_ERROR([no suitable ODBC driver manager found])])])
-fi
-
-if test "$with_unixodbc" = yes; then
-  AC_DEFINE(WITH_UNIXODBC, 1, [Define to 1 to build with unixODBC support])
-  AC_DEFINE(SQL_WCHART_CONVERT, [], [Define to use wchar_t as SQLWCHAR in unixODBC])
-fi
-
-if test "$with_iodbc" = yes; then
-  AC_DEFINE(WITH_IODBC, 1, [Define to 1 to build with iODBC support])
-fi
-
-#
-# Default odbc version number (--with-odbcver), default 0x0300
-#
-AC_MSG_CHECKING([for ODBC version number])
-PGAC_ARG_REQ(with, odbcver, [  --with-odbcver=VERSION  change default ODBC version number [[0x0300]]],
-             [],
-             [with_odbcver=0x0300])
-AC_MSG_RESULT([$with_odbcver])
-AC_DEFINE_UNQUOTED(ODBCVER, [$with_odbcver], [Define to ODBC version (--with-odbcver)])
-
-AC_CHECK_FUNCS(strtoul strtoll)
-
-# to implement the thread-safe driver
-PGAC_ARG_BOOL(enable, pthreads, no,
-    [  --enable-pthreads       build pthread implementation if possible],
-    [AC_DEFINE(POSIX_MULTITHREAD_SUPPORT, 1,
-   [Define to 1 to build with pthreads support (--enable-pthreads)])
-     AC_DEFINE(_REENTRANT, 1,
-   [Define _REENTRANT for several plaforms])
-     AC_CHECK_LIB(c_r, gethostbyname)
-     AC_CHECK_LIB(pthreads, pthread_create, [],
-       [AC_CHECK_LIB(pthread, pthread_create)])
-     AC_CHECK_LIB(nsl, gethostbyname_r, [AC_DEFINE(HAVE_GETHOSTBYNAME_R, 1, [])],
-   [AC_CHECK_FUNCS(getipnodebyname gethostbyname_r, break)])
-     if test x"$ac_cv_func_gethostbyname_r" = xyes || test x"$ac_cv_lib_nsl_gethostbyname_r" = xyes; then
-   AC_TRY_COMPILE([#include <netdb.h>],
-   [ gethostbyname_r((char *) 0, (struct hostent *) 0, (char *) 0, 0, (int *) 0);],
-        [AC_DEFINE(PGS_REENTRANT_API_1, 1, [Define if you have 5 parameter gethostbyname_r])],
-        [AC_DEFINE(PGS_REENTRANT_API_2, 1, [Define if you have 6 parameter gethostbyname_r])])
-     fi
-     AC_CHECK_FUNCS(localtime_r strtok_r pthread_mutexattr_settype)
-     if test x"$ac_cv_func_pthread_mutexattr_settype" = xyes; then
-   AC_TRY_COMPILE([#include <pthread.h>],
-   [ int i = PTHREAD_MUTEX_RECURSIVE;],
-        [AC_DEFINE(PG_RECURSIVE_MUTEXATTR, PTHREAD_MUTEX_RECURSIVE, [Define if you have PTHREAD_MUTEX_RECURSIVE])], [
-   AC_TRY_COMPILE([#include <pthread.h>],
-   [ int i = PTHREAD_MUTEX_RECURSIVE_NP;],
-        [AC_DEFINE(PG_RECURSIVE_MUTEXATTR, PTHREAD_MUTEX_RECURSIVE_NP, [Define if you have PTHREAD_MUTEX_RECURSIVE_NP])])])
-     fi
-    ])
-
-AC_PROG_CC
-
-AC_LIBTOOL_WIN32_DLL
-AC_DISABLE_STATIC
-AC_LIBTOOL_DLOPEN
-AC_PROG_LIBTOOL
-
-AC_CHECK_HEADERS([locale.h])
-AC_CHECK_HEADERS([sys/un.h])
-AC_CHECK_TYPES(uint8)
-PGAC_VAR_INT_TIMEZONE
-
-# unixODBC wants the following to get sane behavior for ODBCINT64
-AC_CHECK_SIZEOF(long)
-AC_CHECK_TYPES(long long)
-
-AC_C_CONST
-AC_TYPE_SIZE_T
-AC_STRUCT_TM
-
-#Decide whether libpq or socket based driver to be built 
-PGAC_ARG_BOOL(with, libpq, yes,
-          [  --with-libpq            build libpq enabled odbc driver(default)],[use_libpq=yes],[use_libpq=no])
-
-#
-#Options for pgsql headers and libraries
-#
-if test "$use_libpq" = "yes"; then
-        AC_MSG_CHECKING(for pgsql include files)
-        AC_ARG_WITH(pgsql-include,
-        [  --with-pgsql-include=DIR  Look for postgreSQL include files in DIR],
-        [if test "$withval" != no; then
-            AC_MSG_RESULT(yes)
-            pgsql_include="$withval"
-        else
-            AC_MSG_RESULT(no)
-            AC_MSG_ERROR([you must specify a directory when using --with-pgsql-include=DIR])
-         fi])
-fi
-
-#
-# Library directories
-#
-if test "$use_libpq" = "yes"; then
-        AC_MSG_CHECKING(for pgsql)
-        AC_ARG_WITH(pgsql,
-        [  --with-pgsql=DIR        look for PostgreSQL libraries and headers in DIR],
-        [if test "$withval" != no
-        then
-            AC_MSG_RESULT(yes)
-            LIBPQ_HOME="$withval"
-        else
-            AC_MSG_RESULT(no)
-        fi], [
-        AC_MSG_RESULT(yes)
-        LIBPQ_HOME="/usr/local/pgsql"
-        if test "$pgsql_include" = ""
-        then
-                if test ! -f "${LIBPQ_HOME}/include/libpq-fe.h"
-                then
-                    LIBPQ_HOME=/usr/local
-                    if test ! -f "${LIBPQ_HOME}/include/libpq-fe.h"
-                    then
-                        LIBPQ_HOME=/usr
-                    fi
-                fi
-                if test -f "/usr/include/libpq-fe.h"
-                then
-                    pgsql_include="/usr/include"
-                else
-                    if test -f "/usr/include/pgsql/libpq-fe.h"
-                    then
-                        pgsql_include="/usr/include/pgsql"
-                    fi
-                fi
-         fi
-   ])
-#
-# Check for libpq libraries and headers
-#
-        if test -n "${LIBPQ_HOME}"
-        then
-            OLD_LDFLAGS="$LDFLAGS"
-            OLD_CPPFLAGS="$CPPFLAGS"
-            LDFLAGS="$LDFLAGS -L${LIBPQ_HOME}/lib"
-            AC_CHECK_LIB(pq, PQexec, [pgsql_cv_libpq=yes], [pgsql_cv_libpq=no])
-
-            if test "$pgsql_include" != ""
-            then
-                CPPFLAGS="$CPPFLAGS -I${pgsql_include}"
-            else
-                CPPFLAGS="$CPPFLAGS -I${LIBPQ_HOME}/include"
-            fi
-            AC_CHECK_HEADER(libpq-fe.h, [pgsql_cv_libpqfe_h=yes], [pgsql_cv_libpqfe_h=no])
-
-            if test "$pgsql_cv_libpq" = "yes" -a "$pgsql_cv_libpqfe_h" = "yes"
-            then
-                AC_MSG_CHECKING(pgsql in ${LIBPQ_HOME})
-                AC_MSG_RESULT(ok)
-            else
-                AC_MSG_CHECKING(pgsql in ${LIBPQ_HOME})
-                AC_MSG_RESULT(failed)
-                LDFLAGS="$OLD_LDFLAGS"
-                CPPFLAGS="$OLD_CPPFLAGS"
-                AC_MSG_ERROR([you must specify a valid pgsql installation with --with-pgsql=DIR])
-            fi
-            LIBS="$LIBS -lpq"
-            CPPFLAGS="$CPPFLAGS -DUSE_LIBPQ"
-
-        fi
-else
-        AC_CHECK_LIB(socket, socket)
-fi
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
+# Process this file with autoconf to produce a configure script.\r
+AC_INIT(psqlodbclibpq, 08.01.0004, [pgsql-odbc@postgresql.org])\r
+AC_PREREQ(2.52)\r
+AM_INIT_AUTOMAKE\r
+AC_CONFIG_SRCDIR([bind.c])\r
+AM_CONFIG_HEADER([config.h])\r
+AM_MAINTAINER_MODE\r
+\r
+\r
+AC_DEFINE(DRIVER_CURSOR_IMPLEMENT, 1,\r
+          [Define to 1 to build with driver cursors option.])\r
+\r
+#\r
+# Decide which ODBC driver manager to use\r
+#\r
+PGAC_ARG_BOOL(with, unixodbc, no,\r
+              [  --with-unixodbc         build ODBC driver for unixODBC (default)],\r
+              [AC_CHECK_LIB(odbcinst, SQLGetPrivateProfileString, [],\r
+                            [AC_MSG_ERROR([unixODBC driver manager not found])])])\r
+\r
+PGAC_ARG_BOOL(with, iodbc, no,\r
+              [  --with-iodbc            build ODBC driver for iODBC],\r
+              [AC_CHECK_LIB(iodbcinst, SQLGetPrivateProfileString, [],\r
+                            [AC_MSG_ERROR([iODBC driver manager not found])])])\r
+\r
+if test "$with_unixodbc" = yes && test "$with_iodbc" = yes; then\r
+  AC_MSG_ERROR([ODBC driver cannot be built for both unixODBC and iODBC])\r
+fi\r
+\r
+if test "$with_unixodbc" != yes && test "$with_iodbc" != yes; then\r
+  AC_CHECK_LIB(odbcinst, SQLGetPrivateProfileString,\r
+               [with_unixodbc=yes],\r
+               [AC_CHECK_LIB(iodbcinst, SQLGetPrivateProfileString,\r
+                             [with_iodbc=yes],\r
+                             [AC_MSG_ERROR([no suitable ODBC driver manager found])])])\r
+fi\r
+\r
+if test "$with_unixodbc" = yes; then\r
+  AC_DEFINE(WITH_UNIXODBC, 1, [Define to 1 to build with unixODBC support])\r
+  AC_DEFINE(SQL_WCHART_CONVERT, [], [Define to use wchar_t as SQLWCHAR in unixODBC])\r
+fi\r
+\r
+if test "$with_iodbc" = yes; then\r
+  AC_DEFINE(WITH_IODBC, 1, [Define to 1 to build with iODBC support])\r
+fi\r
+\r
+#\r
+# Default odbc version number (--with-odbcver), default 0x0300\r
+#\r
+AC_MSG_CHECKING([for ODBC version number])\r
+PGAC_ARG_REQ(with, odbcver, [  --with-odbcver=VERSION  change default ODBC version number [[0x0300]]],\r
+             [],\r
+             [with_odbcver=0x0300])\r
+AC_MSG_RESULT([$with_odbcver])\r
+AC_DEFINE_UNQUOTED(ODBCVER, [$with_odbcver], [Define to ODBC version (--with-odbcver)])\r
+\r
+AC_CHECK_FUNCS(strtoul strtoll)\r
+\r
+# to implement the thread-safe driver\r
+PGAC_ARG_BOOL(enable, pthreads, no,\r
+    [  --enable-pthreads       build pthread implementation if possible],\r
+    [AC_DEFINE(POSIX_MULTITHREAD_SUPPORT, 1,\r
+   [Define to 1 to build with pthreads support (--enable-pthreads)])\r
+     AC_DEFINE(_REENTRANT, 1,\r
+   [Define _REENTRANT for several plaforms])\r
+     AC_CHECK_LIB(c_r, gethostbyname)\r
+     AC_CHECK_LIB(pthreads, pthread_create, [],\r
+       [AC_CHECK_LIB(pthread, pthread_create)])\r
+     AC_CHECK_LIB(nsl, gethostbyname_r, [AC_DEFINE(HAVE_GETHOSTBYNAME_R, 1, [])],\r
+   [AC_CHECK_FUNCS(getipnodebyname gethostbyname_r, break)])\r
+     if test x"$ac_cv_func_gethostbyname_r" = xyes || test x"$ac_cv_lib_nsl_gethostbyname_r" = xyes; then\r
+   AC_TRY_COMPILE([#include <netdb.h>],\r
+   [ gethostbyname_r((char *) 0, (struct hostent *) 0, (char *) 0, 0, (int *) 0);],\r
+        [AC_DEFINE(PGS_REENTRANT_API_1, 1, [Define if you have 5 parameter gethostbyname_r])],\r
+        [AC_DEFINE(PGS_REENTRANT_API_2, 1, [Define if you have 6 parameter gethostbyname_r])])\r
+     fi\r
+     AC_CHECK_FUNCS(localtime_r strtok_r pthread_mutexattr_settype)\r
+     if test x"$ac_cv_func_pthread_mutexattr_settype" = xyes; then\r
+   AC_TRY_COMPILE([#include <pthread.h>],\r
+   [ int i = PTHREAD_MUTEX_RECURSIVE;],\r
+        [AC_DEFINE(PG_RECURSIVE_MUTEXATTR, PTHREAD_MUTEX_RECURSIVE, [Define if you have PTHREAD_MUTEX_RECURSIVE])], [\r
+   AC_TRY_COMPILE([#include <pthread.h>],\r
+   [ int i = PTHREAD_MUTEX_RECURSIVE_NP;],\r
+        [AC_DEFINE(PG_RECURSIVE_MUTEXATTR, PTHREAD_MUTEX_RECURSIVE_NP, [Define if you have PTHREAD_MUTEX_RECURSIVE_NP])])])\r
+     fi\r
+    ])\r
+\r
+AC_PROG_CC\r
+\r
+AC_LIBTOOL_WIN32_DLL\r
+AC_DISABLE_STATIC\r
+AC_LIBTOOL_DLOPEN\r
+AC_PROG_LIBTOOL\r
+\r
+AC_CHECK_HEADERS([locale.h])\r
+AC_CHECK_HEADERS([sys/un.h])\r
+AC_CHECK_TYPES(uint8)\r
+PGAC_VAR_INT_TIMEZONE\r
+\r
+# unixODBC wants the following to get sane behavior for ODBCINT64\r
+AC_CHECK_SIZEOF(long)\r
+AC_CHECK_TYPES(long long)\r
+\r
+AC_C_CONST\r
+AC_TYPE_SIZE_T\r
+AC_STRUCT_TM\r
+\r
+#Decide whether libpq or socket based driver to be built \r
+PGAC_ARG_BOOL(with, libpq, yes,\r
+          [  --with-libpq            build libpq enabled odbc driver(default)],[use_libpq=yes],[use_libpq=no])\r
+\r
+#\r
+#Options for pgsql headers and libraries\r
+#\r
+if test "$use_libpq" = "yes"; then\r
+        AC_MSG_CHECKING(for pgsql include files)\r
+        AC_ARG_WITH(pgsql-include,\r
+        [  --with-pgsql-include=DIR  Look for postgreSQL include files in DIR],\r
+        [if test "$withval" != no; then\r
+            AC_MSG_RESULT(yes)\r
+            pgsql_include="$withval"\r
+        else\r
+            AC_MSG_RESULT(no)\r
+            AC_MSG_ERROR([you must specify a directory when using --with-pgsql-include=DIR])\r
+         fi])\r
+fi\r
+\r
+#\r
+# Library directories\r
+#\r
+if test "$use_libpq" = "yes"; then\r
+        AC_MSG_CHECKING(for pgsql)\r
+        AC_ARG_WITH(pgsql,\r
+        [  --with-pgsql=DIR        look for PostgreSQL libraries and headers in DIR],\r
+        [if test "$withval" != no\r
+        then\r
+            AC_MSG_RESULT(yes)\r
+            LIBPQ_HOME="$withval"\r
+        else\r
+            AC_MSG_RESULT(no)\r
+        fi], [\r
+        AC_MSG_RESULT(yes)\r
+        LIBPQ_HOME="/usr/local/pgsql"\r
+        if test "$pgsql_include" = ""\r
+        then\r
+                if test ! -f "${LIBPQ_HOME}/include/libpq-fe.h"\r
+                then\r
+                    LIBPQ_HOME=/usr/local\r
+                    if test ! -f "${LIBPQ_HOME}/include/libpq-fe.h"\r
+                    then\r
+                        LIBPQ_HOME=/usr\r
+                    fi\r
+                fi\r
+                if test -f "/usr/include/libpq-fe.h"\r
+                then\r
+                    pgsql_include="/usr/include"\r
+                else\r
+                    if test -f "/usr/include/pgsql/libpq-fe.h"\r
+                    then\r
+                        pgsql_include="/usr/include/pgsql"\r
+                    fi\r
+                fi\r
+         fi\r
+   ])\r
+#\r
+# Check for libpq libraries and headers\r
+#\r
+        if test -n "${LIBPQ_HOME}"\r
+        then\r
+            OLD_LDFLAGS="$LDFLAGS"\r
+            OLD_CPPFLAGS="$CPPFLAGS"\r
+            LDFLAGS="$LDFLAGS -L${LIBPQ_HOME}/lib"\r
+            AC_CHECK_LIB(pq, PQexec, [pgsql_cv_libpq=yes], [pgsql_cv_libpq=no])\r
+\r
+            if test "$pgsql_include" != ""\r
+            then\r
+                CPPFLAGS="$CPPFLAGS -I${pgsql_include}"\r
+            else\r
+                CPPFLAGS="$CPPFLAGS -I${LIBPQ_HOME}/include"\r
+            fi\r
+            AC_CHECK_HEADER(libpq-fe.h, [pgsql_cv_libpqfe_h=yes], [pgsql_cv_libpqfe_h=no])\r
+\r
+            if test "$pgsql_cv_libpq" = "yes" -a "$pgsql_cv_libpqfe_h" = "yes"\r
+            then\r
+                AC_MSG_CHECKING(pgsql in ${LIBPQ_HOME})\r
+                AC_MSG_RESULT(ok)\r
+            else\r
+                AC_MSG_CHECKING(pgsql in ${LIBPQ_HOME})\r
+                AC_MSG_RESULT(failed)\r
+                LDFLAGS="$OLD_LDFLAGS"\r
+                CPPFLAGS="$OLD_CPPFLAGS"\r
+                AC_MSG_ERROR([you must specify a valid pgsql installation with --with-pgsql=DIR])\r
+            fi\r
+            LIBS="$LIBS -lpq"\r
+            CPPFLAGS="$CPPFLAGS -DUSE_LIBPQ"\r
+\r
+        fi\r
+else\r
+        AC_CHECK_LIB(socket, socket)\r
+fi\r
+\r
+AC_CONFIG_FILES([Makefile])\r
+AC_OUTPUT\r
index 396418c13dab9e5f8f87f0c9aac6eb4556006279..db9eebb109da71f82eb5a97a29d72487462fb77c 100644 (file)
@@ -1,40 +1,40 @@
-@echo off
-
-if NOT "%1"=="" SET VERSION="%1"
-if NOT "%1"=="" GOTO GOT_VERSION
-
-SET VERSION="08.01.0003"
-echo.
-echo Version not specified - defaulting to %VERSION%
-echo.
-
-:GOT_VERSION
-
-echo.
-echo Building psqlODBC merge module...
-
-candle -nologo -dVERSION=%VERSION% psqlodbcm.wxs
-IF ERRORLEVEL 1 GOTO ERR_HANDLER
-
-light -nologo -out psqlodbc.msm psqlodbcm.wixobj
-IF ERRORLEVEL 1 GOTO ERR_HANDLER
-
-echo.
-echo Building psqlODBC installer database...
-
-candle -nologo -dVERSION=%VERSION% psqlodbc.wxs
-IF ERRORLEVEL 1 GOTO ERR_HANDLER
-
-light -nologo psqlodbc.wixobj
-IF ERRORLEVEL 1 GOTO ERR_HANDLER
-
-echo.
-echo Done!
-GOTO EXIT
-
-:ERR_HANDLER
-echo.
-echo Aborting build!
-GOTO EXIT
-
+@echo off\r
+\r
+if NOT "%1"=="" SET VERSION="%1"\r
+if NOT "%1"=="" GOTO GOT_VERSION\r
+\r
+SET VERSION="08.01.0004"\r
+echo.\r
+echo Version not specified - defaulting to %VERSION%\r
+echo.\r
+\r
+:GOT_VERSION\r
+\r
+echo.\r
+echo Building psqlODBC merge module...\r
+\r
+candle -nologo -dVERSION=%VERSION% psqlodbcm.wxs\r
+IF ERRORLEVEL 1 GOTO ERR_HANDLER\r
+\r
+light -nologo -out psqlodbc.msm psqlodbcm.wixobj\r
+IF ERRORLEVEL 1 GOTO ERR_HANDLER\r
+\r
+echo.\r
+echo Building psqlODBC installer database...\r
+\r
+candle -nologo -dVERSION=%VERSION% psqlodbc.wxs\r
+IF ERRORLEVEL 1 GOTO ERR_HANDLER\r
+\r
+light -nologo psqlodbc.wixobj\r
+IF ERRORLEVEL 1 GOTO ERR_HANDLER\r
+\r
+echo.\r
+echo Done!\r
+GOTO EXIT\r
+\r
+:ERR_HANDLER\r
+echo.\r
+echo Aborting build!\r
+GOTO EXIT\r
+\r
 :EXIT
\ No newline at end of file
index 0668fbb1ce4d9333c2321a989d4c33a0b44823dd..79008dd75e437399a126e2ea42b4710598be7bba 100644 (file)
@@ -302,8 +302,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 8,1,0,3
- PRODUCTVERSION 8,1,0,3
+ FILEVERSION 8,1,0,4
+ PRODUCTVERSION 8,1,0,4
  FILEFLAGSMASK 0x3L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -325,12 +325,12 @@ BEGIN
 #endif
             VALUE "CompanyName", "PostgreSQL Global Development Group"
             VALUE "FileDescription", "PostgreSQL Driver"
-            VALUE "FileVersion", "08.01.0003"
+            VALUE "FileVersion", "08.01.0004"
             VALUE "InternalName", "psqlodbc"
             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."
             VALUE "OriginalFilename", "psqlodbc.dll"
             VALUE "ProductName", "Microsoft Open Database Connectivity"
-            VALUE "ProductVersion", "08.01.0003"
+            VALUE "ProductVersion", "08.01.0004"
         END
     END
     BLOCK "VarFileInfo"
@@ -612,8 +612,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 8,1,0,3
- PRODUCTVERSION 8,1,0,3
+ FILEVERSION 8,1,0,4
+ PRODUCTVERSION 8,1,0,4
  FILEFLAGSMASK 0x3L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -635,12 +635,12 @@ BEGIN
 #endif
             VALUE "CompanyName", "PostgreSQL Global Development Group"
             VALUE "FileDescription", "PostgreSQL Driver"
-            VALUE "FileVersion", "08.01.0003"
+            VALUE "FileVersion", "08.01.0004"
             VALUE "InternalName", "psqlodbc"
             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."
             VALUE "OriginalFilename", "psqlodbc.dll"
             VALUE "ProductName", "Microsoft Open Database Connectivity"
-            VALUE "ProductVersion", "08.01.0003"
+            VALUE "ProductVersion", "08.01.0004"
         END
     END
     BLOCK "VarFileInfo"
index 9713ec92db8baae76658f81f39e84fb371975d67..c0df7c642b8b881a9744133e526e45f8245fe589 100644 (file)
--- a/version.h
+++ b/version.h
@@ -1,18 +1,18 @@
-/* File:           version.h
- *
- * Description:        This file defines the driver version.
- *
- * Comments:       See "notice.txt" for copyright and license information.
- *
- * Note:            The version number should also be updated in :
- *                  psqlodbc.rc, configure.ac and installer/make.bat
- */
-
-#ifndef __VERSION_H__
-#define __VERSION_H__
-
-#define POSTGRESDRIVERVERSION      "08.01.0003"
-#define POSTGRES_RESOURCE_VERSION  "08.01.0003\0"
-#define PG_DRVFILE_VERSION     8,1,0,3
-
-#endif
+/* File:           version.h\r
+ *\r
+ * Description:        This file defines the driver version.\r
+ *\r
+ * Comments:       See "notice.txt" for copyright and license information.\r
+ *\r
+ * Note:            The version number should also be updated in :\r
+ *                  psqlodbc.rc, configure.ac and installer/make.bat\r
+ */\r
+\r
+#ifndef __VERSION_H__\r
+#define __VERSION_H__\r
+\r
+#define POSTGRESDRIVERVERSION      "08.01.0004"\r
+#define POSTGRES_RESOURCE_VERSION  "08.01.0004\0"\r
+#define PG_DRVFILE_VERSION     8,1,0,4\r
+\r
+#endif\r