| Index: third_party/sqlite/src/tool/mksqlite3h.tcl
|
| diff --git a/third_party/sqlite/src/tool/mksqlite3h.tcl b/third_party/sqlite/src/tool/mksqlite3h.tcl
|
| index 3f59aef4675dd478b48a7fd253c60896e25f6509..9d307d1b1ee98acbc2594e529772c9b13b7ebc62 100644
|
| --- a/third_party/sqlite/src/tool/mksqlite3h.tcl
|
| +++ b/third_party/sqlite/src/tool/mksqlite3h.tcl
|
| @@ -10,17 +10,19 @@
|
| #
|
| # Run this script by specifying the root directory of the source tree
|
| # on the command-line.
|
| -#
|
| +#
|
| # This script performs processing on src/sqlite.h.in. It:
|
| #
|
| # 1) Adds SQLITE_EXTERN in front of the declaration of global variables,
|
| # 2) Adds SQLITE_API in front of the declaration of API functions,
|
| -# 3) Replaces the string --VERS-- with the current library version,
|
| +# 3) Replaces the string --VERS-- with the current library version,
|
| # formatted as a string (e.g. "3.6.17"), and
|
| # 4) Replaces the string --VERSION-NUMBER-- with current library version,
|
| # formatted as an integer (e.g. "3006017").
|
| -# 5) Replaces the string --SOURCE-ID-- with the date and time and sha1
|
| +# 5) Replaces the string --SOURCE-ID-- with the date and time and sha1
|
| # hash of the fossil-scm manifest for the source tree.
|
| +# 6) Adds the SQLITE_CALLBACK calling convention macro in front of all
|
| +# callback declarations.
|
| #
|
| # This script outputs to stdout.
|
| #
|
| @@ -34,6 +36,14 @@
|
| #
|
| set TOP [lindex $argv 0]
|
|
|
| +# Enable use of SQLITE_APICALL macros at the right points?
|
| +#
|
| +set useapicall 0
|
| +
|
| +if {[lsearch -regexp [lrange $argv 1 end] {^-+useapicall}] != -1} {
|
| + set useapicall 1
|
| +}
|
| +
|
| # Get the SQLite version number (ex: 3.6.18) from the $TOP/VERSION file.
|
| #
|
| set in [open $TOP/VERSION]
|
| @@ -63,7 +73,13 @@ close $in
|
| # Set up patterns for recognizing API declarations.
|
| #
|
| set varpattern {^[a-zA-Z][a-zA-Z_0-9 *]+sqlite3_[_a-zA-Z0-9]+(\[|;| =)}
|
| -set declpattern {^ *([a-zA-Z][a-zA-Z_0-9 ]+ \**)(sqlite3_[_a-zA-Z0-9]+)(\(.*)$}
|
| +set declpattern1 {^ *([a-zA-Z][a-zA-Z_0-9 ]+ \**)(sqlite3_[_a-zA-Z0-9]+)(\(.*)$}
|
| +
|
| +set declpattern2 \
|
| + {^ *([a-zA-Z][a-zA-Z_0-9 ]+ \**)(sqlite3session_[_a-zA-Z0-9]+)(\(.*)$}
|
| +
|
| +set declpattern3 \
|
| + {^ *([a-zA-Z][a-zA-Z_0-9 ]+ \**)(sqlite3changeset_[_a-zA-Z0-9]+)(\(.*)$}
|
|
|
| # Force the output to use unix line endings, even on Windows.
|
| fconfigure stdout -translation lf
|
| @@ -71,6 +87,7 @@ fconfigure stdout -translation lf
|
| set filelist [subst {
|
| $TOP/src/sqlite.h.in
|
| $TOP/ext/rtree/sqlite3rtree.h
|
| + $TOP/ext/session/sqlite3session.h
|
| $TOP/ext/fts5/fts5.h
|
| }]
|
|
|
| @@ -91,15 +108,18 @@ set cdecllist {
|
| #
|
| foreach file $filelist {
|
| set in [open $file]
|
| + if {![regexp {sqlite\.h\.in} $file]} {
|
| + puts "/******** Begin file [file tail $file] *********/"
|
| + }
|
| while {![eof $in]} {
|
| -
|
| +
|
| set line [gets $in]
|
|
|
| # File sqlite3rtree.h contains a line "#include <sqlite3.h>". Omit this
|
| # line when copying sqlite3rtree.h into sqlite3.h.
|
| #
|
| if {[string match {*#include*[<"]sqlite3.h[>"]*} $line]} continue
|
| -
|
| +
|
| regsub -- --VERS-- $line $zVersion line
|
| regsub -- --VERSION-NUMBER-- $line $nVersion line
|
| regsub -- --SOURCE-ID-- $line "$zDate $zUuid" line
|
| @@ -107,21 +127,33 @@ foreach file $filelist {
|
| if {[regexp $varpattern $line] && ![regexp {^ *typedef} $line]} {
|
| set line "SQLITE_API $line"
|
| } else {
|
| - if {[regexp $declpattern $line all rettype funcname rest]} {
|
| + if {[regexp $declpattern1 $line all rettype funcname rest] || \
|
| + [regexp $declpattern2 $line all rettype funcname rest] || \
|
| + [regexp $declpattern3 $line all rettype funcname rest]} {
|
| set line SQLITE_API
|
| append line " " [string trim $rettype]
|
| if {[string index $rettype end] ne "*"} {
|
| append line " "
|
| }
|
| - if {[lsearch -exact $cdecllist $funcname] >= 0} {
|
| - append line SQLITE_CDECL
|
| - } else {
|
| - append line SQLITE_STDCALL
|
| + if {$useapicall} {
|
| + if {[lsearch -exact $cdecllist $funcname] >= 0} {
|
| + append line SQLITE_CDECL " "
|
| + } else {
|
| + append line SQLITE_APICALL " "
|
| + }
|
| }
|
| - append line " " $funcname $rest
|
| + append line $funcname $rest
|
| }
|
| }
|
| + if {$useapicall} {
|
| + set line [string map [list (*sqlite3_syscall_ptr) \
|
| + "(SQLITE_SYSAPI *sqlite3_syscall_ptr)"] $line]
|
| + regsub {\(\*} $line {(SQLITE_CALLBACK *} line
|
| + }
|
| puts $line
|
| }
|
| close $in
|
| + if {![regexp {sqlite\.h\.in} $file]} {
|
| + puts "/******** End of [file tail $file] *********/"
|
| + }
|
| }
|
|
|