Rename an almost-name-colliding auto.def function. Fix a refactoring-induced change...

FossilOrigin-Name: 265ba15df1e64a50722118ac6d84667b0abd35fe8f4db28facf7788c50ac6cde

diff --git a/auto.def b/auto.def
index e4462ef5cdf226eeb9d2e3d643267b9eb31e0fd9..91daf6d86fa8f4ac15d89a03cc288fcdc42f7dd7 100644 (file)
--- a/auto.def
+++ b/auto.def
@@ -189,12 +189,14 @@ set flags {
   linemacros           => {Enable #line macros in the amalgamation.}
   dump-defines=0       => {Dump autosetup defines to $DUMP_DEFINES_TXT (for build debugging)}
   # </developer>
+
 }
 if {"" ne $DUMP_DEFINES_JSON} {
   lappend flags \
     defines-json-include-lowercase=0 \
     => {Include lower-case defines (primarily system paths) in $DUMP_DEFINES_JSON}
 }
+
 options [subst $flags]
 unset flags
 
@@ -265,6 +267,15 @@ proc sqlite-add-shell-opt {args} {
   }
 }
 
+# Pass msg-debug=1 to configure to enable obnoxiously loud output from
+# msg-debug.
+set msgDebugEnabled [proj-val-truthy [get-env msg-debug 0]]
+proc msg-debug {msg} {
+  if {$::msgDebugEnabled} {
+    puts stderr [proj-bold "** DEBUG: $msg"]
+  }
+}
+
 proj-file-extensions
 if {".exe" eq [get-define TARGET_EXEEXT]} {
   define SQLITE_OS_UNIX 0
@@ -462,13 +473,13 @@ proc sqlite-check-tcl {} {
   set use_tcl $optTcl
   set with_tclsh [opt-val with-tclsh]
   set with_tcl [opt-val with-tcl]
-  #puts "sqlite-check-tcl: use_tcl ${use_tcl}"
-  #puts "sqlite-check-tcl: with_tclsh=${with_tclsh}"
-  #puts "sqlite-check-tcl: with_tcl=$with_tcl"
+  msg-debug "sqlite-check-tcl: use_tcl ${use_tcl}"
+  msg-debug "sqlite-check-tcl: with_tclsh=${with_tclsh}"
+  msg-debug "sqlite-check-tcl: with_tcl=$with_tcl"
   if {"" eq $with_tclsh && "" eq $with_tcl} {
     set with_tclsh [proj-first-bin-of tclsh9.0 tclsh8.6 tclsh]
+    msg-debug "sqlite-check-tcl: with_tclsh=${with_tclsh}"
   }
-  #puts "sqlite-check-tcl: with_tclsh=${with_tclsh}"
 
   if {"" ne $with_tclsh} {
     if {![file isfile $with_tclsh]} {
@@ -624,7 +635,7 @@ sqlite-check-tcl
 #
 # Returns the name of the TCL it selects. Fails fatally if it cannot
 # detect a TCL appropriate for code generation.
-proc sqlite-check-which-tcl {} {
+proc sqlite-determine-codegen-tcl {} {
   msg-result "Checking for TCL to use for code generation... "
   define CFLAGS_JIMSH {}
   set cgtcl [opt-val with-tclsh jimsh]
@@ -670,8 +681,8 @@ proc sqlite-check-which-tcl {} {
     }
   }
   return $cgtcl
-}; # sqlite-check-which-tcl
-msg-result "TCL for code generation: [sqlite-check-which-tcl]"
+}; # sqlite-determine-codegen-tcl
+msg-result "TCL for code generation: [sqlite-determine-codegen-tcl]"
 
 # /TCL
 ########################################################################

diff --git a/autosetup/proj.tcl b/autosetup/proj.tcl
index 8f5335f77e27fb3a37e7c0861c6d90d9fad7ba7c..698385630ee65a7e5a24accfc8719fe0b5b0519a 100644 (file)
--- a/autosetup/proj.tcl
+++ b/autosetup/proj.tcl
@@ -252,7 +252,7 @@ proc proj-first-bin-of {args} {
     undefine $u
     if {"" ne $rc} break
   }
-  return ""
+  return $rc
 }
 
 ########################################################################

diff --git a/manifest b/manifest
index 08323c75f0297258d422c181d07e7ff97ff55dcb..49154e9f621376d6c560ea49acce22d30aed4bd5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\ssome\sextraneous\sconfigure\soutput.
-D 2024-10-29T17:55:12.324
+C Rename\san\salmost-name-colliding\sauto.def\sfunction.\sFix\sa\srefactoring-induced\schange\swhich\sbroke\simplicit\slookup\sof\stclConfig.sh.\sAdd\smsg-debug\sproc\sto\senable\stoggling\sof\sdeveloper-level\sdebug\smessages\svia\sa\sconfigure\sargument.
+D 2024-10-29T18:50:25.758
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md c5b4009dca54d127d2d6033c22fd9cc34f53bedb6ef12c7cbaa468381c74ab28
@@ -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 d9bb91d7ad13283870f4bbaba875a578a6738372957535280e0fdbcae5fb5860
+F auto.def 20dec7b20f2eebc50a93608ea544bbfc3dfeee6b26da5f96760aae95e382f560
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
@@ -49,7 +49,7 @@ F autosetup/cc.tcl 7e2fe943ae9d45cf39e9f5b05b6230df8e719415edea5af06c30eb68680bd
 F autosetup/default.auto 5cdf016de2140e50f1db190a02039dc42fb390af1dda4cc4853e3042a9ef0e82
 F autosetup/jimsh0.c 27ea5f221359ef6c58780fc6c185aadbf8d3bee9a021331a3e5de0eba0dc6de6
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
-F autosetup/proj.tcl 2fcaa8ee431a72df5cd5c1122df356d67ab2c892ef613cff6ffeb86a7b7da8f3
+F autosetup/proj.tcl c37063118b4c2556bd6e9c1b1b6a96e325415ea5ff0b6c56921aed6165ccd332
 F autosetup/system.tcl 3a39d6e0b3bfba526fd39afe07c1d0d325e5a31925013a1ba7c671e1128e31bb
 F autosetup/tmake.auto eaebc74ad538dfdd3c817c27eefc31930c20510c4f3a3704071f6cb0629ed71f
 F autosetup/tmake.tcl a275793ec1b6f8708179af0acef1f6f10d46c2920739743f7a8720c6d700c7a9
@@ -2198,8 +2198,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P decc60034849c232a05c8eb93ff0c6a5d6a48336d960771ed096d89633a9d0e2
-R 8da872de86ba96cb7075df2df6b3ca7e
+P 2234569edb15bb8b229e1b785aea08dd515798419ffe39c50f8399ce984258ac
+R e3f5199dad0ffa18056f027428bdd0e9
 U stephan
-Z cba6c8632d422ce92a5eebc93c684f66
+Z 1eb45bfbd7096c53e58d39982f0c271f
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 8891d875a73524e33b7f27097d54e71025960d8f..f25d99ad3bf0a3b94865a7723660e358949ddf41 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2234569edb15bb8b229e1b785aea08dd515798419ffe39c50f8399ce984258ac
+265ba15df1e64a50722118ac6d84667b0abd35fe8f4db28facf7788c50ac6cde