From: stephan <stephan@noemail.net>
Date: Sat, 22 Feb 2025 14:53:00 +0000 (+0000)
Subject: tool/mksqlite3h.tcl: when invoking the mksourceid binary, add a .exe to it, if needed... 
X-Git-Tag: major-release~242^2~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b0240ea72da29c121d84d4ca8b296120a37c505;p=thirdparty%2Fsqlite.git

tool/mksqlite3h.tcl: when invoking the mksourceid binary, add a .exe to it, if needed, to appease msys2.

FossilOrigin-Name: 08c9e56f6082bb609a42f0e34c83542fe8b682757bc45616810d91491950fd0f
---

diff --git a/manifest b/manifest
index 1add228687..99629930b4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sinstallation\srules\sfor\simport\slib\sin\sthe\sautoconf\sbundle,\sbroken\sby\srecent\srefactoring\sin\sthis\sbranch.
-D 2025-02-22T00:01:30.550
+C tool/mksqlite3h.tcl:\swhen\sinvoking\sthe\smksourceid\sbinary,\sadd\sa\s.exe\sto\sit,\sif\sneeded,\sto\sappease\smsys2.
+D 2025-02-22T14:53:00.893
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -2159,7 +2159,7 @@ F tool/mksourceid.c 36aa8020014aed0836fd13c51d6dc9219b0df1761d6b5f58ff5b616211b0
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 F tool/mksqlite3c-noext.tcl 351c55256213154cabb051a3c870ef9f4487de905015141ae50dc7578a901b84
 F tool/mksqlite3c.tcl ba13086555b3cb835eba5e47a9250300ab85304d23fd1081abd3f29d8ab71a2b
-F tool/mksqlite3h.tcl b05b85c32295bad3fe64807729693d1f19faed3c464c5faac6c53bb6b972ac2f
+F tool/mksqlite3h.tcl 2275e7bf25a9ee31b10bef8305641b63a293955245a22967ca6ea77b336cac78
 F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
 F tool/mksrczip.tcl 81efd9974dbb36005383f2cd655520057a2ae5aa85ac2441a80c7c28f803ac52
 F tool/mktoolzip.tcl 34b4e92be544f820e2cc26f143f7d5aec511e826ec394cc82969a5dcf7c7a27c
@@ -2210,8 +2210,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 a7647fd07792ef32697c7ba8ab6348593c2a5c4cedf673b155206da6aae799f8
-R 2e03e2a46eda75fb7824ca457ccfbcf4
+P 95b71fc7e9887833f03f84c37b94385012a6ae76b86cd079372f1752833e0f5d
+R 6ff9b839648f0f2fb665b46169234265
 U stephan
-Z e919d723d6d10d5de9ca8edf111b0dd8
+Z d4df9033ee40561e703d0422024e5649
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 8a03021ade..51b2a6afad 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-95b71fc7e9887833f03f84c37b94385012a6ae76b86cd079372f1752833e0f5d
+08c9e56f6082bb609a42f0e34c83542fe8b682757bc45616810d91491950fd0f
diff --git a/tool/mksqlite3h.tcl b/tool/mksqlite3h.tcl
index b1d5ecdcd3..d64490f9b4 100644
--- a/tool/mksqlite3h.tcl
+++ b/tool/mksqlite3h.tcl
@@ -82,7 +82,13 @@ set nVersion [eval format "%d%03d%03d" [split $zVersion .]]
 set PWD [pwd]
 cd $TOP
 set tmpfile $PWD/tmp-[clock millisec]-[expr {int(rand()*100000000000)}].txt
-exec $PWD/mksourceid manifest > $tmpfile
+set mksourceid $PWD/mksourceid
+if {![file exists $mksourceid] && [file exists ${mksourceid}.exe]} {
+  # Workaround for Windows-based Unix-like environments
+  # https://sqlite.org/forum/forumpost/41ba710dd9943453
+  set mksourceid mksourceid.exe
+}
+exec $mksourceid manifest > $tmpfile
 set fd [open $tmpfile rb]
 set zSourceId [string trim [read $fd]]
 close $fd