Skip to content

Commit 99b012d

Browse files
committed
Prepare release of wxSQLite3 4.7.4
Upgrade to SQLite3 Multiple Ciphers version 1.3.4 (SQLite version 3.36.0)
1 parent db947a9 commit 99b012d

File tree

6 files changed

+135
-62
lines changed

6 files changed

+135
-62
lines changed

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ dnl Copyright (C) 2017-2021 Ulrich Telle <ulrich@telle-online.de>, Vadim Zeitlin
44
dnl
55
dnl This file is covered by the same licence as the entire wxSQLite3 package.
66

7-
AC_INIT([wxsqlite3], [4.7.3], [ulrich@telle-online.de])
7+
AC_INIT([wxsqlite3], [4.7.4], [ulrich@telle-online.de])
88

99
dnl This is the version tested with, might work with earlier ones.
1010
AC_PREREQ([2.69])

docs/Doxyfile

Lines changed: 100 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Doxyfile 1.8.20
1+
# Doxyfile 1.9.1
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 = 4.7.3
41+
PROJECT_NUMBER = 4.7.4
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
@@ -323,7 +323,10 @@ OPTIMIZE_OUTPUT_SLICE = NO
323323
# Note: For files without extension you can use no_extension as a placeholder.
324324
#
325325
# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
326-
# the files are not read by doxygen.
326+
# the files are not read by doxygen. When specifying no_extension you should add
327+
# * to the FILE_PATTERNS.
328+
#
329+
# Note see also the list of default file extension mappings.
327330

328331
EXTENSION_MAPPING =
329332

@@ -533,6 +536,13 @@ EXTRACT_LOCAL_METHODS = NO
533536

534537
EXTRACT_ANON_NSPACES = NO
535538

539+
# If this flag is set to YES, the name of an unnamed parameter in a declaration
540+
# will be determined by the corresponding definition. By default unnamed
541+
# parameters remain unnamed in the output.
542+
# The default value is: YES.
543+
544+
RESOLVE_UNNAMED_PARAMS = YES
545+
536546
# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
537547
# undocumented members inside documented classes or files. If set to NO these
538548
# members will be included in the various overviews, but no documentation
@@ -570,11 +580,18 @@ HIDE_IN_BODY_DOCS = NO
570580

571581
INTERNAL_DOCS = NO
572582

573-
# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
574-
# names in lower-case letters. If set to YES, upper-case letters are also
575-
# allowed. This is useful if you have classes or files whose names only differ
576-
# in case and if your file system supports case sensitive file names. Windows
577-
# (including Cygwin) and Mac users are advised to set this option to NO.
583+
# With the correct setting of option CASE_SENSE_NAMES doxygen will better be
584+
# able to match the capabilities of the underlying filesystem. In case the
585+
# filesystem is case sensitive (i.e. it supports files in the same directory
586+
# whose names only differ in casing), the option must be set to YES to properly
587+
# deal with such files in case they appear in the input. For filesystems that
588+
# are not case sensitive the option should be be set to NO to properly deal with
589+
# output files written for symbols that only differ in casing, such as for two
590+
# classes, one named CLASS and the other named Class, and to also support
591+
# references to files without having to specify the exact matching casing. On
592+
# Windows (including Cygwin) and MacOS, users should typically set this option
593+
# to NO, whereas on Linux or other Unix flavors it should typically be set to
594+
# YES.
578595
# The default value is: system dependent.
579596

580597
CASE_SENSE_NAMES = NO
@@ -813,7 +830,10 @@ WARN_IF_DOC_ERROR = YES
813830
WARN_NO_PARAMDOC = NO
814831

815832
# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
816-
# a warning is encountered.
833+
# a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS
834+
# then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but
835+
# at the end of the doxygen process doxygen will return with a non-zero status.
836+
# Possible values are: NO, YES and FAIL_ON_WARNINGS.
817837
# The default value is: NO.
818838

819839
WARN_AS_ERROR = NO
@@ -850,8 +870,8 @@ INPUT = ../include \
850870
# This tag can be used to specify the character encoding of the source files
851871
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
852872
# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
853-
# documentation (see: https://www.gnu.org/software/libiconv/) for the list of
854-
# possible encodings.
873+
# documentation (see:
874+
# https://www.gnu.org/software/libiconv/) for the list of possible encodings.
855875
# The default value is: UTF-8.
856876

857877
INPUT_ENCODING = UTF-8
@@ -864,13 +884,15 @@ INPUT_ENCODING = UTF-8
864884
# need to set EXTENSION_MAPPING for the extension otherwise the files are not
865885
# read by doxygen.
866886
#
887+
# Note the list of default checked file patterns might differ from the list of
888+
# default file extension mappings.
889+
#
867890
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
868891
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
869892
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
870893
# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
871-
# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
872-
# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
873-
# *.vhdl, *.ucf, *.qsf and *.ice.
894+
# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
895+
# *.ucf, *.qsf and *.ice.
874896

875897
FILE_PATTERNS = *.cpp \
876898
*.c++ \
@@ -1108,16 +1130,22 @@ USE_HTAGS = NO
11081130
VERBATIM_HEADERS = NO
11091131

11101132
# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
1111-
# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
1112-
# cost of reduced performance. This can be particularly helpful with template
1113-
# rich C++ code for which doxygen's built-in parser lacks the necessary type
1114-
# information.
1133+
# clang parser (see:
1134+
# http://clang.llvm.org/) for more accurate parsing at the cost of reduced
1135+
# performance. This can be particularly helpful with template rich C++ code for
1136+
# which doxygen's built-in parser lacks the necessary type information.
11151137
# Note: The availability of this option depends on whether or not doxygen was
11161138
# generated with the -Duse_libclang=ON option for CMake.
11171139
# The default value is: NO.
11181140

11191141
CLANG_ASSISTED_PARSING = NO
11201142

1143+
# If clang assisted parsing is enabled and the CLANG_ADD_INC_PATHS tag is set to
1144+
# YES then doxygen will add the directory of each input to the include path.
1145+
# The default value is: YES.
1146+
1147+
CLANG_ADD_INC_PATHS = YES
1148+
11211149
# If clang assisted parsing is enabled you can provide the compiler with command
11221150
# line options that you would normally use when invoking the compiler. Note that
11231151
# the include paths will already be set by doxygen for the files and directories
@@ -1131,7 +1159,7 @@ CLANG_OPTIONS =
11311159
# file is the compilation database (see:
11321160
# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) containing the
11331161
# options used when the source files were built. This is equivalent to
1134-
# specifying the "-p" option to a clang tool, such as clang-check. These options
1162+
# specifying the -p option to a clang tool, such as clang-check. These options
11351163
# will then be passed to the parser. Any options specified with CLANG_OPTIONS
11361164
# will be added as well.
11371165
# Note: The availability of this option depends on whether or not doxygen was
@@ -1150,13 +1178,6 @@ CLANG_DATABASE_PATH =
11501178

11511179
ALPHABETICAL_INDEX = NO
11521180

1153-
# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
1154-
# which the alphabetical index list will be split.
1155-
# Minimum value: 1, maximum value: 20, default value: 5.
1156-
# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
1157-
1158-
COLS_IN_ALPHA_INDEX = 5
1159-
11601181
# In case all classes in a project start with a common prefix, all classes will
11611182
# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
11621183
# can be used to specify a prefix (or a list of prefixes) that should be ignored
@@ -1327,10 +1348,11 @@ HTML_INDEX_NUM_ENTRIES = 100
13271348

13281349
# If the GENERATE_DOCSET tag is set to YES, additional index files will be
13291350
# generated that can be used as input for Apple's Xcode 3 integrated development
1330-
# environment (see: https://developer.apple.com/xcode/), introduced with OSX
1331-
# 10.5 (Leopard). To create a documentation set, doxygen will generate a
1332-
# Makefile in the HTML output directory. Running make will produce the docset in
1333-
# that directory and running make install will install the docset in
1351+
# environment (see:
1352+
# https://developer.apple.com/xcode/), introduced with OSX 10.5 (Leopard). To
1353+
# create a documentation set, doxygen will generate a Makefile in the HTML
1354+
# output directory. Running make will produce the docset in that directory and
1355+
# running make install will install the docset in
13341356
# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
13351357
# startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy
13361358
# genXcode/_index.html for more information.
@@ -1372,8 +1394,8 @@ DOCSET_PUBLISHER_NAME = Publisher
13721394
# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
13731395
# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
13741396
# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
1375-
# (see: https://www.microsoft.com/en-us/download/details.aspx?id=21138) on
1376-
# Windows.
1397+
# (see:
1398+
# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
13771399
#
13781400
# The HTML Help Workshop contains a compiler that can convert all HTML output
13791401
# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1448,33 +1470,34 @@ QCH_FILE =
14481470

14491471
# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
14501472
# Project output. For more information please see Qt Help Project / Namespace
1451-
# (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
1473+
# (see:
1474+
# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
14521475
# The default value is: org.doxygen.Project.
14531476
# This tag requires that the tag GENERATE_QHP is set to YES.
14541477

14551478
QHP_NAMESPACE = org.doxygen.Project
14561479

14571480
# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
14581481
# Help Project output. For more information please see Qt Help Project / Virtual
1459-
# Folders (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-
1460-
# folders).
1482+
# Folders (see:
1483+
# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-folders).
14611484
# The default value is: doc.
14621485
# This tag requires that the tag GENERATE_QHP is set to YES.
14631486

14641487
QHP_VIRTUAL_FOLDER = doc
14651488

14661489
# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
14671490
# filter to add. For more information please see Qt Help Project / Custom
1468-
# Filters (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
1469-
# filters).
1491+
# Filters (see:
1492+
# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
14701493
# This tag requires that the tag GENERATE_QHP is set to YES.
14711494

14721495
QHP_CUST_FILTER_NAME =
14731496

14741497
# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
14751498
# custom filter to add. For more information please see Qt Help Project / Custom
1476-
# Filters (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
1477-
# filters).
1499+
# Filters (see:
1500+
# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
14781501
# This tag requires that the tag GENERATE_QHP is set to YES.
14791502

14801503
QHP_CUST_FILTER_ATTRS =
@@ -1486,9 +1509,9 @@ QHP_CUST_FILTER_ATTRS =
14861509

14871510
QHP_SECT_FILTER_ATTRS =
14881511

1489-
# The QHG_LOCATION tag can be used to specify the location of Qt's
1490-
# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
1491-
# generated .qhp file.
1512+
# The QHG_LOCATION tag can be used to specify the location (absolute path
1513+
# including file name) of Qt's qhelpgenerator. If non-empty doxygen will try to
1514+
# run qhelpgenerator on the generated .qhp file.
14921515
# This tag requires that the tag GENERATE_QHP is set to YES.
14931516

14941517
QHG_LOCATION =
@@ -1615,7 +1638,7 @@ USE_MATHJAX = NO
16151638

16161639
# When MathJax is enabled you can set the default output format to be used for
16171640
# the MathJax output. See the MathJax site (see:
1618-
# http://docs.mathjax.org/en/latest/output.html) for more details.
1641+
# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
16191642
# Possible values are: HTML-CSS (which is slower, but has the best
16201643
# compatibility), NativeMML (i.e. MathML) and SVG.
16211644
# The default value is: HTML-CSS.
@@ -1645,7 +1668,8 @@ MATHJAX_EXTENSIONS =
16451668

16461669
# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
16471670
# of code that will be used on startup of the MathJax code. See the MathJax site
1648-
# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
1671+
# (see:
1672+
# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details. For an
16491673
# example see the documentation.
16501674
# This tag requires that the tag USE_MATHJAX is set to YES.
16511675

@@ -1692,7 +1716,8 @@ SERVER_BASED_SEARCH = NO
16921716
#
16931717
# Doxygen ships with an example indexer (doxyindexer) and search engine
16941718
# (doxysearch.cgi) which are based on the open source search engine library
1695-
# Xapian (see: https://xapian.org/).
1719+
# Xapian (see:
1720+
# https://xapian.org/).
16961721
#
16971722
# See the section "External Indexing and Searching" for details.
16981723
# The default value is: NO.
@@ -1705,8 +1730,9 @@ EXTERNAL_SEARCH = NO
17051730
#
17061731
# Doxygen ships with an example indexer (doxyindexer) and search engine
17071732
# (doxysearch.cgi) which are based on the open source search engine library
1708-
# Xapian (see: https://xapian.org/). See the section "External Indexing and
1709-
# Searching" for details.
1733+
# Xapian (see:
1734+
# https://xapian.org/). See the section "External Indexing and Searching" for
1735+
# details.
17101736
# This tag requires that the tag SEARCHENGINE is set to YES.
17111737

17121738
SEARCHENGINE_URL =
@@ -2391,10 +2417,32 @@ UML_LOOK = NO
23912417
# but if the number exceeds 15, the total amount of fields shown is limited to
23922418
# 10.
23932419
# Minimum value: 0, maximum value: 100, default value: 10.
2394-
# This tag requires that the tag HAVE_DOT is set to YES.
2420+
# This tag requires that the tag UML_LOOK is set to YES.
23952421

23962422
UML_LIMIT_NUM_FIELDS = 10
23972423

2424+
# If the DOT_UML_DETAILS tag is set to NO, doxygen will show attributes and
2425+
# methods without types and arguments in the UML graphs. If the DOT_UML_DETAILS
2426+
# tag is set to YES, doxygen will add type and arguments for attributes and
2427+
# methods in the UML graphs. If the DOT_UML_DETAILS tag is set to NONE, doxygen
2428+
# will not generate fields with class member information in the UML graphs. The
2429+
# class diagrams will look similar to the default class diagrams but using UML
2430+
# notation for the relationships.
2431+
# Possible values are: NO, YES and NONE.
2432+
# The default value is: NO.
2433+
# This tag requires that the tag UML_LOOK is set to YES.
2434+
2435+
DOT_UML_DETAILS = NO
2436+
2437+
# The DOT_WRAP_THRESHOLD tag can be used to set the maximum number of characters
2438+
# to display on a single line. If the actual line length exceeds this threshold
2439+
# significantly it will wrapped across multiple lines. Some heuristics are apply
2440+
# to avoid ugly line breaks.
2441+
# Minimum value: 0, maximum value: 1000, default value: 17.
2442+
# This tag requires that the tag HAVE_DOT is set to YES.
2443+
2444+
DOT_WRAP_THRESHOLD = 17
2445+
23982446
# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
23992447
# collaboration graphs will show the relations between templates and their
24002448
# instances.
@@ -2584,9 +2632,11 @@ DOT_MULTI_TARGETS = NO
25842632

25852633
GENERATE_LEGEND = YES
25862634

2587-
# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
2635+
# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
25882636
# files that are used to generate the various graphs.
2637+
#
2638+
# Note: This setting is not only used for dot files but also for msc and
2639+
# plantuml temporary files.
25892640
# The default value is: YES.
2590-
# This tag requires that the tag HAVE_DOT is set to YES.
25912641

25922642
DOT_CLEANUP = YES

include/wx/wxsqlite3_version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
#define WXSQLITE3_MAJOR_VERSION 4
1616
#define WXSQLITE3_MINOR_VERSION 7
17-
#define WXSQLITE3_RELEASE_NUMBER 3
17+
#define WXSQLITE3_RELEASE_NUMBER 4
1818
#define WXSQLITE3_SUBRELEASE_NUMBER 0
19-
#define WXSQLITE3_VERSION_STRING "wxSQLite3 4.7.3"
19+
#define WXSQLITE3_VERSION_STRING "wxSQLite3 4.7.4"
2020

2121
#endif // WXSQLITE3_VERSION_H_

include/wx/wxsqlite3def.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@
4646
4747
<dl>
4848
49+
<dt><b>4.7.4</b> - <i>July 2021</i></dt>
50+
<dd>
51+
Upgrade to <i>SQLite3 Multiple Ciphers version 1.3.4 (SQLite version 3.36.0)</i><br>
52+
53+
</dd>
4954
<dt><b>4.7.3</b> - <i>June 2021</i></dt>
5055
<dd>
5156
Upgrade to <i>SQLite3 Multiple Ciphers version 1.3.3 (SQLite version 3.36.0)</i><br>

readme.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ Since August 2020 a new implementation of an encryption extension, capable of su
4848

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

51+
* 4.7.4 - *July 2021*
52+
- Upgrade to SQLite3 Multiple Ciphers version 1.3.4 (SQLite version 3.36.0)
5153
* 4.7.3 - *June 2021*
5254
- Upgrade to SQLite3 Multiple Ciphers version 1.3.3 (SQLite version 3.36.0)
5355
* 4.7.2 - *May 2021*

0 commit comments

Comments
 (0)