Skip to content

Commit

Permalink
Merge pull request #271 from vrogier/develop-v4.7.3
Browse files Browse the repository at this point in the history
Develop v4.7.3
  • Loading branch information
vrogier authored Mar 9, 2021
2 parents 1982be4 + faeaaca commit 7599544
Show file tree
Hide file tree
Showing 220 changed files with 2,107 additions and 2,032 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ build/
*.bsc
*.lastbuildstate
*.tlog
*.o

# Visual C++ cache files
ipch/
Expand Down Expand Up @@ -178,3 +179,5 @@ $RECYCLE.BIN/
testlog.manifest
*.testlog
/nuget/*.nupkg
*Browse.VC.db-wal
*Browse.VC.db-shm
30 changes: 30 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,33 @@
2021-03-09 Version 4.7.3 Vincent Rogier [email protected]

* Fixes (C API)

- Issue 251: OCI_ErrorGetMessage() returns invalid messages when OCILIB is build with OCI_CHARSET_WIDE on linux/unix platforms
- Issue 252: Incorrect OCILIB client driver layer namein V$SESSION_CONNECT_INFO and GV$SESSION_CONNECT_INFO when OCILIB is build with OCI_CHARSET_WIDE on linux/unix platforms
- Issue 253: Error occured at OcilibLobFree: ORA-01403: no data found
- Issue 258: OCI_SubscriptionRegister() returns always NULL since v4.7.0
- Issue 264: Fetched UROWIDs (IOT Table ROWIDs) values are truncated
- Issue 268: OCI_DirPathSetColumn() forwards parameter 'maxsize' as unsigned short to Oracle client leading to data truncation

* Fixes (C++ API)

- Issue 250: Exception handling when using OCI_CHARSET_WIDE
- Issue 262: Using correct delete[] in ManagedBuffer destructor

* Miscellaneous

- Updated compilers for MS Windows prebuilt binaries
* VS2019 16.9.0 for 32/64 bit DLLs
* VC runtime (statically linked) updated from vc141_xp to vc142
* Note: Windows XP is not supported anymore due to the runtime update
- Reduced some ocilib structures size by removing some paddings (especially in 64bits)
- Added a makefile to build the C++ demo (Makefile_demo_cpp) that is also now installed with the C demo Makefile
- OCILIB Test suite is now ported to Linux/Unix platforms
* Test suite is now provided in ocilib-x.y.z-gnu.tar.gz distribution archives and installed by 'make install' among documentation and demo (typically in /usr/local/share/doc/ocilib/tests)
* To build the test suite:
- Modify the db credentials in ocilib_tests.h
- Use Makefile_tests (it depends on google test that must be installed prior building the test suite)

2020-11-10 Version 4.7.2 Vincent Rogier [email protected]

* Fixes (C API)
Expand Down
4 changes: 2 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2007-2020 Vincent ROGIER <[email protected]>
# Copyright (c) 2007-2021 Vincent ROGIER <[email protected]>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
Expand All @@ -10,7 +10,7 @@

ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = doc/html reconf configure VERSION acocilib.m4
SUBDIRS = doc/html src demo
SUBDIRS = doc/html src demo tests
DISTCLEANFILES = *~ \#*\#
MAINTAINERCLEANFILES = \
Makefile Makefile.in config.cache config.log config.h.in \
Expand Down
5 changes: 3 additions & 2 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

@SET_MAKE@

# Copyright (c) 2007-2020 Vincent ROGIER <[email protected]>
# Copyright (c) 2007-2021 Vincent ROGIER <[email protected]>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
Expand Down Expand Up @@ -309,6 +309,7 @@ OCILIB_EXTRA_FLAGS = @OCILIB_EXTRA_FLAGS@
OCILIB_IMPORT = @OCILIB_IMPORT@
OCILIB_LD_FLAG = @OCILIB_LD_FLAG@
OCILIB_PREFIX = @OCILIB_PREFIX@
OCILIB_TESTS = @OCILIB_TESTS@
ORACLE_HOME = @ORACLE_HOME@
ORACLE_INCLUDES = @ORACLE_INCLUDES@
ORACLE_LIBADD = @ORACLE_LIBADD@
Expand Down Expand Up @@ -384,7 +385,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = doc/html reconf configure VERSION acocilib.m4
SUBDIRS = doc/html src demo
SUBDIRS = doc/html src demo tests
DISTCLEANFILES = *~ \#*\#
MAINTAINERCLEANFILES = \
Makefile Makefile.in config.cache config.log config.h.in \
Expand Down
4 changes: 2 additions & 2 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
ocilib -- History of visible changes.

Copyright (c) 2007-2020 Vincent ROGIER <[email protected]>
Copyright (c) 2007-2021 Vincent ROGIER <[email protected]>
See the end for copying conditions.

Please send ocilib bug reports to [email protected].

-------------------------------------------------------
Copying information:

Copyright (c) 2007-2019 Vincent ROGIER <[email protected]>
Copyright (c) 2007-2021 Vincent ROGIER <[email protected]>

Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the
Expand Down
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Website: http://www.ocilib.net
*
* Copyright (c) 2007-2020 Vincent ROGIER <[email protected]>
* Copyright (c) 2007-2021 Vincent ROGIER <[email protected]>
*
*/

Expand Down
2 changes: 1 addition & 1 deletion README.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Website: http://www.ocilib.net
*
* Copyright (c) 2007-2020 Vincent ROGIER <[email protected]>
* Copyright (c) 2007-2021 Vincent ROGIER <[email protected]>
*
*/

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.7.2
4.7.3
7 changes: 5 additions & 2 deletions acocilib.m4
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,16 @@ AC_DEFUN([OCILIB_PATH],
doc_files=`(cd ${srcdir:-.}/doc/html && ls -1 *.html *.css *.png)`
OCILIB_DOCS=`echo $doc_files | sed 's,$, ,g'`
demo_sources_files=`(cd ${srcdir:-.}/demo/ && ls -1 *.c *.h *.cpp *.sql)`
demo_sources_files=`(cd ${srcdir:-.}/demo && ls -1 *.c *.h *.cpp *.sql)`
OCILIB_DEMO_SOURCES=`echo $demo_sources_files | sed 's,$, ,g'`
tests_files=`(cd ${srcdir:-.}/tests && ls -1 *.h *.cpp)`
OCILIB_TESTS=`echo $tests_files | sed 's,$, ,g'`
AC_SUBST(OCILIB_PREFIX)
AC_SUBST(OCILIB_DOCS)
AC_SUBST(OCILIB_DEMO_SOURCES)
AC_SUBST(OCILIB_TESTS)
])

dnl ------------------------------------------------------------------------
Expand Down
31 changes: 19 additions & 12 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for ocilib 4.7.2.
# Generated by GNU Autoconf 2.69 for ocilib 4.7.3.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -587,8 +587,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ocilib'
PACKAGE_TARNAME='ocilib'
PACKAGE_VERSION='4.7.2'
PACKAGE_STRING='ocilib 4.7.2'
PACKAGE_VERSION='4.7.3'
PACKAGE_STRING='ocilib 4.7.3'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''

Expand Down Expand Up @@ -643,6 +643,7 @@ LT_AGE
LT_REVISION
LT_CURRENT
LT_RELEASE
OCILIB_TESTS
OCILIB_DEMO_SOURCES
OCILIB_DOCS
OCILIB_PREFIX
Expand Down Expand Up @@ -1342,7 +1343,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures ocilib 4.7.2 to adapt to many kinds of systems.
\`configure' configures ocilib 4.7.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1413,7 +1414,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of ocilib 4.7.2:";;
short | recursive ) echo "Configuration of ocilib 4.7.3:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1529,7 +1530,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
ocilib configure 4.7.2
ocilib configure 4.7.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1807,7 +1808,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by ocilib $as_me 4.7.2, which was
It was created by ocilib $as_me 4.7.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -2677,7 +2678,7 @@ fi

# Define the identity of the package.
PACKAGE='ocilib'
VERSION='4.7.2'
VERSION='4.7.3'


cat >>confdefs.h <<_ACEOF
Expand Down Expand Up @@ -12954,9 +12955,12 @@ $as_echo "$OCILIB_PREFIX" >&6; }
doc_files=`(cd ${srcdir:-.}/doc/html && ls -1 *.html *.css *.png)`
OCILIB_DOCS=`echo $doc_files | sed 's,$, ,g'`

demo_sources_files=`(cd ${srcdir:-.}/demo/ && ls -1 *.c *.h *.cpp *.sql)`
demo_sources_files=`(cd ${srcdir:-.}/demo && ls -1 *.c *.h *.cpp *.sql)`
OCILIB_DEMO_SOURCES=`echo $demo_sources_files | sed 's,$, ,g'`

tests_files=`(cd ${srcdir:-.}/tests && ls -1 *.h *.cpp)`
OCILIB_TESTS=`echo $tests_files | sed 's,$, ,g'`




Expand Down Expand Up @@ -13223,7 +13227,7 @@ $as_echo "$ac_ocilib_ld" >&6; }



ac_config_files="$ac_config_files README ocilib.pc Makefile src/Makefile doc/html/Makefile demo/Makefile demo/Makefile_demo"
ac_config_files="$ac_config_files README ocilib.pc Makefile src/Makefile doc/html/Makefile demo/Makefile demo/Makefile_demo demo/Makefile_demo_cpp tests/Makefile tests/Makefile_tests"


cat >confcache <<\_ACEOF
Expand Down Expand Up @@ -13759,7 +13763,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by ocilib $as_me 4.7.2, which was
This file was extended by ocilib $as_me 4.7.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -13825,7 +13829,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
ocilib config.status 4.7.2
ocilib config.status 4.7.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down Expand Up @@ -14247,6 +14251,9 @@ do
"doc/html/Makefile") CONFIG_FILES="$CONFIG_FILES doc/html/Makefile" ;;
"demo/Makefile") CONFIG_FILES="$CONFIG_FILES demo/Makefile" ;;
"demo/Makefile_demo") CONFIG_FILES="$CONFIG_FILES demo/Makefile_demo" ;;
"demo/Makefile_demo_cpp") CONFIG_FILES="$CONFIG_FILES demo/Makefile_demo_cpp" ;;
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
"tests/Makefile_tests") CONFIG_FILES="$CONFIG_FILES tests/Makefile_tests" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
Expand Down
5 changes: 4 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2007-2020 Vincent ROGIER <[email protected]>
# Copyright (c) 2007-2021 Vincent ROGIER <[email protected]>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
Expand Down Expand Up @@ -42,6 +42,9 @@ AC_CONFIG_FILES([
doc/html/Makefile
demo/Makefile
demo/Makefile_demo
demo/Makefile_demo_cpp
tests/Makefile
tests/Makefile_tests
])

AC_OUTPUT()
Expand Down
4 changes: 2 additions & 2 deletions demo/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2007-2020 Vincent ROGIER <[email protected]>
# Copyright (c) 2007-2021 Vincent ROGIER <[email protected]>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
Expand All @@ -12,7 +12,7 @@ AUTOMAKE_OPTIONS = foreign
SUBDIRS = .
CLEANFILES = *~

demo_DATA = @OCILIB_DEMO_SOURCES@ Makefile_demo
demo_DATA = @OCILIB_DEMO_SOURCES@ Makefile_demo @OCILIB_DEMO_SOURCES@ Makefile_demo_cpp
demodir = $(prefix)/share/doc/$(PACKAGE)/demo

EXTRA_DIST = $(demo_DATA)
Expand Down
12 changes: 8 additions & 4 deletions demo/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

@SET_MAKE@

# Copyright (c) 2007-2020 Vincent ROGIER <[email protected]>
# Copyright (c) 2007-2021 Vincent ROGIER <[email protected]>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
Expand Down Expand Up @@ -109,7 +109,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = Makefile_demo
CONFIG_CLEAN_FILES = Makefile_demo Makefile_demo_cpp
CONFIG_CLEAN_VPATH_FILES =
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
Expand Down Expand Up @@ -195,7 +195,8 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile_demo.in
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile_demo.in \
$(srcdir)/Makefile_demo_cpp.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
Expand Down Expand Up @@ -280,6 +281,7 @@ OCILIB_EXTRA_FLAGS = @OCILIB_EXTRA_FLAGS@
OCILIB_IMPORT = @OCILIB_IMPORT@
OCILIB_LD_FLAG = @OCILIB_LD_FLAG@
OCILIB_PREFIX = @OCILIB_PREFIX@
OCILIB_TESTS = @OCILIB_TESTS@
ORACLE_HOME = @ORACLE_HOME@
ORACLE_INCLUDES = @ORACLE_INCLUDES@
ORACLE_LIBADD = @ORACLE_LIBADD@
Expand Down Expand Up @@ -356,7 +358,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = .
CLEANFILES = *~
demo_DATA = @OCILIB_DEMO_SOURCES@ Makefile_demo
demo_DATA = @OCILIB_DEMO_SOURCES@ Makefile_demo @OCILIB_DEMO_SOURCES@ Makefile_demo_cpp
demodir = $(prefix)/share/doc/$(PACKAGE)/demo
EXTRA_DIST = $(demo_DATA)
all: all-recursive
Expand Down Expand Up @@ -393,6 +395,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
Makefile_demo: $(top_builddir)/config.status $(srcdir)/Makefile_demo.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
Makefile_demo_cpp: $(top_builddir)/config.status $(srcdir)/Makefile_demo_cpp.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@

mostlyclean-libtool:
-rm -f *.lo
Expand Down
4 changes: 2 additions & 2 deletions demo/Makefile_demo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2007-2020 Vincent ROGIER <[email protected]>
# Copyright (c) 2007-2021 Vincent ROGIER <[email protected]>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
Expand All @@ -17,7 +17,7 @@ OBJS = $(SRCS:.c=.o)

all: ocilib_demo

demo: $(OBJS)
ocilib_demo: $(OBJS)
$(CC) $(LDFLAGS) -o $@ $(OBJS)

.c.o:
Expand Down
4 changes: 2 additions & 2 deletions demo/Makefile_demo.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2007-2020 Vincent ROGIER <[email protected]>
# Copyright (c) 2007-2021 Vincent ROGIER <[email protected]>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
Expand All @@ -17,7 +17,7 @@ OBJS = $(SRCS:.c=.o)

all: ocilib_demo

demo: $(OBJS)
ocilib_demo: $(OBJS)
$(CC) $(LDFLAGS) -o $@ $(OBJS)

.c.o:
Expand Down
Loading

0 comments on commit 7599544

Please sign in to comment.