Skip to content

Commit 91de286

Browse files
committed
Preparation for release of wxSQLite3 3.4.1
Updgraded to SQLite3 version 3.15.0 Adjusted SQLite3 encryption extension for SQLite3 3.15.0
1 parent 6feb9d1 commit 91de286

File tree

17 files changed

+5833
-3968
lines changed

17 files changed

+5833
-3968
lines changed

build28/configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
# Init this configure script with basic info about the component
1212
# (DON'T PUT ANYTHING BEFORE AC_INIT, JUST COMMENTS)
13-
AC_INIT([wxSqlite3], [3.4.0], [utelle@users.sourceforge.net])
13+
AC_INIT([wxSqlite3], [3.4.1], [utelle@users.sourceforge.net])
1414
AC_CONFIG_AUX_DIR(build)
1515

1616
# ENABLES/DISABLES THE DEBUG MODE FOR THIS CONFIGURE SCRIPT

build30/configure.ac

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@
1010

1111
# Init this configure script with basic info about the component
1212
# (DON'T PUT ANYTHING BEFORE AC_INIT, JUST COMMENTS)
13-
AC_INIT([wxSqlite3], [3.4.0], [utelle@users.sourceforge.net])
13+
AC_INIT([wxSqlite3], [3.4.1], [utelle@users.sourceforge.net])
1414
AC_CONFIG_AUX_DIR(build)
1515

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

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

2224
## CONFIGURE OPTIONS

configure

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.69 for wxSqlite3 3.4.0.
3+
# Generated by GNU Autoconf 2.69 for wxSqlite3 3.4.1.
44
#
55
# Report bugs to <utelle@users.sourceforge.net>.
66
#
@@ -579,8 +579,8 @@ MAKEFLAGS=
579579
# Identity of this package.
580580
PACKAGE_NAME='wxSqlite3'
581581
PACKAGE_TARNAME='wxsqlite3'
582-
PACKAGE_VERSION='3.4.0'
583-
PACKAGE_STRING='wxSqlite3 3.4.0'
582+
PACKAGE_VERSION='3.4.1'
583+
PACKAGE_STRING='wxSqlite3 3.4.1'
584584
PACKAGE_BUGREPORT='utelle@users.sourceforge.net'
585585
PACKAGE_URL=''
586586

@@ -1320,7 +1320,7 @@ if test "$ac_init_help" = "long"; then
13201320
# Omit some internal or obsolete options to make the list less imposing.
13211321
# This message is too long to be a string in the A/UX 3.1 sh.
13221322
cat <<_ACEOF
1323-
\`configure' configures wxSqlite3 3.4.0 to adapt to many kinds of systems.
1323+
\`configure' configures wxSqlite3 3.4.1 to adapt to many kinds of systems.
13241324
13251325
Usage: $0 [OPTION]... [VAR=VALUE]...
13261326
@@ -1386,7 +1386,7 @@ fi
13861386

13871387
if test -n "$ac_init_help"; then
13881388
case $ac_init_help in
1389-
short | recursive ) echo "Configuration of wxSqlite3 3.4.0:";;
1389+
short | recursive ) echo "Configuration of wxSqlite3 3.4.1:";;
13901390
esac
13911391
cat <<\_ACEOF
13921392
@@ -1506,7 +1506,7 @@ fi
15061506
test -n "$ac_init_help" && exit $ac_status
15071507
if $ac_init_version; then
15081508
cat <<\_ACEOF
1509-
wxSqlite3 configure 3.4.0
1509+
wxSqlite3 configure 3.4.1
15101510
generated by GNU Autoconf 2.69
15111511
15121512
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1599,7 +1599,7 @@ cat >config.log <<_ACEOF
15991599
This file contains any messages produced by compilers while
16001600
running configure, to aid debugging if configure makes a mistake.
16011601
1602-
It was created by wxSqlite3 $as_me 3.4.0, which was
1602+
It was created by wxSqlite3 $as_me 3.4.1, which was
16031603
generated by GNU Autoconf 2.69. Invocation command line was
16041604
16051605
$ $0 $@
@@ -8332,7 +8332,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
83328332
# report actual input values of CONFIG_FILES etc. instead of their
83338333
# values after options handling.
83348334
ac_log="
8335-
This file was extended by wxSqlite3 $as_me 3.4.0, which was
8335+
This file was extended by wxSqlite3 $as_me 3.4.1, which was
83368336
generated by GNU Autoconf 2.69. Invocation command line was
83378337
83388338
CONFIG_FILES = $CONFIG_FILES
@@ -8385,7 +8385,7 @@ _ACEOF
83858385
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
83868386
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
83878387
ac_cs_version="\\
8388-
wxSqlite3 config.status 3.4.0
8388+
wxSqlite3 config.status 3.4.1
83898389
configured by $0, generated by GNU Autoconf 2.69,
83908390
with options \\"\$ac_cs_config\\"
83918391
@@ -9608,7 +9608,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
96089608
# report actual input values of CONFIG_FILES etc. instead of their
96099609
# values after options handling.
96109610
ac_log="
9611-
This file was extended by wxSqlite3 $as_me 3.4.0, which was
9611+
This file was extended by wxSqlite3 $as_me 3.4.1, which was
96129612
generated by GNU Autoconf 2.69. Invocation command line was
96139613
96149614
CONFIG_FILES = $CONFIG_FILES
@@ -9661,7 +9661,7 @@ _ACEOF
96619661
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
96629662
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
96639663
ac_cs_version="\\
9664-
wxSqlite3 config.status 3.4.0
9664+
wxSqlite3 config.status 3.4.1
96659665
configured by $0, generated by GNU Autoconf 2.69,
96669666
with options \\"\$ac_cs_config\\"
96679667

configure28

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.69 for wxSqlite3 3.4.0.
3+
# Generated by GNU Autoconf 2.69 for wxSqlite3 3.4.1.
44
#
55
# Report bugs to <utelle@users.sourceforge.net>.
66
#
@@ -579,8 +579,8 @@ MAKEFLAGS=
579579
# Identity of this package.
580580
PACKAGE_NAME='wxSqlite3'
581581
PACKAGE_TARNAME='wxsqlite3'
582-
PACKAGE_VERSION='3.4.0'
583-
PACKAGE_STRING='wxSqlite3 3.4.0'
582+
PACKAGE_VERSION='3.4.1'
583+
PACKAGE_STRING='wxSqlite3 3.4.1'
584584
PACKAGE_BUGREPORT='utelle@users.sourceforge.net'
585585
PACKAGE_URL=''
586586

@@ -1323,7 +1323,7 @@ if test "$ac_init_help" = "long"; then
13231323
# Omit some internal or obsolete options to make the list less imposing.
13241324
# This message is too long to be a string in the A/UX 3.1 sh.
13251325
cat <<_ACEOF
1326-
\`configure' configures wxSqlite3 3.4.0 to adapt to many kinds of systems.
1326+
\`configure' configures wxSqlite3 3.4.1 to adapt to many kinds of systems.
13271327
13281328
Usage: $0 [OPTION]... [VAR=VALUE]...
13291329
@@ -1389,7 +1389,7 @@ fi
13891389

13901390
if test -n "$ac_init_help"; then
13911391
case $ac_init_help in
1392-
short | recursive ) echo "Configuration of wxSqlite3 3.4.0:";;
1392+
short | recursive ) echo "Configuration of wxSqlite3 3.4.1:";;
13931393
esac
13941394
cat <<\_ACEOF
13951395
@@ -1509,7 +1509,7 @@ fi
15091509
test -n "$ac_init_help" && exit $ac_status
15101510
if $ac_init_version; then
15111511
cat <<\_ACEOF
1512-
wxSqlite3 configure 3.4.0
1512+
wxSqlite3 configure 3.4.1
15131513
generated by GNU Autoconf 2.69
15141514
15151515
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1602,7 +1602,7 @@ cat >config.log <<_ACEOF
16021602
This file contains any messages produced by compilers while
16031603
running configure, to aid debugging if configure makes a mistake.
16041604
1605-
It was created by wxSqlite3 $as_me 3.4.0, which was
1605+
It was created by wxSqlite3 $as_me 3.4.1, which was
16061606
generated by GNU Autoconf 2.69. Invocation command line was
16071607
16081608
$ $0 $@
@@ -8350,7 +8350,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
83508350
# report actual input values of CONFIG_FILES etc. instead of their
83518351
# values after options handling.
83528352
ac_log="
8353-
This file was extended by wxSqlite3 $as_me 3.4.0, which was
8353+
This file was extended by wxSqlite3 $as_me 3.4.1, which was
83548354
generated by GNU Autoconf 2.69. Invocation command line was
83558355
83568356
CONFIG_FILES = $CONFIG_FILES
@@ -8403,7 +8403,7 @@ _ACEOF
84038403
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
84048404
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
84058405
ac_cs_version="\\
8406-
wxSqlite3 config.status 3.4.0
8406+
wxSqlite3 config.status 3.4.1
84078407
configured by $0, generated by GNU Autoconf 2.69,
84088408
with options \\"\$ac_cs_config\\"
84098409
@@ -9626,7 +9626,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
96269626
# report actual input values of CONFIG_FILES etc. instead of their
96279627
# values after options handling.
96289628
ac_log="
9629-
This file was extended by wxSqlite3 $as_me 3.4.0, which was
9629+
This file was extended by wxSqlite3 $as_me 3.4.1, which was
96309630
generated by GNU Autoconf 2.69. Invocation command line was
96319631
96329632
CONFIG_FILES = $CONFIG_FILES
@@ -9679,7 +9679,7 @@ _ACEOF
96799679
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
96809680
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
96819681
ac_cs_version="\\
9682-
wxSqlite3 config.status 3.4.0
9682+
wxSqlite3 config.status 3.4.1
96839683
configured by $0, generated by GNU Autoconf 2.69,
96849684
with options \\"\$ac_cs_config\\"
96859685

configure30

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.69 for wxSqlite3 3.4.0.
3+
# Generated by GNU Autoconf 2.69 for wxSqlite3 3.4.1.
44
#
55
# Report bugs to <utelle@users.sourceforge.net>.
66
#
@@ -579,8 +579,8 @@ MAKEFLAGS=
579579
# Identity of this package.
580580
PACKAGE_NAME='wxSqlite3'
581581
PACKAGE_TARNAME='wxsqlite3'
582-
PACKAGE_VERSION='3.4.0'
583-
PACKAGE_STRING='wxSqlite3 3.4.0'
582+
PACKAGE_VERSION='3.4.1'
583+
PACKAGE_STRING='wxSqlite3 3.4.1'
584584
PACKAGE_BUGREPORT='utelle@users.sourceforge.net'
585585
PACKAGE_URL=''
586586

@@ -1320,7 +1320,7 @@ if test "$ac_init_help" = "long"; then
13201320
# Omit some internal or obsolete options to make the list less imposing.
13211321
# This message is too long to be a string in the A/UX 3.1 sh.
13221322
cat <<_ACEOF
1323-
\`configure' configures wxSqlite3 3.4.0 to adapt to many kinds of systems.
1323+
\`configure' configures wxSqlite3 3.4.1 to adapt to many kinds of systems.
13241324
13251325
Usage: $0 [OPTION]... [VAR=VALUE]...
13261326
@@ -1386,7 +1386,7 @@ fi
13861386

13871387
if test -n "$ac_init_help"; then
13881388
case $ac_init_help in
1389-
short | recursive ) echo "Configuration of wxSqlite3 3.4.0:";;
1389+
short | recursive ) echo "Configuration of wxSqlite3 3.4.1:";;
13901390
esac
13911391
cat <<\_ACEOF
13921392
@@ -1506,7 +1506,7 @@ fi
15061506
test -n "$ac_init_help" && exit $ac_status
15071507
if $ac_init_version; then
15081508
cat <<\_ACEOF
1509-
wxSqlite3 configure 3.4.0
1509+
wxSqlite3 configure 3.4.1
15101510
generated by GNU Autoconf 2.69
15111511
15121512
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1599,7 +1599,7 @@ cat >config.log <<_ACEOF
15991599
This file contains any messages produced by compilers while
16001600
running configure, to aid debugging if configure makes a mistake.
16011601
1602-
It was created by wxSqlite3 $as_me 3.4.0, which was
1602+
It was created by wxSqlite3 $as_me 3.4.1, which was
16031603
generated by GNU Autoconf 2.69. Invocation command line was
16041604
16051605
$ $0 $@
@@ -8332,7 +8332,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
83328332
# report actual input values of CONFIG_FILES etc. instead of their
83338333
# values after options handling.
83348334
ac_log="
8335-
This file was extended by wxSqlite3 $as_me 3.4.0, which was
8335+
This file was extended by wxSqlite3 $as_me 3.4.1, which was
83368336
generated by GNU Autoconf 2.69. Invocation command line was
83378337
83388338
CONFIG_FILES = $CONFIG_FILES
@@ -8385,7 +8385,7 @@ _ACEOF
83858385
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
83868386
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
83878387
ac_cs_version="\\
8388-
wxSqlite3 config.status 3.4.0
8388+
wxSqlite3 config.status 3.4.1
83898389
configured by $0, generated by GNU Autoconf 2.69,
83908390
with options \\"\$ac_cs_config\\"
83918391
@@ -9608,7 +9608,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
96089608
# report actual input values of CONFIG_FILES etc. instead of their
96099609
# values after options handling.
96109610
ac_log="
9611-
This file was extended by wxSqlite3 $as_me 3.4.0, which was
9611+
This file was extended by wxSqlite3 $as_me 3.4.1, which was
96129612
generated by GNU Autoconf 2.69. Invocation command line was
96139613
96149614
CONFIG_FILES = $CONFIG_FILES
@@ -9661,7 +9661,7 @@ _ACEOF
96619661
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
96629662
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
96639663
ac_cs_version="\\
9664-
wxSqlite3 config.status 3.4.0
9664+
wxSqlite3 config.status 3.4.1
96659665
configured by $0, generated by GNU Autoconf 2.69,
96669666
with options \\"\$ac_cs_config\\"
96679667

docs/Doxyfile

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Doxyfile 1.8.11
1+
# Doxyfile 1.8.12
22

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

41-
PROJECT_NUMBER = 3.4.0
41+
PROJECT_NUMBER = 3.4.1
4242

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

304304
MARKDOWN_SUPPORT = YES
305305

306+
# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
307+
# to that level are automatically included in the table of contents, even if
308+
# they do not have an id attribute.
309+
# Note: This feature currently applies only to Markdown headings.
310+
# Minimum value: 0, maximum value: 99, default value: 0.
311+
# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
312+
313+
TOC_INCLUDE_HEADINGS = 0
314+
306315
# When enabled doxygen tries to link words that correspond to documented
307316
# classes, or namespaces to their corresponding documentation. Such a link can
308317
# be prevented in individual cases by putting a % sign in front of the word or
@@ -804,8 +813,8 @@ INPUT_ENCODING = UTF-8
804813
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
805814
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
806815
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
807-
# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f, *.for, *.tcl,
808-
# *.vhd, *.vhdl, *.ucf, *.qsf, *.as and *.js.
816+
# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
817+
# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf.
809818

810819
FILE_PATTERNS = *.c \
811820
*.cc \

include/wx/wxsqlite3.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "wx/wxsqlite3def.h"
2828

2929
/// wxSQLite3 version string
30-
#define wxSQLITE3_VERSION_STRING wxT("wxSQLite3 3.4.0")
30+
#define wxSQLITE3_VERSION_STRING wxT("wxSQLite3 3.4.1")
3131

3232
#define WXSQLITE_ERROR 1000
3333

include/wx/wxsqlite3def.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@
4747
4848
<dl>
4949
50+
<dt><b>3.4.1</b> - <i>October 2016</i></dt>
51+
<dd>
52+
Upgrade to SQLite version 3.15.0<br>
53+
54+
55+
</dd>
5056
<dt><b>3.4.0</b> - <i>August 2016</i></dt>
5157
<dd>
5258
Upgrade to SQLite version 3.14.1<br>

readme.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ tools operate in Unicode or UTF-8 mode.
2525

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

28+
* 3.4.1 - *October 2016*
29+
- Upgrade to SQLite version 3.15.0
2830
* 3.4.0 - *August 2016*
2931
- Upgrade to SQLite version 3.14.1
3032
- Added method `wxSQLite3Statement::GetExpandedSQL`
@@ -300,7 +302,6 @@ Note: Recreating the configure script requires the following prerequisites:
300302

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

305306
The autoconf-based systems also support a `make install` target which
306307
builds the library and then copies the headers of the component to

sqlite3/Readme.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
This directory contains all SQLite3 version 3.14.1 files needed on
1+
This directory contains all SQLite3 version 3.15.0 files needed on
22
Windows platforms.
33

44
For the version with encryption support (AES-128 or AES-256) the

0 commit comments

Comments
 (0)