From: stephan <stephan@noemail.net>
Date: Tue, 4 Mar 2025 19:38:38 +0000 (+0000)
Subject: Teach autosetup how to find tclsh v9.0 on cygwin.
X-Git-Tag: major-release~212^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ca5b1e39dd93f245dd419bb8502396a873d8852;p=thirdparty%2Fsqlite.git

Teach autosetup how to find tclsh v9.0 on cygwin.

FossilOrigin-Name: 6d87a8efe5611102eac150e5dc1e9d9602318ab8b96046b29c66602e7c3d12fa
---

diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl
index 2d27d3bfbb..596a5825b5 100644
--- a/autosetup/sqlite-config.tcl
+++ b/autosetup/sqlite-config.tcl
@@ -1692,6 +1692,14 @@ proc sqlite-handle-wasi-sdk {} {
   return 1
 }; # sqlite-handle-wasi-sdk
 
+set sqliteConfig(host-is-windows) [proj-looks-like-windows]
+proc sqlite-bin-for-name {fname} {
+  if {$::sqliteConfig(host-is-windows)} {
+    return ${fname}.exe
+  }
+  return $fname
+}
+
 ########################################################################
 # TCL...
 #
@@ -1760,7 +1768,7 @@ proc sqlite-check-tcl {} {
   if {"" eq $with_tclsh && "" eq $with_tcl} {
     # If neither --with-tclsh nor --with-tcl are provided, try to find
     # a workable tclsh.
-    set with_tclsh [proj-first-bin-of tclsh9.0 tclsh8.6 tclsh]
+    set with_tclsh [proj-first-bin-of tclsh9.0 tclsh90 tclsh8.6 tclsh]
     msg-debug "sqlite-check-tcl: with_tclsh=${with_tclsh}"
   }
 
@@ -1786,7 +1794,7 @@ proc sqlite-check-tcl {} {
     }
   }
   set cfg ""
-  set tclSubdirs {tcl9.0 tcl8.6 lib}
+  set tclSubdirs {tcl9.0 tcl90 tcl8.6 lib}
   while {$use_tcl} {
     if {"" ne $with_tcl} {
       # Ensure that we can find tclConfig.sh under ${with_tcl}/...
@@ -1840,15 +1848,20 @@ proc sqlite-check-tcl {} {
     # We have tclConfig.sh but no tclsh. Attempt to locate a tclsh
     # based on info from tclConfig.sh.
     proj-assert {"" ne [get-define TCL_EXEC_PREFIX]}
-    set with_tclsh [get-define TCL_EXEC_PREFIX]/bin/tclsh[get-define TCL_VERSION]
-    if {![file-isexec $with_tclsh]} {
-      set with_tclsh2 [get-define TCL_EXEC_PREFIX]/bin/tclsh
-      if {![file-isexec $with_tclsh2]} {
-        proj-warn "Cannot find a usable tclsh (tried: $with_tclsh $with_tclsh2)"
-      } else {
-        set with_tclsh $with_tclsh2
+    set tryThese ""
+    lappend tryThese [get-define TCL_EXEC_PREFIX]/bin/tclsh[get-define TCL_VERSION]
+    lappend tryThese [get-define TCL_EXEC_PREFIX]/bin/tclsh[string map {. {}} [get-define TCL_VERSION]]
+    # ^^^^ cygwin
+    lappend tryThese [get-define TCL_EXEC_PREFIX]/bin/tclsh
+    foreach trySh $tryThese {
+      if {[file-isexec $trySh]} {
+        set with_tclsh $trySh
+        break
       }
     }
+    if {![file-isexec $with_tclsh]} {
+      proj-warn "Cannot find a usable tclsh (tried: $tryThese)
+    }
   }
   define TCLSH_CMD $with_tclsh
   if {$use_tcl} {
diff --git a/manifest b/manifest
index 2a204c954b..abc48abd16 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Makefile\sdoc\supdates.\sRemove\sa\scouple\sextraneous\stargets.\sNo\sfunctional\schanges.
-D 2025-03-04T07:29:28.611
+C Teach\sautosetup\show\sto\sfind\stclsh\sv9.0\son\scygwin.
+D 2025-03-04T19:38:38.251
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e
 F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
 F autosetup/proj.tcl e69b91f814ea510057ce7663845de703c3746d71cff9a0db6b2563ee3e7fd25e
-F autosetup/sqlite-config.tcl 72034aa26cff9b4d57c6ad69fa1a610b60a49101716c5495cc928774616d8d20
+F autosetup/sqlite-config.tcl 6e424756dc468d9e6e26051f8b694d486e6864f73278611a5140ff53c5f3520a
 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9
 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x
 F contrib/sqlitecon.tcl eb4c6578e08dd353263958da0dc620f8400b869a50d06e271ab0be85a51a08d3
@@ -2213,8 +2213,11 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 6f6a03e93cf58eaee79603de0b28ad34c872fb4b4b7d9c4e7fe35c698b27618a
-R c299274d4db174b41c97a78fbd64f0cd
+P 5a3e22999f8da075f7ca3e039f10386fb85295a2457c9495d2c48b7137a84296
+R 3803ce35217f6b91028e02d18ca2d3be
+T *branch * cygwin-fixes
+T *sym-cygwin-fixes *
+T -sym-trunk *
 U stephan
-Z 61fe3cdeb2e2d49de4c5c1687247521c
+Z 985140384a8fdd4332f9c255cb587008
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 383b285d1a..b566b0316f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5a3e22999f8da075f7ca3e039f10386fb85295a2457c9495d2c48b7137a84296
+6d87a8efe5611102eac150e5dc1e9d9602318ab8b96046b29c66602e7c3d12fa