From bb12cdc11b5e2c18bb314eb676e8523bfb54c32b Mon Sep 17 00:00:00 2001 From: stephan Date: Wed, 25 Sep 2024 23:09:38 +0000 Subject: [PATCH] Time for a break. FossilOrigin-Name: 1d29cd9095595b7b027b90d644dc4767fde0b6f98316c0eb82014b7aad6770d7 --- Makefile.in | 1108 ++++++++++++++++++------------------ auto.def | 17 +- autosetup/hwaci-common.tcl | 8 +- manifest | 16 +- manifest.uuid | 2 +- 5 files changed, 585 insertions(+), 566 deletions(-) diff --git a/Makefile.in b/Makefile.in index 687d482915..69e0736801 100644 --- a/Makefile.in +++ b/Makefile.in @@ -19,10 +19,10 @@ TOP = @abs_top_srcdir@ # top_srcdir = @top_srcdir@ # abs_top_srcdir = @abs_top_srcdir@ # abs_top_builddir = @abs_top_builddir@ -# LDFLAGS_ZLIB = @LDFLAGS_ZLIB@ -# LDFLAGS_MATH = @LDFLAGS_MATH@ -# LD = @LD@ -# AR = @AR@ +LDFLAGS_ZLIB = @LDFLAGS_ZLIB@ +LDFLAGS_MATH = @LDFLAGS_MATH@ +LD = @LD@ +AR = @AR@ # C Compiler and options for use in building executables that # will run on the platform that is doing the build. @@ -80,12 +80,12 @@ CFLAGS = @CPPFLAGS@ @CFLAGS@ #XX## #XX#TLIBS = @LIBS@ $(LIBS) #XX# -#XX## Flags controlling use of the in memory btree implementation -#XX## -#XX## SQLITE_TEMP_STORE is 0 to force temporary tables to be in a file, 1 to -#XX## default to file, 2 to default to memory, and 3 to force temporary -#XX## tables to always be in memory. -#XX## +# Flags controlling use of the in memory btree implementation +# +# SQLITE_TEMP_STORE is 0 to force temporary tables to be in a file, 1 to +# default to file, 2 to default to memory, and 3 to force temporary +# tables to always be in memory. +# TEMP_STORE = -DSQLITE_TEMP_STORE=@TEMP_STORE@ # Enable/disable loadable extensions, and other optional features @@ -98,27 +98,29 @@ TEMP_STORE = -DSQLITE_TEMP_STORE=@TEMP_STORE@ # the build is specifically configured to account for them. # OPT_FEATURE_FLAGS = @OPT_FEATURE_FLAGS@ $(OPTIONS) -#XX# -#XX#TCC += $(OPT_FEATURE_FLAGS) -#XX# -#XX## Add in any optional parameters specified on the make commane line -#XX## ie. make "OPTS=-DSQLITE_ENABLE_FOO=1 -DSQLITE_OMIT_FOO=1". -#XX#TCC += $(OPTS) -#XX# -#XX## Add in compile-time options for some libraries used by extensions -#XX#TCC += @HAVE_ZLIB@ -#XX# -#XX## Version numbers and release number for the SQLite being compiled. -#XX## -#XX#VERSION = @VERSION@ + +TCC += $(OPT_FEATURE_FLAGS) + +# Add in any optional parameters specified on the make commane line +# ie. make "OPTS=-DSQLITE_ENABLE_FOO=1 -DSQLITE_OMIT_FOO=1". +TCC += $(OPTS) + +# Add in compile-time options for some libraries used by extensions +TCC += @LDFLAGS_ZLIB@ + +# Version numbers and release number for the SQLite being compiled. +# +VERSION = @VERSION@ #XX#VERSION_NUMBER = @VERSION_NUMBER@ #XX#RELEASE = @RELEASE@ -#XX# -#XX## Filename extensions -#XX## -#XX#BEXE = @BUILD_EXEEXT@ -#XX#TEXE = @TARGET_EXEEXT@ -#XX# + +# Filename extensions for binaries +# +BEXE = @BUILD_EXEEXT@ +TEXE = @TARGET_EXEEXT@ +BOBJ = @BUILD_OBJEXT@ +TOBJ = @TARGET_OBJEXT@ + #XX## The following variable is "1" if the configure script was able to locate #XX## the tclConfig.sh file. It is an empty string otherwise. When this #XX## variable is "1", the TCL extension library (libtclsqlite3.so) is built @@ -134,41 +136,42 @@ OPT_FEATURE_FLAGS = @OPT_FEATURE_FLAGS@ $(OPTIONS) #XX## Additional options when running tests using testrunner.tcl #XX## This is usually either blank, or else --status #XX## -#XX#TSTRNNR_OPTS = @TSTRNNR_OPTS@ -#XX# +TSTRNNR_OPTS = @TSTRNNR_OPTS@ +# #XX## Where do we want to install the tcl plugin #XX## #XX#TCLLIBDIR = @TCLLIBDIR@ -#XX# -#XX## If gcov support was enabled by the configure script, add the appropriate -#XX## flags here. It's not always as easy as just having the user add the right -#XX## CFLAGS / LDFLAGS, because libtool wants to use CFLAGS when linking, which -#XX## causes build errors with -fprofile-arcs -ftest-coverage with some GCCs. -#XX## Supposedly GCC does the right thing if you use --coverage, but in -#XX## practice it still fails. See: -#XX## -#XX## http://www.mail-archive.com/debian-gcc@lists.debian.org/msg26197.html -#XX## -#XX## for more info. -#XX## -#XX#GCOV_CFLAGS1 = -DSQLITE_COVERAGE_TEST=1 -fprofile-arcs -ftest-coverage -#XX#GCOV_LDFLAGS1 = -lgcov -#XX#USE_GCOV = @USE_GCOV@ + +# +# If gcov support was enabled by the configure script, add the appropriate +# flags here. It's not always as easy as just having the user add the right +# CFLAGS / LDFLAGS, because libtool wants to use CFLAGS when linking, which +# causes build errors with -fprofile-arcs -ftest-coverage with some GCCs. +# Supposedly GCC does the right thing if you use --coverage, but in +# practice it still fails. See: +# +# http://www.mail-archive.com/debian-gcc@lists.debian.org/msg26197.html +# +# for more info. +# +GCOV_CFLAGS1 = -DSQLITE_COVERAGE_TEST=1 -fprofile-arcs -ftest-coverage +GCOV_LDFLAGS1 = -lgcov +USE_GCOV = @USE_GCOV@ #XX#LTCOMPILE_EXTRAS += $(GCOV_CFLAGS$(USE_GCOV)) #XX#LTLINK_EXTRAS += $(GCOV_LDFLAGS$(USE_GCOV)) -#XX# -#XX# -#XX## The directory into which to store package information for -#XX# -#XX## Some standard variables and programs -#XX## -#XX#prefix = @prefix@ -#XX#exec_prefix = @exec_prefix@ -#XX#libdir = @libdir@ -#XX#pkgconfigdir = $(libdir)/pkgconfig -#XX#bindir = @bindir@ -#XX#includedir = @includedir@ -#XX#INSTALL = @INSTALL@ + + +# The directory into which to store package information for + +# Some standard variables and programs +# +prefix = @prefix@ +exec_prefix = @exec_prefix@ +libdir = @libdir@ +pkgconfigdir = $(libdir)/pkgconfig +bindir = @bindir@ +includedir = @includedir@ +INSTALL = @BIN_INSTALL@ #XX#LIBTOOL = ./libtool #XX#ALLOWRELEASE = @ALLOWRELEASE@ #XX# @@ -176,13 +179,14 @@ OPT_FEATURE_FLAGS = @OPT_FEATURE_FLAGS@ $(OPTIONS) #XX#LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(TCC) $(LTCOMPILE_EXTRAS) #XX#LTLINK = $(LIBTOOL) --mode=link $(TCC) $(LTCOMPILE_EXTRAS) @LDFLAGS@ $(LTLINK_EXTRAS) #XX#LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) -#XX# -#XX## You should not have to change anything below this line -#XX################################################################################ -#XX# -#XX#USE_AMALGAMATION = @USE_AMALGAMATION@ -#XX#AMALGAMATION_LINE_MACROS = @AMALGAMATION_LINE_MACROS@ -#XX# + +# +# You should not have to change anything below this line +################################################################################ +# +USE_AMALGAMATION = @USE_AMALGAMATION@ +AMALGAMATION_LINE_MACROS = @AMALGAMATION_LINE_MACROS@ +# #XX## Object files for the SQLite library (non-amalgamation). #XX## #XX#LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \ @@ -222,455 +226,457 @@ OPT_FEATURE_FLAGS = @OPT_FEATURE_FLAGS@ $(OPTIONS) #XX# #XX## All of the source code files. #XX## -#XX#SRC = \ -#XX# $(TOP)/src/alter.c \ -#XX# $(TOP)/src/analyze.c \ -#XX# $(TOP)/src/attach.c \ -#XX# $(TOP)/src/auth.c \ -#XX# $(TOP)/src/backup.c \ -#XX# $(TOP)/src/bitvec.c \ -#XX# $(TOP)/src/btmutex.c \ -#XX# $(TOP)/src/btree.c \ -#XX# $(TOP)/src/btree.h \ -#XX# $(TOP)/src/btreeInt.h \ -#XX# $(TOP)/src/build.c \ -#XX# $(TOP)/src/callback.c \ -#XX# $(TOP)/src/complete.c \ -#XX# $(TOP)/src/ctime.c \ -#XX# $(TOP)/src/date.c \ -#XX# $(TOP)/src/dbpage.c \ -#XX# $(TOP)/src/dbstat.c \ -#XX# $(TOP)/src/delete.c \ -#XX# $(TOP)/src/expr.c \ -#XX# $(TOP)/src/fault.c \ -#XX# $(TOP)/src/fkey.c \ -#XX# $(TOP)/src/func.c \ -#XX# $(TOP)/src/global.c \ -#XX# $(TOP)/src/hash.c \ -#XX# $(TOP)/src/hash.h \ -#XX# $(TOP)/src/hwtime.h \ -#XX# $(TOP)/src/insert.c \ -#XX# $(TOP)/src/json.c \ -#XX# $(TOP)/src/legacy.c \ -#XX# $(TOP)/src/loadext.c \ -#XX# $(TOP)/src/main.c \ -#XX# $(TOP)/src/malloc.c \ -#XX# $(TOP)/src/mem0.c \ -#XX# $(TOP)/src/mem1.c \ -#XX# $(TOP)/src/mem2.c \ -#XX# $(TOP)/src/mem3.c \ -#XX# $(TOP)/src/mem5.c \ -#XX# $(TOP)/src/memdb.c \ -#XX# $(TOP)/src/memjournal.c \ -#XX# $(TOP)/src/msvc.h \ -#XX# $(TOP)/src/mutex.c \ -#XX# $(TOP)/src/mutex.h \ -#XX# $(TOP)/src/mutex_noop.c \ -#XX# $(TOP)/src/mutex_unix.c \ -#XX# $(TOP)/src/mutex_w32.c \ -#XX# $(TOP)/src/notify.c \ -#XX# $(TOP)/src/os.c \ -#XX# $(TOP)/src/os.h \ -#XX# $(TOP)/src/os_common.h \ -#XX# $(TOP)/src/os_setup.h \ -#XX# $(TOP)/src/os_kv.c \ -#XX# $(TOP)/src/os_unix.c \ -#XX# $(TOP)/src/os_win.c \ -#XX# $(TOP)/src/os_win.h \ -#XX# $(TOP)/src/pager.c \ -#XX# $(TOP)/src/pager.h \ -#XX# $(TOP)/src/parse.y \ -#XX# $(TOP)/src/pcache.c \ -#XX# $(TOP)/src/pcache.h \ -#XX# $(TOP)/src/pcache1.c \ -#XX# $(TOP)/src/pragma.c \ -#XX# $(TOP)/src/pragma.h \ -#XX# $(TOP)/src/prepare.c \ -#XX# $(TOP)/src/printf.c \ -#XX# $(TOP)/src/random.c \ -#XX# $(TOP)/src/resolve.c \ -#XX# $(TOP)/src/rowset.c \ -#XX# $(TOP)/src/select.c \ -#XX# $(TOP)/src/status.c \ -#XX# $(TOP)/src/shell.c.in \ -#XX# $(TOP)/src/sqlite.h.in \ -#XX# $(TOP)/src/sqlite3ext.h \ -#XX# $(TOP)/src/sqliteInt.h \ -#XX# $(TOP)/src/sqliteLimit.h \ -#XX# $(TOP)/src/table.c \ -#XX# $(TOP)/src/tclsqlite.c \ -#XX# $(TOP)/src/threads.c \ -#XX# $(TOP)/src/tokenize.c \ -#XX# $(TOP)/src/treeview.c \ -#XX# $(TOP)/src/trigger.c \ -#XX# $(TOP)/src/utf.c \ -#XX# $(TOP)/src/update.c \ -#XX# $(TOP)/src/upsert.c \ -#XX# $(TOP)/src/util.c \ -#XX# $(TOP)/src/vacuum.c \ -#XX# $(TOP)/src/vdbe.c \ -#XX# $(TOP)/src/vdbe.h \ -#XX# $(TOP)/src/vdbeapi.c \ -#XX# $(TOP)/src/vdbeaux.c \ -#XX# $(TOP)/src/vdbeblob.c \ -#XX# $(TOP)/src/vdbemem.c \ -#XX# $(TOP)/src/vdbesort.c \ -#XX# $(TOP)/src/vdbetrace.c \ -#XX# $(TOP)/src/vdbevtab.c \ -#XX# $(TOP)/src/vdbeInt.h \ -#XX# $(TOP)/src/vtab.c \ -#XX# $(TOP)/src/vxworks.h \ -#XX# $(TOP)/src/wal.c \ -#XX# $(TOP)/src/wal.h \ -#XX# $(TOP)/src/walker.c \ -#XX# $(TOP)/src/where.c \ -#XX# $(TOP)/src/wherecode.c \ -#XX# $(TOP)/src/whereexpr.c \ -#XX# $(TOP)/src/whereInt.h \ -#XX# $(TOP)/src/window.c -#XX# -#XX## Source code for extensions -#XX## -#XX#SRC += \ -#XX# $(TOP)/ext/fts3/fts3.c \ -#XX# $(TOP)/ext/fts3/fts3.h \ -#XX# $(TOP)/ext/fts3/fts3Int.h \ -#XX# $(TOP)/ext/fts3/fts3_aux.c \ -#XX# $(TOP)/ext/fts3/fts3_expr.c \ -#XX# $(TOP)/ext/fts3/fts3_hash.c \ -#XX# $(TOP)/ext/fts3/fts3_hash.h \ -#XX# $(TOP)/ext/fts3/fts3_icu.c \ -#XX# $(TOP)/ext/fts3/fts3_porter.c \ -#XX# $(TOP)/ext/fts3/fts3_snippet.c \ -#XX# $(TOP)/ext/fts3/fts3_tokenizer.h \ -#XX# $(TOP)/ext/fts3/fts3_tokenizer.c \ -#XX# $(TOP)/ext/fts3/fts3_tokenizer1.c \ -#XX# $(TOP)/ext/fts3/fts3_tokenize_vtab.c \ -#XX# $(TOP)/ext/fts3/fts3_unicode.c \ -#XX# $(TOP)/ext/fts3/fts3_unicode2.c \ -#XX# $(TOP)/ext/fts3/fts3_write.c -#XX#SRC += \ -#XX# $(TOP)/ext/icu/sqliteicu.h \ -#XX# $(TOP)/ext/icu/icu.c -#XX#SRC += \ -#XX# $(TOP)/ext/rtree/rtree.h \ -#XX# $(TOP)/ext/rtree/rtree.c \ -#XX# $(TOP)/ext/rtree/geopoly.c -#XX#SRC += \ -#XX# $(TOP)/ext/session/sqlite3session.c \ -#XX# $(TOP)/ext/session/sqlite3session.h -#XX#SRC += \ -#XX# $(TOP)/ext/userauth/userauth.c \ -#XX# $(TOP)/ext/userauth/sqlite3userauth.h -#XX#SRC += \ -#XX# $(TOP)/ext/rbu/sqlite3rbu.h \ -#XX# $(TOP)/ext/rbu/sqlite3rbu.c -#XX#SRC += \ -#XX# $(TOP)/ext/misc/stmt.c -#XX# -#XX## Generated source code files -#XX## -#XX#SRC += \ -#XX# keywordhash.h \ -#XX# opcodes.c \ -#XX# opcodes.h \ -#XX# parse.c \ -#XX# parse.h \ -#XX# sqlite_cfg.h \ -#XX# shell.c \ -#XX# sqlite3.h -#XX# -#XX## Source code to the test files. -#XX## -#XX#TESTSRC = \ -#XX# $(TOP)/src/test1.c \ -#XX# $(TOP)/src/test2.c \ -#XX# $(TOP)/src/test3.c \ -#XX# $(TOP)/src/test4.c \ -#XX# $(TOP)/src/test5.c \ -#XX# $(TOP)/src/test6.c \ -#XX# $(TOP)/src/test8.c \ -#XX# $(TOP)/src/test9.c \ -#XX# $(TOP)/src/test_autoext.c \ -#XX# $(TOP)/src/test_async.c \ -#XX# $(TOP)/src/test_backup.c \ -#XX# $(TOP)/src/test_bestindex.c \ -#XX# $(TOP)/src/test_blob.c \ -#XX# $(TOP)/src/test_btree.c \ -#XX# $(TOP)/src/test_config.c \ -#XX# $(TOP)/src/test_delete.c \ -#XX# $(TOP)/src/test_demovfs.c \ -#XX# $(TOP)/src/test_devsym.c \ -#XX# $(TOP)/src/test_fs.c \ -#XX# $(TOP)/src/test_func.c \ -#XX# $(TOP)/src/test_hexio.c \ -#XX# $(TOP)/src/test_init.c \ -#XX# $(TOP)/src/test_intarray.c \ -#XX# $(TOP)/src/test_journal.c \ -#XX# $(TOP)/src/test_malloc.c \ -#XX# $(TOP)/src/test_md5.c \ -#XX# $(TOP)/src/test_multiplex.c \ -#XX# $(TOP)/src/test_mutex.c \ -#XX# $(TOP)/src/test_onefile.c \ -#XX# $(TOP)/src/test_osinst.c \ -#XX# $(TOP)/src/test_pcache.c \ -#XX# $(TOP)/src/test_quota.c \ -#XX# $(TOP)/src/test_rtree.c \ -#XX# $(TOP)/src/test_schema.c \ -#XX# $(TOP)/src/test_superlock.c \ -#XX# $(TOP)/src/test_syscall.c \ -#XX# $(TOP)/src/test_tclsh.c \ -#XX# $(TOP)/src/test_tclvar.c \ -#XX# $(TOP)/src/test_thread.c \ -#XX# $(TOP)/src/test_vdbecov.c \ -#XX# $(TOP)/src/test_vfs.c \ -#XX# $(TOP)/src/test_windirent.c \ -#XX# $(TOP)/src/test_window.c \ -#XX# $(TOP)/src/test_wsd.c \ -#XX# $(TOP)/ext/fts3/fts3_term.c \ -#XX# $(TOP)/ext/fts3/fts3_test.c \ -#XX# $(TOP)/ext/session/test_session.c \ -#XX# $(TOP)/ext/recover/sqlite3recover.c \ -#XX# $(TOP)/ext/recover/dbdata.c \ -#XX# $(TOP)/ext/recover/test_recover.c \ -#XX# $(TOP)/ext/intck/test_intck.c \ -#XX# $(TOP)/ext/intck/sqlite3intck.c \ -#XX# $(TOP)/ext/rbu/test_rbu.c -#XX# -#XX## Statically linked extensions -#XX## -#XX#TESTSRC += \ -#XX# $(TOP)/ext/expert/sqlite3expert.c \ -#XX# $(TOP)/ext/expert/test_expert.c \ -#XX# $(TOP)/ext/misc/amatch.c \ -#XX# $(TOP)/ext/misc/appendvfs.c \ -#XX# $(TOP)/ext/misc/basexx.c \ -#XX# $(TOP)/ext/misc/carray.c \ -#XX# $(TOP)/ext/misc/cksumvfs.c \ -#XX# $(TOP)/ext/misc/closure.c \ -#XX# $(TOP)/ext/misc/csv.c \ -#XX# $(TOP)/ext/misc/decimal.c \ -#XX# $(TOP)/ext/misc/eval.c \ -#XX# $(TOP)/ext/misc/explain.c \ -#XX# $(TOP)/ext/misc/fileio.c \ -#XX# $(TOP)/ext/misc/fuzzer.c \ -#XX# $(TOP)/ext/fts5/fts5_tcl.c \ -#XX# $(TOP)/ext/fts5/fts5_test_mi.c \ -#XX# $(TOP)/ext/fts5/fts5_test_tok.c \ -#XX# $(TOP)/ext/misc/ieee754.c \ -#XX# $(TOP)/ext/misc/mmapwarm.c \ -#XX# $(TOP)/ext/misc/nextchar.c \ -#XX# $(TOP)/ext/misc/normalize.c \ -#XX# $(TOP)/ext/misc/percentile.c \ -#XX# $(TOP)/ext/misc/prefixes.c \ -#XX# $(TOP)/ext/misc/qpvtab.c \ -#XX# $(TOP)/ext/misc/randomjson.c \ -#XX# $(TOP)/ext/misc/regexp.c \ -#XX# $(TOP)/ext/misc/remember.c \ -#XX# $(TOP)/ext/misc/series.c \ -#XX# $(TOP)/ext/misc/spellfix.c \ -#XX# $(TOP)/ext/misc/stmtrand.c \ -#XX# $(TOP)/ext/misc/totype.c \ -#XX# $(TOP)/ext/misc/unionvtab.c \ -#XX# $(TOP)/ext/misc/wholenumber.c \ -#XX# $(TOP)/ext/misc/zipfile.c \ -#XX# $(TOP)/ext/userauth/userauth.c \ -#XX# $(TOP)/ext/rtree/test_rtreedoc.c -#XX# -#XX## Source code to the library files needed by the test fixture -#XX## -#XX#TESTSRC2 = \ -#XX# $(TOP)/src/attach.c \ -#XX# $(TOP)/src/backup.c \ -#XX# $(TOP)/src/bitvec.c \ -#XX# $(TOP)/src/btree.c \ -#XX# $(TOP)/src/build.c \ -#XX# $(TOP)/src/ctime.c \ -#XX# $(TOP)/src/date.c \ -#XX# $(TOP)/src/dbpage.c \ -#XX# $(TOP)/src/dbstat.c \ -#XX# $(TOP)/src/expr.c \ -#XX# $(TOP)/src/func.c \ -#XX# $(TOP)/src/global.c \ -#XX# $(TOP)/src/insert.c \ -#XX# $(TOP)/src/wal.c \ -#XX# $(TOP)/src/main.c \ -#XX# $(TOP)/src/mem5.c \ -#XX# $(TOP)/src/os.c \ -#XX# $(TOP)/src/os_kv.c \ -#XX# $(TOP)/src/os_unix.c \ -#XX# $(TOP)/src/os_win.c \ -#XX# $(TOP)/src/pager.c \ -#XX# $(TOP)/src/pragma.c \ -#XX# $(TOP)/src/prepare.c \ -#XX# $(TOP)/src/printf.c \ -#XX# $(TOP)/src/random.c \ -#XX# $(TOP)/src/pcache.c \ -#XX# $(TOP)/src/pcache1.c \ -#XX# $(TOP)/src/select.c \ -#XX# $(TOP)/src/tokenize.c \ -#XX# $(TOP)/src/treeview.c \ -#XX# $(TOP)/src/utf.c \ -#XX# $(TOP)/src/util.c \ -#XX# $(TOP)/src/vdbeapi.c \ -#XX# $(TOP)/src/vdbeaux.c \ -#XX# $(TOP)/src/vdbe.c \ -#XX# $(TOP)/src/vdbemem.c \ -#XX# $(TOP)/src/vdbetrace.c \ -#XX# $(TOP)/src/vdbevtab.c \ -#XX# $(TOP)/src/where.c \ -#XX# $(TOP)/src/wherecode.c \ -#XX# $(TOP)/src/whereexpr.c \ -#XX# $(TOP)/src/window.c \ -#XX# parse.c \ -#XX# $(TOP)/ext/fts3/fts3.c \ -#XX# $(TOP)/ext/fts3/fts3_aux.c \ -#XX# $(TOP)/ext/fts3/fts3_expr.c \ -#XX# $(TOP)/ext/fts3/fts3_term.c \ -#XX# $(TOP)/ext/fts3/fts3_tokenizer.c \ -#XX# $(TOP)/ext/fts3/fts3_write.c \ -#XX# $(TOP)/ext/async/sqlite3async.c \ -#XX# $(TOP)/ext/session/sqlite3session.c \ -#XX# $(TOP)/ext/misc/stmt.c \ -#XX# fts5.c -#XX# -#XX## Header files used by all library source files. -#XX## -#XX#HDR = \ -#XX# $(TOP)/src/btree.h \ -#XX# $(TOP)/src/btreeInt.h \ -#XX# $(TOP)/src/hash.h \ -#XX# $(TOP)/src/hwtime.h \ -#XX# keywordhash.h \ -#XX# $(TOP)/src/msvc.h \ -#XX# $(TOP)/src/mutex.h \ -#XX# opcodes.h \ -#XX# $(TOP)/src/os.h \ -#XX# $(TOP)/src/os_common.h \ -#XX# $(TOP)/src/os_setup.h \ -#XX# $(TOP)/src/os_win.h \ -#XX# $(TOP)/src/pager.h \ -#XX# $(TOP)/src/pcache.h \ -#XX# parse.h \ -#XX# $(TOP)/src/pragma.h \ -#XX# sqlite3.h \ -#XX# $(TOP)/src/sqlite3ext.h \ -#XX# $(TOP)/src/sqliteInt.h \ -#XX# $(TOP)/src/sqliteLimit.h \ -#XX# $(TOP)/src/vdbe.h \ -#XX# $(TOP)/src/vdbeInt.h \ -#XX# $(TOP)/src/vxworks.h \ -#XX# $(TOP)/src/whereInt.h \ -#XX# sqlite_cfg.h -#XX# -#XX## Header files used by extensions -#XX## -#XX#EXTHDR += \ -#XX# $(TOP)/ext/fts3/fts3.h \ -#XX# $(TOP)/ext/fts3/fts3Int.h \ -#XX# $(TOP)/ext/fts3/fts3_hash.h \ -#XX# $(TOP)/ext/fts3/fts3_tokenizer.h -#XX#EXTHDR += \ -#XX# $(TOP)/ext/rtree/rtree.h \ -#XX# $(TOP)/ext/rtree/geopoly.c -#XX#EXTHDR += \ -#XX# $(TOP)/ext/icu/sqliteicu.h -#XX#EXTHDR += \ -#XX# $(TOP)/ext/rtree/sqlite3rtree.h -#XX#EXTHDR += \ -#XX# $(TOP)/ext/userauth/sqlite3userauth.h -#XX# -#XX## executables needed for testing -#XX## -#XX#TESTPROGS = \ -#XX# testfixture$(TEXE) \ -#XX# sqlite3$(TEXE) \ -#XX# sqlite3_analyzer$(TEXE) \ -#XX# sqldiff$(TEXE) \ -#XX# dbhash$(TEXE) \ -#XX# sqltclsh$(TEXE) -#XX# -#XX## Databases containing fuzzer test cases -#XX## -#XX#FUZZDATA = \ -#XX# $(TOP)/test/fuzzdata1.db \ -#XX# $(TOP)/test/fuzzdata2.db \ -#XX# $(TOP)/test/fuzzdata3.db \ -#XX# $(TOP)/test/fuzzdata4.db \ -#XX# $(TOP)/test/fuzzdata5.db \ -#XX# $(TOP)/test/fuzzdata6.db \ -#XX# $(TOP)/test/fuzzdata7.db \ -#XX# $(TOP)/test/fuzzdata8.db -#XX# -#XX## Standard options to testfixture -#XX## -#XX#TESTOPTS = --verbose=file --output=test-out.txt -#XX# -#XX## Extra compiler options for various shell tools -#XX## -#XX#SHELL_OPT += -DSQLITE_DQS=0 -#XX#SHELL_OPT += -DSQLITE_ENABLE_FTS4 -#XX##SHELL_OPT += -DSQLITE_ENABLE_FTS5 -#XX#SHELL_OPT += -DSQLITE_ENABLE_RTREE -#XX#SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS -#XX#SHELL_OPT += -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION -#XX#SHELL_OPT += -DSQLITE_ENABLE_STMTVTAB -#XX#SHELL_OPT += -DSQLITE_ENABLE_DBPAGE_VTAB -#XX#SHELL_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB -#XX#SHELL_OPT += -DSQLITE_ENABLE_BYTECODE_VTAB -#XX#SHELL_OPT += -DSQLITE_ENABLE_OFFSET_SQL_FUNC -#XX#SHELL_OPT += -DSQLITE_STRICT_SUBTYPE=1 -#XX#FUZZERSHELL_OPT = -#XX#FUZZCHECK_OPT += -I$(TOP)/test -#XX#FUZZCHECK_OPT += -I$(TOP)/ext/recover -#XX#FUZZCHECK_OPT += \ -#XX# -DSQLITE_OSS_FUZZ \ -#XX# -DSQLITE_ENABLE_BYTECODE_VTAB \ -#XX# -DSQLITE_ENABLE_DBPAGE_VTAB \ -#XX# -DSQLITE_ENABLE_DBSTAT_VTAB \ -#XX# -DSQLITE_ENABLE_BYTECODE_VTAB \ -#XX# -DSQLITE_ENABLE_DESERIALIZE \ -#XX# -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ -#XX# -DSQLITE_ENABLE_FTS3_PARENTHESIS \ -#XX# -DSQLITE_ENABLE_FTS4 \ -#XX# -DSQLITE_ENABLE_FTS5 \ -#XX# -DSQLITE_ENABLE_GEOPOLY \ -#XX# -DSQLITE_ENABLE_MATH_FUNCTIONS \ -#XX# -DSQLITE_ENABLE_MEMSYS5 \ -#XX# -DSQLITE_ENABLE_NORMALIZE \ -#XX# -DSQLITE_ENABLE_OFFSET_SQL_FUNC \ -#XX# -DSQLITE_ENABLE_PREUPDATE_HOOK \ -#XX# -DSQLITE_ENABLE_RTREE \ -#XX# -DSQLITE_ENABLE_SESSION \ -#XX# -DSQLITE_ENABLE_STMTVTAB \ -#XX# -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION \ -#XX# -DSQLITE_ENABLE_STAT4 \ -#XX# -DSQLITE_ENABLE_STMT_SCANSTATUS \ -#XX# -DSQLITE_MAX_MEMORY=50000000 \ -#XX# -DSQLITE_MAX_MMAP_SIZE=0 \ -#XX# -DSQLITE_OMIT_LOAD_EXTENSION \ -#XX# -DSQLITE_PRINTF_PRECISION_LIMIT=1000 \ -#XX# -DSQLITE_PRIVATE="" \ -#XX# -DSQLITE_STRICT_SUBTYPE=1 \ -#XX# -DSQLITE_STATIC_RANDOMJSON -#XX# -#XX#FUZZCHECK_SRC += $(TOP)/test/fuzzcheck.c -#XX#FUZZCHECK_SRC += $(TOP)/test/ossfuzz.c -#XX#FUZZCHECK_SRC += $(TOP)/test/fuzzinvariants.c -#XX#FUZZCHECK_SRC += $(TOP)/ext/recover/dbdata.c -#XX#FUZZCHECK_SRC += $(TOP)/ext/recover/sqlite3recover.c -#XX#FUZZCHECK_SRC += $(TOP)/test/vt02.c -#XX#FUZZCHECK_SRC += $(TOP)/ext/misc/percentile.c -#XX#FUZZCHECK_SRC += $(TOP)/ext/misc/randomjson.c -#XX#DBFUZZ_OPT = -#XX#ST_OPT = -DSQLITE_OS_KV_OPTIONAL -#XX# -#XX# -#XX## In wasi-sdk builds, disable the CLI shell build in the "all" target. -#XX#SQLITE3_SHELL_TARGET_ = sqlite3$(TEXE) -#XX#SQLITE3_SHELL_TARGET_1 = -#XX#SQLITE3_SHELL_TARGET = $(SQLITE3_SHELL_TARGET_@HAVE_WASI_SDK@) -#XX# +SRC = \ + $(TOP)/src/alter.c \ + $(TOP)/src/analyze.c \ + $(TOP)/src/attach.c \ + $(TOP)/src/auth.c \ + $(TOP)/src/backup.c \ + $(TOP)/src/bitvec.c \ + $(TOP)/src/btmutex.c \ + $(TOP)/src/btree.c \ + $(TOP)/src/btree.h \ + $(TOP)/src/btreeInt.h \ + $(TOP)/src/build.c \ + $(TOP)/src/callback.c \ + $(TOP)/src/complete.c \ + $(TOP)/src/ctime.c \ + $(TOP)/src/date.c \ + $(TOP)/src/dbpage.c \ + $(TOP)/src/dbstat.c \ + $(TOP)/src/delete.c \ + $(TOP)/src/expr.c \ + $(TOP)/src/fault.c \ + $(TOP)/src/fkey.c \ + $(TOP)/src/func.c \ + $(TOP)/src/global.c \ + $(TOP)/src/hash.c \ + $(TOP)/src/hash.h \ + $(TOP)/src/hwtime.h \ + $(TOP)/src/insert.c \ + $(TOP)/src/json.c \ + $(TOP)/src/legacy.c \ + $(TOP)/src/loadext.c \ + $(TOP)/src/main.c \ + $(TOP)/src/malloc.c \ + $(TOP)/src/mem0.c \ + $(TOP)/src/mem1.c \ + $(TOP)/src/mem2.c \ + $(TOP)/src/mem3.c \ + $(TOP)/src/mem5.c \ + $(TOP)/src/memdb.c \ + $(TOP)/src/memjournal.c \ + $(TOP)/src/msvc.h \ + $(TOP)/src/mutex.c \ + $(TOP)/src/mutex.h \ + $(TOP)/src/mutex_noop.c \ + $(TOP)/src/mutex_unix.c \ + $(TOP)/src/mutex_w32.c \ + $(TOP)/src/notify.c \ + $(TOP)/src/os.c \ + $(TOP)/src/os.h \ + $(TOP)/src/os_common.h \ + $(TOP)/src/os_setup.h \ + $(TOP)/src/os_kv.c \ + $(TOP)/src/os_unix.c \ + $(TOP)/src/os_win.c \ + $(TOP)/src/os_win.h \ + $(TOP)/src/pager.c \ + $(TOP)/src/pager.h \ + $(TOP)/src/parse.y \ + $(TOP)/src/pcache.c \ + $(TOP)/src/pcache.h \ + $(TOP)/src/pcache1.c \ + $(TOP)/src/pragma.c \ + $(TOP)/src/pragma.h \ + $(TOP)/src/prepare.c \ + $(TOP)/src/printf.c \ + $(TOP)/src/random.c \ + $(TOP)/src/resolve.c \ + $(TOP)/src/rowset.c \ + $(TOP)/src/select.c \ + $(TOP)/src/status.c \ + $(TOP)/src/shell.c.in \ + $(TOP)/src/sqlite.h.in \ + $(TOP)/src/sqlite3ext.h \ + $(TOP)/src/sqliteInt.h \ + $(TOP)/src/sqliteLimit.h \ + $(TOP)/src/table.c \ + $(TOP)/src/tclsqlite.c \ + $(TOP)/src/threads.c \ + $(TOP)/src/tokenize.c \ + $(TOP)/src/treeview.c \ + $(TOP)/src/trigger.c \ + $(TOP)/src/utf.c \ + $(TOP)/src/update.c \ + $(TOP)/src/upsert.c \ + $(TOP)/src/util.c \ + $(TOP)/src/vacuum.c \ + $(TOP)/src/vdbe.c \ + $(TOP)/src/vdbe.h \ + $(TOP)/src/vdbeapi.c \ + $(TOP)/src/vdbeaux.c \ + $(TOP)/src/vdbeblob.c \ + $(TOP)/src/vdbemem.c \ + $(TOP)/src/vdbesort.c \ + $(TOP)/src/vdbetrace.c \ + $(TOP)/src/vdbevtab.c \ + $(TOP)/src/vdbeInt.h \ + $(TOP)/src/vtab.c \ + $(TOP)/src/vxworks.h \ + $(TOP)/src/wal.c \ + $(TOP)/src/wal.h \ + $(TOP)/src/walker.c \ + $(TOP)/src/where.c \ + $(TOP)/src/wherecode.c \ + $(TOP)/src/whereexpr.c \ + $(TOP)/src/whereInt.h \ + $(TOP)/src/window.c + +# Source code for extensions +# +SRC += \ + $(TOP)/ext/fts3/fts3.c \ + $(TOP)/ext/fts3/fts3.h \ + $(TOP)/ext/fts3/fts3Int.h \ + $(TOP)/ext/fts3/fts3_aux.c \ + $(TOP)/ext/fts3/fts3_expr.c \ + $(TOP)/ext/fts3/fts3_hash.c \ + $(TOP)/ext/fts3/fts3_hash.h \ + $(TOP)/ext/fts3/fts3_icu.c \ + $(TOP)/ext/fts3/fts3_porter.c \ + $(TOP)/ext/fts3/fts3_snippet.c \ + $(TOP)/ext/fts3/fts3_tokenizer.h \ + $(TOP)/ext/fts3/fts3_tokenizer.c \ + $(TOP)/ext/fts3/fts3_tokenizer1.c \ + $(TOP)/ext/fts3/fts3_tokenize_vtab.c \ + $(TOP)/ext/fts3/fts3_unicode.c \ + $(TOP)/ext/fts3/fts3_unicode2.c \ + $(TOP)/ext/fts3/fts3_write.c +SRC += \ + $(TOP)/ext/icu/sqliteicu.h \ + $(TOP)/ext/icu/icu.c +SRC += \ + $(TOP)/ext/rtree/rtree.h \ + $(TOP)/ext/rtree/rtree.c \ + $(TOP)/ext/rtree/geopoly.c +SRC += \ + $(TOP)/ext/session/sqlite3session.c \ + $(TOP)/ext/session/sqlite3session.h +SRC += \ + $(TOP)/ext/userauth/userauth.c \ + $(TOP)/ext/userauth/sqlite3userauth.h +SRC += \ + $(TOP)/ext/rbu/sqlite3rbu.h \ + $(TOP)/ext/rbu/sqlite3rbu.c +SRC += \ + $(TOP)/ext/misc/stmt.c + +# Generated source code files +# +SRC += \ + keywordhash.h \ + opcodes.c \ + opcodes.h \ + parse.c \ + parse.h \ + sqlite_cfg.h \ + shell.c \ + sqlite3.h + +# Source code to the test files. +# +TESTSRC = \ + $(TOP)/src/test1.c \ + $(TOP)/src/test2.c \ + $(TOP)/src/test3.c \ + $(TOP)/src/test4.c \ + $(TOP)/src/test5.c \ + $(TOP)/src/test6.c \ + $(TOP)/src/test8.c \ + $(TOP)/src/test9.c \ + $(TOP)/src/test_autoext.c \ + $(TOP)/src/test_async.c \ + $(TOP)/src/test_backup.c \ + $(TOP)/src/test_bestindex.c \ + $(TOP)/src/test_blob.c \ + $(TOP)/src/test_btree.c \ + $(TOP)/src/test_config.c \ + $(TOP)/src/test_delete.c \ + $(TOP)/src/test_demovfs.c \ + $(TOP)/src/test_devsym.c \ + $(TOP)/src/test_fs.c \ + $(TOP)/src/test_func.c \ + $(TOP)/src/test_hexio.c \ + $(TOP)/src/test_init.c \ + $(TOP)/src/test_intarray.c \ + $(TOP)/src/test_journal.c \ + $(TOP)/src/test_malloc.c \ + $(TOP)/src/test_md5.c \ + $(TOP)/src/test_multiplex.c \ + $(TOP)/src/test_mutex.c \ + $(TOP)/src/test_onefile.c \ + $(TOP)/src/test_osinst.c \ + $(TOP)/src/test_pcache.c \ + $(TOP)/src/test_quota.c \ + $(TOP)/src/test_rtree.c \ + $(TOP)/src/test_schema.c \ + $(TOP)/src/test_superlock.c \ + $(TOP)/src/test_syscall.c \ + $(TOP)/src/test_tclsh.c \ + $(TOP)/src/test_tclvar.c \ + $(TOP)/src/test_thread.c \ + $(TOP)/src/test_vdbecov.c \ + $(TOP)/src/test_vfs.c \ + $(TOP)/src/test_windirent.c \ + $(TOP)/src/test_window.c \ + $(TOP)/src/test_wsd.c \ + $(TOP)/ext/fts3/fts3_term.c \ + $(TOP)/ext/fts3/fts3_test.c \ + $(TOP)/ext/session/test_session.c \ + $(TOP)/ext/recover/sqlite3recover.c \ + $(TOP)/ext/recover/dbdata.c \ + $(TOP)/ext/recover/test_recover.c \ + $(TOP)/ext/intck/test_intck.c \ + $(TOP)/ext/intck/sqlite3intck.c \ + $(TOP)/ext/rbu/test_rbu.c + +# Statically linked extensions +# +TESTSRC += \ + $(TOP)/ext/expert/sqlite3expert.c \ + $(TOP)/ext/expert/test_expert.c \ + $(TOP)/ext/misc/amatch.c \ + $(TOP)/ext/misc/appendvfs.c \ + $(TOP)/ext/misc/basexx.c \ + $(TOP)/ext/misc/carray.c \ + $(TOP)/ext/misc/cksumvfs.c \ + $(TOP)/ext/misc/closure.c \ + $(TOP)/ext/misc/csv.c \ + $(TOP)/ext/misc/decimal.c \ + $(TOP)/ext/misc/eval.c \ + $(TOP)/ext/misc/explain.c \ + $(TOP)/ext/misc/fileio.c \ + $(TOP)/ext/misc/fuzzer.c \ + $(TOP)/ext/fts5/fts5_tcl.c \ + $(TOP)/ext/fts5/fts5_test_mi.c \ + $(TOP)/ext/fts5/fts5_test_tok.c \ + $(TOP)/ext/misc/ieee754.c \ + $(TOP)/ext/misc/mmapwarm.c \ + $(TOP)/ext/misc/nextchar.c \ + $(TOP)/ext/misc/normalize.c \ + $(TOP)/ext/misc/percentile.c \ + $(TOP)/ext/misc/prefixes.c \ + $(TOP)/ext/misc/qpvtab.c \ + $(TOP)/ext/misc/randomjson.c \ + $(TOP)/ext/misc/regexp.c \ + $(TOP)/ext/misc/remember.c \ + $(TOP)/ext/misc/series.c \ + $(TOP)/ext/misc/spellfix.c \ + $(TOP)/ext/misc/stmtrand.c \ + $(TOP)/ext/misc/totype.c \ + $(TOP)/ext/misc/unionvtab.c \ + $(TOP)/ext/misc/wholenumber.c \ + $(TOP)/ext/misc/zipfile.c \ + $(TOP)/ext/userauth/userauth.c \ + $(TOP)/ext/rtree/test_rtreedoc.c + +# Source code to the library files needed by the test fixture +# +TESTSRC2 = \ + $(TOP)/src/attach.c \ + $(TOP)/src/backup.c \ + $(TOP)/src/bitvec.c \ + $(TOP)/src/btree.c \ + $(TOP)/src/build.c \ + $(TOP)/src/ctime.c \ + $(TOP)/src/date.c \ + $(TOP)/src/dbpage.c \ + $(TOP)/src/dbstat.c \ + $(TOP)/src/expr.c \ + $(TOP)/src/func.c \ + $(TOP)/src/global.c \ + $(TOP)/src/insert.c \ + $(TOP)/src/wal.c \ + $(TOP)/src/main.c \ + $(TOP)/src/mem5.c \ + $(TOP)/src/os.c \ + $(TOP)/src/os_kv.c \ + $(TOP)/src/os_unix.c \ + $(TOP)/src/os_win.c \ + $(TOP)/src/pager.c \ + $(TOP)/src/pragma.c \ + $(TOP)/src/prepare.c \ + $(TOP)/src/printf.c \ + $(TOP)/src/random.c \ + $(TOP)/src/pcache.c \ + $(TOP)/src/pcache1.c \ + $(TOP)/src/select.c \ + $(TOP)/src/tokenize.c \ + $(TOP)/src/treeview.c \ + $(TOP)/src/utf.c \ + $(TOP)/src/util.c \ + $(TOP)/src/vdbeapi.c \ + $(TOP)/src/vdbeaux.c \ + $(TOP)/src/vdbe.c \ + $(TOP)/src/vdbemem.c \ + $(TOP)/src/vdbetrace.c \ + $(TOP)/src/vdbevtab.c \ + $(TOP)/src/where.c \ + $(TOP)/src/wherecode.c \ + $(TOP)/src/whereexpr.c \ + $(TOP)/src/window.c \ + parse.c \ + $(TOP)/ext/fts3/fts3.c \ + $(TOP)/ext/fts3/fts3_aux.c \ + $(TOP)/ext/fts3/fts3_expr.c \ + $(TOP)/ext/fts3/fts3_term.c \ + $(TOP)/ext/fts3/fts3_tokenizer.c \ + $(TOP)/ext/fts3/fts3_write.c \ + $(TOP)/ext/async/sqlite3async.c \ + $(TOP)/ext/session/sqlite3session.c \ + $(TOP)/ext/misc/stmt.c \ + fts5.c + +# Header files used by all library source files. +# +HDR = \ + $(TOP)/src/btree.h \ + $(TOP)/src/btreeInt.h \ + $(TOP)/src/hash.h \ + $(TOP)/src/hwtime.h \ + keywordhash.h \ + $(TOP)/src/msvc.h \ + $(TOP)/src/mutex.h \ + opcodes.h \ + $(TOP)/src/os.h \ + $(TOP)/src/os_common.h \ + $(TOP)/src/os_setup.h \ + $(TOP)/src/os_win.h \ + $(TOP)/src/pager.h \ + $(TOP)/src/pcache.h \ + parse.h \ + $(TOP)/src/pragma.h \ + sqlite3.h \ + $(TOP)/src/sqlite3ext.h \ + $(TOP)/src/sqliteInt.h \ + $(TOP)/src/sqliteLimit.h \ + $(TOP)/src/vdbe.h \ + $(TOP)/src/vdbeInt.h \ + $(TOP)/src/vxworks.h \ + $(TOP)/src/whereInt.h \ + sqlite_cfg.h + +# Header files used by extensions +# +EXTHDR += \ + $(TOP)/ext/fts3/fts3.h \ + $(TOP)/ext/fts3/fts3Int.h \ + $(TOP)/ext/fts3/fts3_hash.h \ + $(TOP)/ext/fts3/fts3_tokenizer.h +EXTHDR += \ + $(TOP)/ext/rtree/rtree.h \ + $(TOP)/ext/rtree/geopoly.c +EXTHDR += \ + $(TOP)/ext/icu/sqliteicu.h +EXTHDR += \ + $(TOP)/ext/rtree/sqlite3rtree.h +EXTHDR += \ + $(TOP)/ext/userauth/sqlite3userauth.h + +# executables needed for testing +# +TESTPROGS = \ + testfixture$(TEXE) \ + sqlite3$(TEXE) \ + sqlite3_analyzer$(TEXE) \ + sqldiff$(TEXE) \ + dbhash$(TEXE) \ + sqltclsh$(TEXE) + +# Databases containing fuzzer test cases +# +FUZZDATA = \ + $(TOP)/test/fuzzdata1.db \ + $(TOP)/test/fuzzdata2.db \ + $(TOP)/test/fuzzdata3.db \ + $(TOP)/test/fuzzdata4.db \ + $(TOP)/test/fuzzdata5.db \ + $(TOP)/test/fuzzdata6.db \ + $(TOP)/test/fuzzdata7.db \ + $(TOP)/test/fuzzdata8.db + +# Standard options to testfixture +# +TESTOPTS = --verbose=file --output=test-out.txt + +# Extra compiler options for various shell tools +# +SHELL_OPT += -DSQLITE_DQS=0 +SHELL_OPT += -DSQLITE_ENABLE_FTS4 +#SHELL_OPT += -DSQLITE_ENABLE_FTS5 +SHELL_OPT += -DSQLITE_ENABLE_RTREE +SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS +SHELL_OPT += -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION +SHELL_OPT += -DSQLITE_ENABLE_STMTVTAB +SHELL_OPT += -DSQLITE_ENABLE_DBPAGE_VTAB +SHELL_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB +SHELL_OPT += -DSQLITE_ENABLE_BYTECODE_VTAB +SHELL_OPT += -DSQLITE_ENABLE_OFFSET_SQL_FUNC +SHELL_OPT += -DSQLITE_STRICT_SUBTYPE=1 +FUZZERSHELL_OPT = +FUZZCHECK_OPT += -I$(TOP)/test +FUZZCHECK_OPT += -I$(TOP)/ext/recover +FUZZCHECK_OPT += \ + -DSQLITE_OSS_FUZZ \ + -DSQLITE_ENABLE_BYTECODE_VTAB \ + -DSQLITE_ENABLE_DBPAGE_VTAB \ + -DSQLITE_ENABLE_DBSTAT_VTAB \ + -DSQLITE_ENABLE_BYTECODE_VTAB \ + -DSQLITE_ENABLE_DESERIALIZE \ + -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ + -DSQLITE_ENABLE_FTS3_PARENTHESIS \ + -DSQLITE_ENABLE_FTS4 \ + -DSQLITE_ENABLE_FTS5 \ + -DSQLITE_ENABLE_GEOPOLY \ + -DSQLITE_ENABLE_MATH_FUNCTIONS \ + -DSQLITE_ENABLE_MEMSYS5 \ + -DSQLITE_ENABLE_NORMALIZE \ + -DSQLITE_ENABLE_OFFSET_SQL_FUNC \ + -DSQLITE_ENABLE_PREUPDATE_HOOK \ + -DSQLITE_ENABLE_RTREE \ + -DSQLITE_ENABLE_SESSION \ + -DSQLITE_ENABLE_STMTVTAB \ + -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION \ + -DSQLITE_ENABLE_STAT4 \ + -DSQLITE_ENABLE_STMT_SCANSTATUS \ + -DSQLITE_MAX_MEMORY=50000000 \ + -DSQLITE_MAX_MMAP_SIZE=0 \ + -DSQLITE_OMIT_LOAD_EXTENSION \ + -DSQLITE_PRINTF_PRECISION_LIMIT=1000 \ + -DSQLITE_PRIVATE="" \ + -DSQLITE_STRICT_SUBTYPE=1 \ + -DSQLITE_STATIC_RANDOMJSON + +FUZZCHECK_SRC += $(TOP)/test/fuzzcheck.c +FUZZCHECK_SRC += $(TOP)/test/ossfuzz.c +FUZZCHECK_SRC += $(TOP)/test/fuzzinvariants.c +FUZZCHECK_SRC += $(TOP)/ext/recover/dbdata.c +FUZZCHECK_SRC += $(TOP)/ext/recover/sqlite3recover.c +FUZZCHECK_SRC += $(TOP)/test/vt02.c +FUZZCHECK_SRC += $(TOP)/ext/misc/percentile.c +FUZZCHECK_SRC += $(TOP)/ext/misc/randomjson.c +DBFUZZ_OPT = +ST_OPT = -DSQLITE_OS_KV_OPTIONAL + + +# In wasi-sdk builds, disable the CLI shell build in the "all" target. +SQLITE3_SHELL_TARGET_ = sqlite3$(TEXE) +SQLITE3_SHELL_TARGET_1 = +SQLITE3_SHELL_TARGET = $(SQLITE3_SHELL_TARGET_@HAVE_WASI_SDK@) + +SQLITE3_O = $(TOP)/sqlite3.o + #XX## Use $(libtclsqlite3.la_$(HAVE_TCL)) to resolve to either #XX## libtclsqlite3.la or an empty value. #XX#libtclsqlite3.la_0 = @@ -1643,42 +1649,42 @@ OPT_FEATURE_FLAGS = @OPT_FEATURE_FLAGS@ $(OPTIONS) #XX## #XX#tclextension-list: #XX# $(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --info -#XX# -#XX# -#XX## Remove build products sufficient so that subsequent makes will recompile -#XX## everything from scratch. Do not remove: -#XX## -#XX## * test results and test logs -#XX## * output from ./configure -#XX## -#XX#tidy: -#XX# rm -f *.lo *.la *.o *.c *.da *.bb *.bbg gmon.* *.rws sqlite3$(TEXE) -#XX# rm -f fts5.h keywordhash.h opcodes.h sqlite3.h sqlite3ext.h sqlite3session.h -#XX# rm -rf .libs .deps tsrc .target_source -#XX# rm -f lemon$(BEXE) sqlite*.tar.gz -#XX# rm -f mkkeywordhash$(BEXE) mksourceid$(BEXE) -#XX# rm -f parse.* fts5parse.* -#XX# rm -f tclsqlite3$(TEXE) $(TESTPROGS) -#XX# rm -f LogEst$(TEXE) fts3view$(TEXE) rollback-test$(TEXE) showdb$(TEXE) -#XX# rm -f showjournal$(TEXE) showstat4$(TEXE) showwal$(TEXE) speedtest1$(TEXE) -#XX# rm -f wordcount$(TEXE) changeset$(TEXE) version-info$(TEXE) -#XX# rm -f *.dll *.lib *.exp *.def *.pc *.vsix *.so *.dylib pkgIndex.tcl -#XX# rm -f sqlite3_analyzer$(TEXE) sqlite3-rsync$(TEXE) -#XX# rm -f mptester$(TEXE) rbu$(TEXE) srcck1$(TEXE) -#XX# rm -f fuzzershell$(TEXE) fuzzcheck$(TEXE) sqldiff$(TEXE) dbhash$(TEXE) -#XX# rm -f threadtest5$(TEXE) -#XX# rm -f src-verify has_tclsh* -#XX# -#XX## Removes build products and test logs. Retains ./configure outputs. -#XX## -#XX#clean: tidy -#XX# rm -rf omittest* testrunner* testdir* -#XX# -#XX## Clean up everything. No exceptions. -#XX## -#XX#distclean: clean -#XX# rm -f sqlite_cfg.h config.log config.status Makefile $(LIBTOOL) -#XX# + + +# Remove build products sufficient so that subsequent makes will recompile +# everything from scratch. Do not remove: +# +# * test results and test logs +# * output from ./configure +# +tidy: + rm -f *.lo *.la *.o *.c *.da *.bb *.bbg gmon.* *.rws sqlite3$(TEXE) + rm -f fts5.h keywordhash.h opcodes.h sqlite3.h sqlite3ext.h sqlite3session.h + rm -rf .libs .deps tsrc .target_source + rm -f lemon$(BEXE) sqlite*.tar.gz + rm -f mkkeywordhash$(BEXE) mksourceid$(BEXE) + rm -f parse.* fts5parse.* + rm -f tclsqlite3$(TEXE) $(TESTPROGS) + rm -f LogEst$(TEXE) fts3view$(TEXE) rollback-test$(TEXE) showdb$(TEXE) + rm -f showjournal$(TEXE) showstat4$(TEXE) showwal$(TEXE) speedtest1$(TEXE) + rm -f wordcount$(TEXE) changeset$(TEXE) version-info$(TEXE) + rm -f *.dll *.lib *.exp *.def *.pc *.vsix *.so *.dylib pkgIndex.tcl + rm -f sqlite3_analyzer$(TEXE) sqlite3-rsync$(TEXE) + rm -f mptester$(TEXE) rbu$(TEXE) srcck1$(TEXE) + rm -f fuzzershell$(TEXE) fuzzcheck$(TEXE) sqldiff$(TEXE) dbhash$(TEXE) + rm -f threadtest5$(TEXE) + rm -f src-verify has_tclsh* + +# Removes build products and test logs. Retains ./configure outputs. +# +clean: tidy + rm -rf omittest* testrunner* testdir* + +# Clean up everything. No exceptions. +# +distclean: clean + rm -f sqlite_cfg.h config.log config.status Makefile $(LIBTOOL) + #XX## #XX## Windows section #XX## diff --git a/auto.def b/auto.def index 75c8450e69..8cde61e038 100644 --- a/auto.def +++ b/auto.def @@ -11,17 +11,24 @@ if {[get-define host] ne [get-define build]} { } define cross_compiling ${cross_compiling} -if {0 && $cross_compiling} { +if {$cross_compiling} { # gcc's cross-compiler is named platform-os-vendor-gcc instead of # platform-os-vendor-cc. Checking for cc here will find the CC which # was already found via (use cc). Checking for gcc here would be # unportable - the client may well have a different cross-compiler. - define-push {GCC LD AR} { - cc-check-tools gcc ld ar - define BIN_host_GCC [get-define GCC] + define-push {LD AR} { + cc-check-tools ld ar + #define BIN_host_GCC [get-define GCC] define BIN_host_LD [get-define LD] define BIN_host_AR [get-define AR] } + #define BIN_host_CC [get-define CC] +} +#define CC [get-define CC_FOR_BUILD] +if {![cc-path-progs ld ar]} { + # ^^^^ not cc-check-tools because that one resolves cross-compile + # binaries when --host=... is set. + user-error "Missing required binary" } ######################################################################## @@ -82,7 +89,7 @@ set srcdir $autosetup(srcdir) #puts "srcdir = $srcdir" set VERSION [readfile $autosetup(srcdir)/VERSION] puts "VERSION = $VERSION" -define PACKAGE_VERSION $VERSION +define VERSION $VERSION #puts "with-wasi-sdk? = [opt-val with-wasi-sdk]" #puts "with-debug? = [opt-val with-debug]" diff --git a/autosetup/hwaci-common.tcl b/autosetup/hwaci-common.tcl index 8466e0116d..ca458b7407 100644 --- a/autosetup/hwaci-common.tcl +++ b/autosetup/hwaci-common.tcl @@ -408,23 +408,29 @@ proc hwaci-looks-like-windows {{key host}} { # host and target are Windows-esque (Cygwin, MinGW, MSys). If the # build host is then BUILD_EXEEXT is [define]'d to ".exe", else "". If # the build target is then TARGET_EXEEXT is [define]'d to ".exe", else -# "". +# "". It also sets BUILD_OBJEXT and TARGET_OBJEXT to the conventional +# file extension for object files: .obj or .o. proc hwaci-check-exeext {} { msg-checking "Build host is Windows-esque? " if {[hwaci-looks-like-windows host]} { define BUILD_EXEEXT ".exe" + define BUILD_OBJEXT ".obj" msg-result yes } else { define BUILD_EXEEXT "" + define BUILD_OBJEXT ".o" msg-result no } msg-checking "Build target is Windows-esque? " if {[hwaci-looks-like-windows target]} { define TARGET_EXEEXT ".exe" + define TARGET_OBJEXT ".obj" msg-result yes } else { define TARGET_EXEEXT "" + define TARGET_OBJEXT ".o" + msg-result no } } diff --git a/manifest b/manifest index 27e3304a7c..b0841a42e5 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C Integrate\sthe\sconfigure-time\sEmscripten\sbits. -D 2024-09-25T22:13:49.969 +C Time\sfor\sa\sbreak. +D 2024-09-25T23:09:38.690 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 -F Makefile.in 423f8b90ccb385a96c9f9551d74ab2b678e7a6191bf908c2b44304997804cb63 +F Makefile.in dee85c233bbfcdf21bc843ecec065c650b0a4c677e87af9bdf50cdf3c3179df7 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6 F Makefile.msc e3c4723c27464acc31da4420b808c8d2690180ba2b915897bece0a9d5d2cecf6 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159 @@ -14,7 +14,7 @@ F art/icon-80x90.gif 65509ce3e5f86a9cd64fe7fca2d23954199f31fe44c1e09e208c80fb83d F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 -F auto.def 25c1a8645d4845bc2970d183be0ac2c9bdf0f05c348fc6705385c17047802bb4 +F auto.def 667c6566a686bab5994d7c52526c33a2ab516199b85766c29e7fc65b128671ea F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac @@ -46,7 +46,7 @@ F autosetup/cc-lib.tcl 493c5935b5dd3bf9bd4eca89b07c8b1b1a9356d61783035144e21795f F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1de1e5460d78 F autosetup/cc.tcl 1b52de228642c1db5a714d54ca974d723ec8b4092e8c3765d348b625850f7311 F autosetup/default.auto 5cdf016de2140e50f1db190a02039dc42fb390af1dda4cc4853e3042a9ef0e82 -F autosetup/hwaci-common.tcl c0ff4bb3399f7a55b5dba83ab6f98b68a54952f28ae49c658340b48ea3cd827d +F autosetup/hwaci-common.tcl 48465634f1fc73ac30ad747e1d1d1ec897f009ce40edf94092575d9851a61846 F autosetup/jimsh0.c 1b5fe91fffcddbc29f2b16acb80f1650632ea2edbe8336b8155ef7b4c66f6d8d F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/system.tcl 3a39d6e0b3bfba526fd39afe07c1d0d325e5a31925013a1ba7c671e1128e31bb @@ -2233,8 +2233,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 74d12433599e2f189d8d0a44be834651531ac5a215bf42de386053cd00d29162 -R dd47ba23be16ca7a64fc24efb04f8a5b +P 456125a14454180d608d8f5bc651aa4350958cdd14f4011ef540beb278ca2d51 +R 2167a1dbbb24f998e809942a74a24831 U stephan -Z 7445a300c3d8549aa733ba93da0d5f2b +Z 5237a006f29465dc76d28d429ddf3ad3 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index adaa3beb74..1c0777dc76 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -456125a14454180d608d8f5bc651aa4350958cdd14f4011ef540beb278ca2d51 +1d29cd9095595b7b027b90d644dc4767fde0b6f98316c0eb82014b7aad6770d7 -- 2.47.2