From: drh <>
Date: Thu, 24 Oct 2024 19:56:42 +0000 (+0000)
Subject: The "WITHOUT_JIMSH=1" option on the nmake command-line forces the use of
X-Git-Tag: major-relase~351^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8ce6d66986311f12983de2c72b5430c5a2d60f9e;p=thirdparty%2Fsqlite.git

The "WITHOUT_JIMSH=1" option on the nmake command-line forces the use of
standard TCL for building, instead of jimsh0.

FossilOrigin-Name: 9f861f66e238b62e04d640ee98bac86b9b532a55d62c92ae0154bd67ee01ec75
---

diff --git a/Makefile.msc b/Makefile.msc
index 979933926a..4f50c300d8 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1061,8 +1061,13 @@ TCLSH_CMD = tclsh
 !ENDIF
 
 # A light-weight TCLSH replacement that can be used for code generation
-# but which is not adequate for testing.
+# but which is not adequate for testing.  This is "jimsh0" by default,
+# with source code in the repository.  To force the whole build to use
+# the full, official tclsh, add WITHOUT_JIMSH=1 to the nmake command line.
 #
+!IFDEF WITHOUT_JIMSH
+JIM_TCLSH = $(TCLSH_CMD)
+!ENDIF
 !IFNDEF JIM_TCLSH
 JIM_TCLSH = $(TOP)\jimsh0.exe
 !ENDIF
diff --git a/manifest b/manifest
index bd4c87b6a1..67b4e76b25 100644
--- a/manifest
+++ b/manifest
@@ -1,11 +1,11 @@
-C Basic\sbuilds\snow\sappear\sto\swork\susing\sjimsh0\son\sWindows.
-D 2024-10-24T19:17:25.207
+C The\s"WITHOUT_JIMSH=1"\soption\son\sthe\snmake\scommand-line\sforces\sthe\suse\sof\nstandard\sTCL\sfor\sbuilding,\sinstead\sof\sjimsh0.
+D 2024-10-24T19:56:42.026
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
 F Makefile.in a751c1d84222c389ff83dc9c7d2f4ef2ca29bf357609032bb4af3147f6f38b70
 F Makefile.linux-generic 8df0e6ee5e4671f844caf27f88d2be7421e904639f7a0ffdce0e2cd4ea11e8c0
-F Makefile.msc 46ac29ffb26ccd346353f22ed4c7d1a8589e93ee32997d63a63019e612cfe07e
+F Makefile.msc 28318970f86f601ac79b5e6a514a52fb33a1526d0e0e915b4edc2f41846c1d4a
 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
 F VERSION 8dc0c3df15fd5ff0622f88fc483533fce990b1cbb2f5fb9fdfb4dbd71eef2889
 F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5
@@ -1737,7 +1737,7 @@ F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl 7b44f1a9b9a2de8112695b908afc21dd9a68cd2d44e84b73f1b27b53492c0d59
 F test/testrunner.tcl bc1a8d21a1aa3a5cf7c4883cbee4b6748790fe960fad06ca5db74ec914bd6525 x
-F test/testrunner_data.tcl c7b3b911e44f7e8c01cc6bc7571e16115cdc2e4db46630bd2acd7a931a46380e
+F test/testrunner_data.tcl e3037f54cdb67479827cdfe8b8962a38811a496c1ad81956c085c64aa34e7a12
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@ -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 f7def0be742fad9863f1eba11d0c2f1fa739ad1262e67d24380698e3948cedb7
-R f7d9ddba41062822bed325e6117a4ac3
+P d8f5193970401b763a94a1d0403bed4337c9fb1f087772b72fb46b9e0bde1c0d
+R d6a2c119d2e2b5b78e997064a2e28dd5
 U drh
-Z a8e6b0cd2247237e95c6b267e7597266
+Z 501f1f77f82aa3cf9af5ab80f1dd5888
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index fb92e4e3ee..018d4e174b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d8f5193970401b763a94a1d0403bed4337c9fb1f087772b72fb46b9e0bde1c0d
+9f861f66e238b62e04d640ee98bac86b9b532a55d62c92ae0154bd67ee01ec75
diff --git a/test/testrunner_data.tcl b/test/testrunner_data.tcl
index 98b3669a33..eac3f69a99 100644
--- a/test/testrunner_data.tcl
+++ b/test/testrunner_data.tcl
@@ -116,6 +116,7 @@ namespace eval trd {
     --enable-all
   }
   set build(Stdcall) {
+    -DWITHOUT_JIMSH=1
     -DUSE_STDCALL=1
     -DSQLITE_USE_ONLY_WIN32=1
     -O2