Minor auto.def cleanups and doc addtions.

FossilOrigin-Name: ea53aba82b1083bd59262e768b9331bfdc5c4ca6c4121b98aeedcbeb5af01b07

diff --git a/auto.def b/auto.def
index 66c9b978b7c932d8d4c3f9094a5537575a8672a4..b5bde98e252c6288251f0337444e2a887e03ca89 100644 (file)
--- a/auto.def
+++ b/auto.def
@@ -13,7 +13,16 @@
 # JimTCL: https://jim.tcl.tk
 #
 use cc cc-db cc-shared cc-lib hwaci-common pkg-config
-set DUMP_DEFINES_FILE ./defines.list
+# $DUMP_DEFINES_TXT is the file emitted by --dump-defines, intended
+# only for build debugging and not part of the public build interface.
+set DUMP_DEFINES_TXT ./config.defines.txt
+# $DUMP_DEFINES_JSON is the autosetup counterpart of the historical
+# "DEFS" var which was generated by the autotools in the pre-processed
+# autotools builds (but not in the canonical tree). This is used by at
+# least one high-profile client to extract build config info for use
+# in compiling a scripting-language binding, so its name should not be
+# arbitrarily changed.
+set DUMP_DEFINES_JSON ./config.defines.json
 
 ########################################################################
 # Regarding flag compatibility with the historical autotool configure
@@ -118,7 +127,7 @@ options [subst {
   tcl=1                => {Disable components which require TCL-dev}
   test-status          => {Enable status of tests}
   threadsafe=1         => {Disable mutexing}
-  with-tempstore:=no => {Use an in-ram database for temporary tables: never,no,yes,always.}
+  with-tempstore:=no   => {Use an in-ram database for temporary tables: never,no,yes,always}
   editline=0           => {BSD editline support}
   readline=1           => {Disable readline support}
   largefile=1          => {Disable large file support}
@@ -142,10 +151,11 @@ options [subst {
   gcov=0               => {Enable coverage testing using gcov}
   linemacros           => {Enable #line macros in the amalgamation.}
   with-wasi-sdk:=/opt/wasi-sdk
-                       => {Top-most dir of the wasi-sdk for a WASI build.}
+                       => {Top-most dir of the wasi-sdk for a WASI build}
   with-emsdk:DIR       => {Top-most dir of the Emscripten SDK installation}
-  defines-json-include-lowercase=0 => {Include lower-case defines in config.defines.json, which are primarily system paths.}
-  dump-defines=0       => {Dump autosetup defines to $DUMP_DEFINES_FILE (for build debugging)}
+  defines-json-include-lowercase=0
+                       => {Include lower-case defines (primarily system paths) in $DUMP_DEFINES_JSON}
+  dump-defines=0       => {Dump autosetup defines to $DUMP_DEFINES_TXT (for build debugging)}
 }]
 
 # Are we cross-compiling?
@@ -957,7 +967,7 @@ hwaci-check-rpath
 # Generate the output files.
 #
 hwaci-make-from-dot-in -touch Makefile sqlite3.pc
-# for sqlite_cfg.h and config.defines.json
+# for sqlite_cfg.h and $DUMP_DEFINES_JSON
 define PACKAGE_NAME "sqlite"
 define PACKAGE_URL {https://sqlite.org}
 define PACKAGE_VERSION [get-define VERSION_XYZ]
@@ -1008,16 +1018,16 @@ if {[opt-bool defines-json-include-lowercase]} {
   lappend dumpDefsOpt -auto {[a-z]*}
 }
 lappend dumpDefsOpt -none *
-hwaci-dump-defs-json config.defines.json {*}$dumpDefsOpt
+hwaci-dump-defs-json $DUMP_DEFINES_JSON {*}$dumpDefsOpt
 undefine OPT_FEATURE_FLAGS.list
 undefine OPT_SHELL.list
 
 ########################################################################
 # Some build-dev/debug-only output
 hwaci-if-opt-truthy dump-defines {
-  global DUMP_DEFINES_FILE
-  msg-result "--dump-defines is creating file: $DUMP_DEFINES_FILE"
-  make-config-header $DUMP_DEFINES_FILE \
+  global DUMP_DEFINES_TXT
+  msg-result "--dump-defines is creating $DUMP_DEFINES_TXT"
+  make-config-header $DUMP_DEFINES_TXT \
     -bare {SQLITE_OS* SQLITE_DEBUG USE_*} \
     -str {BIN_* CC LD AR LDFLAG* OPT_*} \
     -auto {*}

diff --git a/manifest b/manifest
index be62ab5d99a8c049c6114c89d9fadc375ba92b47..a5866e18123bbfe00b23705b064d67acee5d39dd 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C New\sjimsh0.c\sfile\sfor\sautosetup.
-D 2024-10-25T12:22:29.583
+C Minor\sauto.def\scleanups\sand\sdoc\saddtions.
+D 2024-10-25T13:56:13.425
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md b6e6c1baf38e4339bd3f1e0e5e5bfd0a9a93d133360691b2785c2d4b2f2dcec2
@@ -13,7 +13,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 79da787fe2e011ca43a571147dd68f737a565a57c814b51c5b7b1f7a0f587b24
+F auto.def 44bfd6a96800a552736e2b1c482d2be818aa1e8156c63fb877cbab480d974af0
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
@@ -2237,8 +2237,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 deb5994bb1c7295099939f9c88a97ecfe6d21087cfc9c98384e91993ce85f5e6
-R f837aa238c2e72caaf3c9df33a6b2a82
-U drh
-Z 11aaa30a777227b0b808d0d134efd59b
+P cfacf864119170365fb21a09d2cca5f2a16354837ef0c3c726b00a886ea8e7e2
+R d15a924070482fb08222da31d4f184cf
+U stephan
+Z 096fb849e2442f5f30570cc0621e9986
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 04f93327351013129d82bb3f5d4df409525aabcd..2ab51de6deb1400d128c13c6031894c8108f1695 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cfacf864119170365fb21a09d2cca5f2a16354837ef0c3c726b00a886ea8e7e2
+ea53aba82b1083bd59262e768b9331bfdc5c4ca6c4121b98aeedcbeb5af01b07