Skip to content

Commit

Permalink
Preparation for release of wxSQLite3 3.4.1
Browse files Browse the repository at this point in the history
Updgraded to SQLite3 version 3.15.0
Adjusted SQLite3 encryption extension for SQLite3 3.15.0
  • Loading branch information
utelle committed Oct 19, 2016
1 parent 6feb9d1 commit 91de286
Show file tree
Hide file tree
Showing 17 changed files with 5,833 additions and 3,968 deletions.
2 changes: 1 addition & 1 deletion build28/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

# Init this configure script with basic info about the component
# (DON'T PUT ANYTHING BEFORE AC_INIT, JUST COMMENTS)
AC_INIT([wxSqlite3], [3.4.0], [[email protected]])
AC_INIT([wxSqlite3], [3.4.1], [[email protected]])
AC_CONFIG_AUX_DIR(build)

# ENABLES/DISABLES THE DEBUG MODE FOR THIS CONFIGURE SCRIPT
Expand Down
6 changes: 4 additions & 2 deletions build30/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@

# Init this configure script with basic info about the component
# (DON'T PUT ANYTHING BEFORE AC_INIT, JUST COMMENTS)
AC_INIT([wxSqlite3], [3.4.0], [[email protected]])
AC_INIT([wxSqlite3], [3.4.1], [[email protected]])
AC_CONFIG_AUX_DIR(build)

# ENABLES/DISABLES THE DEBUG MODE FOR THIS CONFIGURE SCRIPT
#WX_DEBUG_CONFIGURE=1

m4_include(../wxcode/autoconf/wxcode.m4)
# you need the wxCode/build/bakefiles in your local repository to generate a configure
# script from this configure.ac file since wxcode.m4 is required....
m4_include(../../../build/autoconf/wxcode.m4)
WXCODE_INIT

## CONFIGURE OPTIONS
Expand Down
22 changes: 11 additions & 11 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 wxSqlite3 3.4.0.
# Generated by GNU Autoconf 2.69 for wxSqlite3 3.4.1.
#
# Report bugs to <[email protected]>.
#
Expand Down Expand Up @@ -579,8 +579,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='wxSqlite3'
PACKAGE_TARNAME='wxsqlite3'
PACKAGE_VERSION='3.4.0'
PACKAGE_STRING='wxSqlite3 3.4.0'
PACKAGE_VERSION='3.4.1'
PACKAGE_STRING='wxSqlite3 3.4.1'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''

Expand Down Expand Up @@ -1320,7 +1320,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 wxSqlite3 3.4.0 to adapt to many kinds of systems.
\`configure' configures wxSqlite3 3.4.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1386,7 +1386,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of wxSqlite3 3.4.0:";;
short | recursive ) echo "Configuration of wxSqlite3 3.4.1:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1506,7 +1506,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
wxSqlite3 configure 3.4.0
wxSqlite3 configure 3.4.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1599,7 +1599,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 wxSqlite3 $as_me 3.4.0, which was
It was created by wxSqlite3 $as_me 3.4.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -8332,7 +8332,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 wxSqlite3 $as_me 3.4.0, which was
This file was extended by wxSqlite3 $as_me 3.4.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -8385,7 +8385,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="\\
wxSqlite3 config.status 3.4.0
wxSqlite3 config.status 3.4.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down Expand Up @@ -9608,7 +9608,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 wxSqlite3 $as_me 3.4.0, which was
This file was extended by wxSqlite3 $as_me 3.4.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -9661,7 +9661,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="\\
wxSqlite3 config.status 3.4.0
wxSqlite3 config.status 3.4.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down
22 changes: 11 additions & 11 deletions configure28
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 wxSqlite3 3.4.0.
# Generated by GNU Autoconf 2.69 for wxSqlite3 3.4.1.
#
# Report bugs to <[email protected]>.
#
Expand Down Expand Up @@ -579,8 +579,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='wxSqlite3'
PACKAGE_TARNAME='wxsqlite3'
PACKAGE_VERSION='3.4.0'
PACKAGE_STRING='wxSqlite3 3.4.0'
PACKAGE_VERSION='3.4.1'
PACKAGE_STRING='wxSqlite3 3.4.1'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''

Expand Down Expand Up @@ -1323,7 +1323,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 wxSqlite3 3.4.0 to adapt to many kinds of systems.
\`configure' configures wxSqlite3 3.4.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1389,7 +1389,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of wxSqlite3 3.4.0:";;
short | recursive ) echo "Configuration of wxSqlite3 3.4.1:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1509,7 +1509,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
wxSqlite3 configure 3.4.0
wxSqlite3 configure 3.4.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1602,7 +1602,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 wxSqlite3 $as_me 3.4.0, which was
It was created by wxSqlite3 $as_me 3.4.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -8350,7 +8350,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 wxSqlite3 $as_me 3.4.0, which was
This file was extended by wxSqlite3 $as_me 3.4.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -8403,7 +8403,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="\\
wxSqlite3 config.status 3.4.0
wxSqlite3 config.status 3.4.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down Expand Up @@ -9626,7 +9626,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 wxSqlite3 $as_me 3.4.0, which was
This file was extended by wxSqlite3 $as_me 3.4.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -9679,7 +9679,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="\\
wxSqlite3 config.status 3.4.0
wxSqlite3 config.status 3.4.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down
22 changes: 11 additions & 11 deletions configure30
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 wxSqlite3 3.4.0.
# Generated by GNU Autoconf 2.69 for wxSqlite3 3.4.1.
#
# Report bugs to <[email protected]>.
#
Expand Down Expand Up @@ -579,8 +579,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='wxSqlite3'
PACKAGE_TARNAME='wxsqlite3'
PACKAGE_VERSION='3.4.0'
PACKAGE_STRING='wxSqlite3 3.4.0'
PACKAGE_VERSION='3.4.1'
PACKAGE_STRING='wxSqlite3 3.4.1'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''

Expand Down Expand Up @@ -1320,7 +1320,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 wxSqlite3 3.4.0 to adapt to many kinds of systems.
\`configure' configures wxSqlite3 3.4.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1386,7 +1386,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of wxSqlite3 3.4.0:";;
short | recursive ) echo "Configuration of wxSqlite3 3.4.1:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1506,7 +1506,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
wxSqlite3 configure 3.4.0
wxSqlite3 configure 3.4.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1599,7 +1599,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 wxSqlite3 $as_me 3.4.0, which was
It was created by wxSqlite3 $as_me 3.4.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -8332,7 +8332,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 wxSqlite3 $as_me 3.4.0, which was
This file was extended by wxSqlite3 $as_me 3.4.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -8385,7 +8385,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="\\
wxSqlite3 config.status 3.4.0
wxSqlite3 config.status 3.4.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down Expand Up @@ -9608,7 +9608,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 wxSqlite3 $as_me 3.4.0, which was
This file was extended by wxSqlite3 $as_me 3.4.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -9661,7 +9661,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="\\
wxSqlite3 config.status 3.4.0
wxSqlite3 config.status 3.4.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down
17 changes: 13 additions & 4 deletions docs/Doxyfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Doxyfile 1.8.11
# Doxyfile 1.8.12

# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
Expand Down Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = wxSQLite3
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 3.4.0
PROJECT_NUMBER = 3.4.1

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down Expand Up @@ -303,6 +303,15 @@ EXTENSION_MAPPING =

MARKDOWN_SUPPORT = YES

# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
# to that level are automatically included in the table of contents, even if
# they do not have an id attribute.
# Note: This feature currently applies only to Markdown headings.
# Minimum value: 0, maximum value: 99, default value: 0.
# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.

TOC_INCLUDE_HEADINGS = 0

# When enabled doxygen tries to link words that correspond to documented
# classes, or namespaces to their corresponding documentation. Such a link can
# be prevented in individual cases by putting a % sign in front of the word or
Expand Down Expand Up @@ -804,8 +813,8 @@ INPUT_ENCODING = UTF-8
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f, *.for, *.tcl,
# *.vhd, *.vhdl, *.ucf, *.qsf, *.as and *.js.
# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf.

FILE_PATTERNS = *.c \
*.cc \
Expand Down
2 changes: 1 addition & 1 deletion include/wx/wxsqlite3.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "wx/wxsqlite3def.h"

/// wxSQLite3 version string
#define wxSQLITE3_VERSION_STRING wxT("wxSQLite3 3.4.0")
#define wxSQLITE3_VERSION_STRING wxT("wxSQLite3 3.4.1")

#define WXSQLITE_ERROR 1000

Expand Down
6 changes: 6 additions & 0 deletions include/wx/wxsqlite3def.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@
<dl>
<dt><b>3.4.1</b> - <i>October 2016</i></dt>
<dd>
Upgrade to SQLite version 3.15.0<br>
</dd>
<dt><b>3.4.0</b> - <i>August 2016</i></dt>
<dd>
Upgrade to SQLite version 3.14.1<br>
Expand Down
3 changes: 2 additions & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ tools operate in Unicode or UTF-8 mode.

## <a name="history"></a>Version history

* 3.4.1 - *October 2016*
- Upgrade to SQLite version 3.15.0
* 3.4.0 - *August 2016*
- Upgrade to SQLite version 3.14.1
- Added method `wxSQLite3Statement::GetExpandedSQL`
Expand Down Expand Up @@ -300,7 +302,6 @@ Note: Recreating the configure script requires the following prerequisites:

- automake 1.9.6 or higher
- bakefile 0.2.5
- wxCode autoconf and bakefile files (to be downloaded from CVS or SVN)

The autoconf-based systems also support a `make install` target which
builds the library and then copies the headers of the component to
Expand Down
2 changes: 1 addition & 1 deletion sqlite3/Readme.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
This directory contains all SQLite3 version 3.14.1 files needed on
This directory contains all SQLite3 version 3.15.0 files needed on
Windows platforms.

For the version with encryption support (AES-128 or AES-256) the
Expand Down
Loading

0 comments on commit 91de286

Please sign in to comment.