Commit Graph

28959 Commits

Author SHA1 Message Date
stephan
d2cbc22dd5 Minor auto.def cleanups and doc addtions.
FossilOrigin-Name: ea53aba82b1083bd59262e768b9331bfdc5c4ca6c4121b98aeedcbeb5af01b07
2024-10-25 13:56:13 +00:00
drh
4ccc5de98f New jimsh0.c file for autosetup.
FossilOrigin-Name: cfacf864119170365fb21a09d2cca5f2a16354837ef0c3c726b00a886ea8e7e2
2024-10-25 12:22:29 +00:00
drh
4de88eb13e Update the LICENSE.md file to describe BSD-licensed code that is included
in the repository as a convenience to developers but which is not itself
actually a part of SQLite.

FossilOrigin-Name: deb5994bb1c7295099939f9c88a97ecfe6d21087cfc9c98384e91993ce85f5e6
2024-10-25 12:06:40 +00:00
stephan
f84060f2f8 Ensure that jimsh is built in the proper dir in an out-of-tree build and that jimsh0 is cleaned up by distclean.
FossilOrigin-Name: e0286e258b17e7812387f5e661910ddd3c015bd5ac62dcbd7e02b69379dc9277
2024-10-25 05:53:50 +00:00
stephan
14e4d9ad30 Rename config-defines.json to config.defines.json for consistent with other generated config.* files. Rename --defs-json-include-lowercase to the even less wieldy --defines-json-include-lowercase.
FossilOrigin-Name: 131a2a7ef87b65527d03b3c838de9d34eaca94992a973283ad6eeb296250db92
2024-10-25 04:48:40 +00:00
stephan
957209e7ac Add --defs-json-include-lowercase configure flag to cause config-defs.json to include lower-case defines, which are primarily the various build-related system paths.
FossilOrigin-Name: 0f2555ea3c7c1950566182c8f5a4d98049461e9db305e892c8434ba3fbf3497a
2024-10-25 04:39:14 +00:00
stephan
7ad582ad5a Internal cleanups and docs in hwaci-common.tcl.
FossilOrigin-Name: 30699b57d21f70dd42ec61f5157859358c6be5e3e14bb2989f8874ceeda5dae6
2024-10-25 04:16:36 +00:00
stephan
a1bc2ad6ce Docs related to the -array defs-dump option. Rename some internal-use hwaci-common.tcl APIs after discovering that a - as a symbol suffix fails for var derefs (but works for procs calls).
FossilOrigin-Name: 0d5da3888e79166fec560554a921e2ef4290558e988144465f1ea7138ca263a3
2024-10-25 03:56:09 +00:00
stephan
aa7c9050fa Experimentally add the -array formatting option to hwaci-dump-defs-json and emit OPT_FEATURE_FLAGS/OPT_SHELL in both flat string and array forms.
FossilOrigin-Name: ce6bc4603c27952ca44ff55c81dd50a04b0f6ef8f198720ee0da3aff4c291449
2024-10-25 03:35:01 +00:00
stephan
7db8d195c3 ./configure now emits config-defs.json, a JSON-formatted counterpart of the DEFS=... info which the pre-built autotools bundles emit.
FossilOrigin-Name: 800b083c3a55a990bd5b7fd587e24144b0084a394f9cf8160c3aa0a6880f8053
2024-10-25 03:18:11 +00:00
drh
8ce6d66986 The "WITHOUT_JIMSH=1" option on the nmake command-line forces the use of
standard TCL for building, instead of jimsh0.

FossilOrigin-Name: 9f861f66e238b62e04d640ee98bac86b9b532a55d62c92ae0154bd67ee01ec75
2024-10-24 19:56:42 +00:00
drh
9bcfb2b694 Basic builds now appear to work using jimsh0 on Windows.
FossilOrigin-Name: d8f5193970401b763a94a1d0403bed4337c9fb1f087772b72fb46b9e0bde1c0d
2024-10-24 19:17:25 +00:00
drh
a734793b2f Fix a bug in jimsh0.c for when it is compiled using MSVC.
FossilOrigin-Name: f7def0be742fad9863f1eba11d0c2f1fa739ad1262e67d24380698e3948cedb7
2024-10-24 17:16:38 +00:00
drh
ae5ef1e80f Fix the new tool/cp.tcl so that it works with older TCL versions, such as
jimtcl.

FossilOrigin-Name: 61f18c96183867fe9d0fb30b8b71c0253f40503e32c8a4202196fb6418f2f46e
2024-10-24 15:57:21 +00:00
drh
4f237f8def Fix harmless compiler warnings. One of the warnings was code that
deliberately committed memory errors to test the systems ability to cope.
But compilers don't allow that any more, so we'll have to leave that
capability untested.

FossilOrigin-Name: 7e7b3b2edbb580c9ac14f21e5caa8f2f6b171d9a7ce6cb336dc0c8db76da7e8c
2024-10-24 15:36:29 +00:00
drh
ae07b98a3c Add the tool/cp.tcl script and use it to simplify Makefile.msc.
FossilOrigin-Name: b7db2146a89587075d268b524ffc83d147f1d9d3e428c6d72bb7f3b8717c7954
2024-10-24 15:14:55 +00:00
stephan
72ef506925 Back out [bd66222721] because it causes conflicts with test runs, apparently due to .o files being built with different flags. This means that the CLI shell currently does not honor --disable-amalgamation.
FossilOrigin-Name: b063317352e1360293787909cafe46dbfda68a75a89c6559bac69ad160d5ec43
2024-10-24 14:33:11 +00:00
drh
542d1c923e Tweaks to help make jimsh0 usable to build using nmake. Does not quite work
yet, but getting closer.

FossilOrigin-Name: e911303b8d180897c256e5de6edaa6b99239f914b84de2d08b3410650cd52c6d
2024-10-24 13:27:25 +00:00
stephan
e3565d9424 Minor makefile tweaks to account for customizations via a custom hand-built makefile.
FossilOrigin-Name: 7f92e820e675ea5d54284c534d44ec4f7f242b30920a5f84c020b93f2e7e969d
2024-10-24 12:57:45 +00:00
drh
936fa83402 Fix jimsh0.c so that it compiles using MSVC: "cl jimsh0.c"
FossilOrigin-Name: f531825d4e16502ac8fa496fba51ea735232e2988aa9ddd0f232825f6ec2a9a2
2024-10-24 12:18:53 +00:00
stephan
2ba8b9566f Fix the sqlite3(.EXE) build to honor --disable-amalgamation.
FossilOrigin-Name: bd66222721ad06e99c1b66a3a0fbde06532507aa067165f47fa5d6c41ba630e6
2024-10-24 12:03:02 +00:00
drh
b79997a7c0 Merge all the latest trunk enhancements into the autosetup branch.
FossilOrigin-Name: d0554ac46866b5ad467b88de6fae06695fd81e7fdf38157702a395f7282cbe9d
2024-10-24 11:20:25 +00:00
drh
3db85bf0d3 Update the version number for the TEA extension.
FossilOrigin-Name: 56353bcffa1bad425b1645b09e7192aa418d6b989df5958e0a770226bfc2ce63
2024-10-24 11:11:31 +00:00
stephan
4cd85bda4a Various build cleanups centered around straightening out various uses of CFLAGS and its cousins. Teach Makefile.linux-generic to figure out the TOP dir on its own (a GNU Make-ism, but it's a Linux-specific makefile).
FossilOrigin-Name: 58a0f7e79ce913b432dfd4db018e5a92efa8a6bd8a50bd78ab705ceac0322e9c
2024-10-24 07:31:39 +00:00
stephan
30b20563e4 More potentially-controversial makefile symbol renaming. This is simply more readable to my eyes.
FossilOrigin-Name: 6d4d1d5fefb82ec7458efc2e93c933d9dc415dfa06fa46ff4725c30fc920ca5a
2024-10-24 05:33:30 +00:00
stephan
b3cff449f9 Bump version number to 3.48.0 (in this branch only - in trunk, doing so requires a specific autoconf version) and rename the RELEASE and VERSION makefile symbols for clarity's sake.
FossilOrigin-Name: 4193d90f2158e25fe25f9bcf579ae38a6e0ab6c26f52cd07a777d67b87107632
2024-10-24 05:03:20 +00:00
stephan
caf8c28420 Potentially controversial/unconventional makefile symbol renamings and docs explaining them.
FossilOrigin-Name: 7eceb7539dcce16104a93ad0ca1f755f23621751878cc4b01465e61333795b72
2024-10-24 04:56:44 +00:00
stephan
ce236e031e Generic build cleanups.
FossilOrigin-Name: be7b32a77f58ae3eb15cb828385035e63236b7e6c0669f90f2321f0509f0de1b
2024-10-24 04:34:39 +00:00
stephan
e74c738e55 Get Makefile.linux-generic (formerly Makefile.linux-gcc) working with jimsh in out-of-tree builds. Pass on -DHAVE_READLINE=1 to the sqlite3 shell if configure detects it.
FossilOrigin-Name: a555ff6dbc2ded5a9c65c8ef483f3197298848a580dda25ba0b721ba13167ad4
2024-10-24 03:50:40 +00:00
stephan
8c97ad8834 General make cleanups. Start adding a sanity-check mechanism to main.mk which does basic validation of the vars it expects to be set by the file which includes it. Get Makefile.linux-gcc working for the core-most rules.
FossilOrigin-Name: 85b2c73ccb85d7f5830a6fac692b380c5c79e7a54ee3fc6fc37343fa23816ef8
2024-10-24 03:14:40 +00:00
stephan
4dadb531b0 Rename some build vars for legibility. Fix hwaci-make-from-dot-in when the input file list is multi-line.
FossilOrigin-Name: fdb584421578cae825365d457cd533721839e3503f3744c77832c5925815b537
2024-10-24 01:26:50 +00:00
stephan
e615b73040 Fix out-of-tree builds configured with --disable-amalgamation.
FossilOrigin-Name: 182dac1c46f8ada2e1f3abd4959ac72f0ecfd451b41fbe699f5077f338ae7d62
2024-10-24 00:02:44 +00:00
stephan
6d288e2408 Remove unused configure check for clang-18.
FossilOrigin-Name: d73ac7286aba8e8f9d1236dd06f6055bc3026879ff15efb151cc54175d02e315
2024-10-23 17:40:07 +00:00
stephan
18f6445aea Remove three autotools files which are not needed in the autosetup port.
FossilOrigin-Name: fc20861443ea52a058f556fdf1ddf03a41c538e3b97ff663833e422a50e38d66
2024-10-23 17:17:16 +00:00
stephan
8d69bd2a20 Fix a #define typo in jimsh0.c, eliminating the need to explicitly pass -DJIM_COMPAT when building it. This fix has since made its way upstream.
FossilOrigin-Name: 9b105abf6fb6425d223ab9319f539b9d0cc2df488e0c23c5070853ba4778ebee
2024-10-23 16:59:12 +00:00
stephan
a7d3d40e06 After compiling jimsh, run sanity tests on it to ensure that it is built with -DJIM_COMPAT and one of (-DHAVE_REALPATH, -DHAVE__FULLPATH).
FossilOrigin-Name: ea6a14a6e64c0ed2306b9b3048132659094259b95b49a9572f7178c26b28f93a
2024-10-23 16:46:46 +00:00
stephan
519fc4f8c2 Work around a minor JimTCL regexp incompatibility in tool/vdbe-compress.tcl. Summary: it thinks that backslash-escaped octal values are back-references, which it does not like.
FossilOrigin-Name: aeac23359bb681c0c86c55c83ab9c16973822f6bc4e1a11959102b062333e358
2024-10-23 16:03:51 +00:00
stephan
264c691863 Remove the configure-script VERSION check from tool/srctree-check.tcl, as it's not relevant in the autosetup build.
FossilOrigin-Name: 6c5826d7522eade0f5682367637f45b0b64a7cced3cd7d643a30fb9ab0acd2a9
2024-10-23 15:13:43 +00:00
stephan
284e70b3a1 Add missing export of LDFLAGS_DLOPEN to Makefile.in.
FossilOrigin-Name: d18af84bf76db16513791b43850c41dbb5a83c435b8d3e93afaa8c2920460ac7
2024-10-23 15:05:08 +00:00
drh
deb5ad6297 Reorder conditions in sqlite3PagerDirectReadOk() for coverage.
FossilOrigin-Name: da9124fee28c155c4d1cc0d3949eb7b588a7236c12883a010af7909ad8e534ef
2024-10-23 11:33:56 +00:00
drh
98772d6e75 Fix harmless compiler warnings in wherecode.c. One such warning was
identified by [forum:/forumpost/721675f007|forum post 721675f007] and the
other was found by tool/warnings.sh.

FossilOrigin-Name: 987b96aa636c1801f87d3e1c75d34d45c5b6f437bcc6d150298675447ed16b5d
2024-10-23 11:06:56 +00:00
drh
2c264ad060 Add two new #include statements to the composite "fts5.c" file that
is constructed as part of the build process.  These #includes are no-ops
in the SQLite amalgamation (and are commented out automatically by the
amalgamation builder) but are needed if the FTS5 extension is built
separately, it seems.
[https://bugzilla.mozilla.org/show_bug.cgi?id=1926321#c3|Enhancement request].

FossilOrigin-Name: 1bf8daeb24142044e1b5d4b205317c42353004643fadb6b34f9ae6bfa4e3a6bc
2024-10-23 10:36:02 +00:00
stephan
8a6ddc551e Another fix for autosetup/autosetup-find-tclsh for the case where a tclsh is found on the system.
FossilOrigin-Name: 19d78fcef469a15487953ce2d227746ad83c0360fdc42cd4b6df6a2bc5ebb8ae
2024-10-23 02:36:50 +00:00
stephan
5d6c11b766 Latest autosetup/autosetup-find-tclsh from [https://github.com/msteveb/autosetup/issues/67 | autosetup ticket #67].
FossilOrigin-Name: 0e33f6cd48cb844331e66bfcfd93f83671380edef70b1e6684c09a7d4671eb17
2024-10-23 02:22:57 +00:00
stephan
55fca9585c Reorder some auto.def code to avoid breaking --help.
FossilOrigin-Name: 151d7dfc8da64932f624528ed55764df6408a578bddc741b3dbf2f14567a0d71
2024-10-23 02:17:46 +00:00
stephan
fdcd599992 Minor cleanups in the --with-wasi-sdk bits.
FossilOrigin-Name: d952c17981073cb0158b392edd9b0818dfba2456ab9997d360af56774c9f4216
2024-10-23 02:11:52 +00:00
stephan
54e1dff24b Get auto.def handling the case that no tclsh is installed in a default location. If not, use jimsh if we can find realpath(), else bail out.
FossilOrigin-Name: 359741bc7624006014d73c4cf5cdd29fa38c33a446ed04b46032e5d3ca18d13c
2024-10-23 01:59:34 +00:00
stephan
591123eea9 Fix /dev/null and stderr redirection ordering in autosetup/autosetup-find-tclsh so that the extraneous strlcpy()/snprintf()/rand() warning output from ld on OpenBSD does not break detection of jimsh0.
FossilOrigin-Name: cd447e50d1b31e7539e4a8b5dc2a88c5a6a3814a28718b5829167b830dfd0edd
2024-10-23 01:33:15 +00:00
stephan
198b72cfe8 Use pkg-config for readline detection, if available. Unrelated minor tcl cleanups.
FossilOrigin-Name: 3a41ac08a443f96c3f34432f5034d2d12f03913f2a1db19d9f133b365b39ad20
2024-10-23 01:18:16 +00:00
dan
3dbddc5507 Changes to EXPLAIN QUERY PLAN to identify covering index plan that use indexes on expressions.
FossilOrigin-Name: 29fb4919b6118b3b9ae411ec2ed5b59db7fae281909501c5fa238221ba635db5
2024-10-22 20:16:41 +00:00