From 2c50461b610c9ce4a29e686948e64713c650f4a6 Mon Sep 17 00:00:00 2001 From: Dave Page Date: Fri, 5 Aug 2005 12:37:20 +0000 Subject: [PATCH] Post release version number bump --- configure.ac | 406 ++++++++++++++++++++++----------------------- installer/Make.bat | 78 ++++----- psqlodbc.rc | 16 +- version.h | 36 ++-- 4 files changed, 268 insertions(+), 268 deletions(-) diff --git a/configure.ac b/configure.ac index e242d25..bf0362a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,203 +1,203 @@ -# 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 ], - [ 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 ], - [ int i = PTHREAD_MUTEX_RECURSIVE;], - [AC_DEFINE(PG_RECURSIVE_MUTEXATTR, PTHREAD_MUTEX_RECURSIVE, [Define if you have PTHREAD_MUTEX_RECURSIVE])], [ - AC_TRY_COMPILE([#include ], - [ 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. +AC_INIT(psqlodbclibpq, 08.01.0004, [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 ], + [ 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 ], + [ int i = PTHREAD_MUTEX_RECURSIVE;], + [AC_DEFINE(PG_RECURSIVE_MUTEXATTR, PTHREAD_MUTEX_RECURSIVE, [Define if you have PTHREAD_MUTEX_RECURSIVE])], [ + AC_TRY_COMPILE([#include ], + [ 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 diff --git a/installer/Make.bat b/installer/Make.bat index 396418c..db9eebb 100644 --- a/installer/Make.bat +++ b/installer/Make.bat @@ -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 + +if NOT "%1"=="" SET VERSION="%1" +if NOT "%1"=="" GOTO GOT_VERSION + +SET VERSION="08.01.0004" +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 + :EXIT \ No newline at end of file diff --git a/psqlodbc.rc b/psqlodbc.rc index 0668fbb..79008dd 100644 --- a/psqlodbc.rc +++ b/psqlodbc.rc @@ -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" diff --git a/version.h b/version.h index 9713ec9..c0df7c6 100644 --- 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 + * + * 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.0004" +#define POSTGRES_RESOURCE_VERSION "08.01.0004\0" +#define PG_DRVFILE_VERSION 8,1,0,4 + +#endif -- 2.39.5