Add --defs-json-include-lowercase configure flag to cause config-defs.json to include...

FossilOrigin-Name: 0f2555ea3c7c1950566182c8f5a4d98049461e9db305e892c8434ba3fbf3497a

diff --git a/Makefile.in b/Makefile.in
index b39323f272c95a2fdb612924b48fc03ca7759ba8..8ea809e672ea9b8c36d78e42cdeddf9f3a2e1718 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -313,7 +313,7 @@ clean: clean-autosetup
 distclean-autosetup:   clean
        rm -f sqlite_cfg.h config.log config.status config-defs.json Makefile sqlite3.pc
        rm -f $(TOP)/tool/emcc.sh
-       rm -f libsqlite3*.$(T.dll)
+       rm -f libsqlite3*$(T.dll)
        -gmake -C ext/wasm distclean 2>/dev/null; true
 distclean: distclean-autosetup
 

diff --git a/auto.def b/auto.def
index c403ee1ad788d7069e2975ad28e12fd94ad2f004..31cb336abbe3e0bcfa9bae33c59f6c0ea180888c 100644 (file)
--- a/auto.def
+++ b/auto.def
@@ -144,6 +144,7 @@ options [subst {
   with-wasi-sdk:=/opt/wasi-sdk
                        => {Top-most dir of the wasi-sdk for a WASI build.}
   with-emsdk:DIR       => {Top-most dir of the Emscripten SDK installation}
+  defs-json-include-lowercase=0 => {Include lower-case defines in config-defs.json, which are primarily system paths.}
   dump-defines=0       => {Dump autosetup defines to $DUMP_DEFINES_FILE (for build debugging)}
 }]
 
@@ -957,9 +958,10 @@ hwaci-check-rpath
 #
 hwaci-make-from-dot-in -touch Makefile sqlite3.pc
 # for sqlite_cfg.h and config-defs.json
+define PACKAGE_NAME "sqlite"
 define PACKAGE_URL {https://sqlite.org}
 define PACKAGE_VERSION [get-define VERSION_XYZ]
-define PACKAGE_STRING "sqlite [get-define VERSION_XYZ]"
+define PACKAGE_STRING "[get-define PACKAGE_NAME] [get-define VERSION_XYZ]"
 define PACKAGE_BUGREPORT [get-define PACKAGE_URL]
 if {0} {
   # Requires a hand-written sqlite_cfg.h.in...
@@ -993,12 +995,18 @@ unset oFF
 # define-append OPT_FOO.list {"-DFOO=bar baz" -DBAR="baz barre"}
 define OPT_FEATURE_FLAGS.list [get-define OPT_FEATURE_FLAGS]
 define OPT_SHELL.list [get-define OPT_SHELL]
-hwaci-dump-defs-json config-defs.json \
-  -bare {SIZEOF_* HAVE_DECL_*} \
-  -none {HAVE_CFLAG_* LDFLAGS_* SH_* SQLITE_AUTOREMAKE TARGET_* USE_GCOV TCL_*} \
-  -array {*.list} \
-  -auto {OPT_* PACKAGE_* HAVE_*} \
-  -none *
+set dumpDefsOpt {
+  -bare {SIZEOF_* HAVE_DECL_*}
+  -none {HAVE_CFLAG_* LDFLAGS_* SH_* SQLITE_AUTOREMAKE TARGET_* USE_GCOV TCL_*}
+  -array {*.list}
+  -auto {OPT_* PACKAGE_* HAVE_*}
+}
+if {[opt-bool defs-json-include-lowercase]} {
+  lappend dumpDefsOpt -none {lib_*} ; # remnants from hwaci-check-function-in-lib and friends
+  lappend dumpDefsOpt -auto {[a-z]*}
+}
+lappend dumpDefsOpt -none *
+hwaci-dump-defs-json config-defs.json {*}$dumpDefsOpt
 undefine OPT_FEATURE_FLAGS.list
 undefine OPT_SHELL.list
 

diff --git a/manifest b/manifest
index 5e84a206cf5333c4d5d6c989950845347b4f8cf1..bffcdf0b88ee3d81b4b9878647645bd38ddafdf8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Internal\scleanups\sand\sdocs\sin\shwaci-common.tcl.
-D 2024-10-25T04:16:36.966
+C Add\s--defs-json-include-lowercase\sconfigure\sflag\sto\scause\sconfig-defs.json\sto\sinclude\slower-case\sdefines,\swhich\sare\sprimarily\sthe\svarious\sbuild-related\ssystem\spaths.
+D 2024-10-25T04:39:14.952
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in 1c73c6246b63579d583d6269afce7ac92dfe672521260eee30ca55d752d666b3
+F Makefile.in f62cd6d36461d462cccc80ecd2b43a53e21467d67250555570644e616ca5b18d
 F Makefile.linux-generic 8df0e6ee5e4671f844caf27f88d2be7421e904639f7a0ffdce0e2cd4ea11e8c0
 F Makefile.msc 28318970f86f601ac79b5e6a514a52fb33a1526d0e0e915b4edc2f41846c1d4a
 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
@@ -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 48411cc3e6b140d4af7ab51ce309bf1dc0d4eaace628befb261f6915994bb3c7
+F auto.def dc9e9da56ef6b99f79fe51e9c6b7510f33fd4d4b44e00779642ea237a0768b76
 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 0d5da3888e79166fec560554a921e2ef4290558e988144465f1ea7138ca263a3
-R 3df9a97de38801cc8ea2ce03eb6935ab
+P 30699b57d21f70dd42ec61f5157859358c6be5e3e14bb2989f8874ceeda5dae6
+R 072d902d5f60f416f41fd709fc58d6b0
 U stephan
-Z c1a5ed21a5f202d16f8c6f337f6da0c7
+Z b79df6907aab089767fcfcfc7c508bc3
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 0016dc7576b0b3ae3a582131422bf95a34767192..192bb16f99ac649f36413d069945dc3787b0f4b0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-30699b57d21f70dd42ec61f5157859358c6be5e3e14bb2989f8874ceeda5dae6
+0f2555ea3c7c1950566182c8f5a4d98049461e9db305e892c8434ba3fbf3497a