From 968dc2489a57fac0bf93d24c1f6bd6c8c95bec56 Mon Sep 17 00:00:00 2001 From: stephan Date: Thu, 7 Nov 2024 06:00:14 +0000 Subject: [PATCH] Change several 'file exists' checks for tclsh to file-isexec because that checks for .exe extensions on Windows. FossilOrigin-Name: 052a1b4d7cb43b7f65028c41e9a7a17b533c834d8f620fbc7bc0adddb1fdb843 --- auto.def | 6 +++--- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/auto.def b/auto.def index 59a4aae3fe..46ea9f6107 100644 --- a/auto.def +++ b/auto.def @@ -634,7 +634,7 @@ proc sqlite-check-tcl {} { #msg-debug "TCLLIB_RPATH = [get-define TCLLIB_RPATH]" }; # find TCLLIBDIR - if {[file exists $with_tclsh]} { + if {[file-isexec $with_tclsh]} { if {$cfg ne ""} { msg-result "Using tclsh: $with_tclsh" define HAVE_TCL 1 @@ -695,7 +695,7 @@ proc sqlite-determine-codegen-tcl {} { # _fullpath() is a Windows API define-append CFLAGS_JIMSH -DHAVE__FULLPATH define BTCLSH "\$(JIMSH)" - } elseif {[file exists [get-define TCLSH_CMD]]} { + } elseif {[file-isexec [get-define TCLSH_CMD]]} { set cgtcl [get-define TCLSH_CMD] define BTCLSH "\$(TCLSH_CMD)" } else { @@ -713,7 +713,7 @@ proc sqlite-determine-codegen-tcl {} { } } set cgtcl [get-define TCLSH_CMD] - if {![file exists $cgtcl]} { + if {![file-isexec $cgtcl]} { proj-fatal "Cannot find a tclsh to use for code generation." } define BTCLSH "\$(TCLSH_CMD)" diff --git a/manifest b/manifest index 079ede813e..38c1aef4f7 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C For\splatforms\swhere\stclsh\sis\sfound\sbut\stclConfig.sh\sis\snot,\sset\sHAVE_TCL\sto\s0.\sWe\scan't\sbuild\sthe\sTCL\scomponents\son\sthose.\sProblem\sreported\sin\s[forum:5106aee3a8|forum\spost\s5106aee3a8]. -D 2024-11-07T05:26:09.487 +C Change\sseveral\s'file\sexists'\schecks\sfor\stclsh\sto\sfile-isexec\sbecause\sthat\schecks\sfor\s.exe\sextensions\son\sWindows. +D 2024-11-07T06:00:14.892 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -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 7d4399cfcf2d05abe17ee62f7164b02a435a5c6f4f7a4581c126510a9ac83ef5 +F auto.def 61da56c0147852d5ec7a86eb96d968f1351cfada821ea54f090cec01e9cabb16 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac @@ -2200,8 +2200,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 6216bfcb74273b7893735e265d3f04d1362fa625cd60cebccb866ce7d6c50e01 -R ebdad56d0bb2add7c241926e4c52fbe3 +P 04d2576b2e516fc5f5ba719d6bb01d25fd3b06b1c2d26acbec32bcdd65e9a01c +R 37857bf341f005fe9a1012fdd57752f9 U stephan -Z 365df9597782f382d765b4f7c83a4a0c +Z cfe6f62fa97b31ccaf6d0632d55f4017 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 65e4c9a375..69d80bd6e8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -04d2576b2e516fc5f5ba719d6bb01d25fd3b06b1c2d26acbec32bcdd65e9a01c +052a1b4d7cb43b7f65028c41e9a7a17b533c834d8f620fbc7bc0adddb1fdb843