From: stephan <stephan@noemail.net>
Date: Fri, 27 Sep 2024 01:25:49 +0000 (+0000)
Subject: Experimentally build shell.c using the autosetup-provided JimTCL.
X-Git-Tag: major-relase~351^2~112
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69f2da0eed4d231e58836113efd304335b7d01ee;p=thirdparty%2Fsqlite.git

Experimentally build shell.c using the autosetup-provided JimTCL.

FossilOrigin-Name: 5bd62cdbc4b188a59c83fb04685f9967d6a5270772eb48f950a5d86409eb8a1b
---

diff --git a/Makefile.in b/Makefile.in
index 2b74498e62..2fe451b2b8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -760,6 +760,16 @@ sourcetest:	srcck1$(BEXE) sqlite3.c
 
 src-verify:	$(TOP)/tool/src-verify.c
 	$(BCC) -o src-verify$(BEXE) $(TOP)/tool/src-verify.c
+
+
+# JimTCL is part of the autosetup suite and is suitable for certain
+# in-tree TCL jobs, but it requires that we build it with non-default
+# flags.
+#
+JIMSH = @srcdir@/jimsh
+$(JIMSH): $(TOP)/autosetup/jimsh0.c Makefile
+	$(BCC) -o $(JIMSH) -DHAVE_REALPATH $<
+
 #XX#
 #XX#verify-source:	./src-verify
 #XX#	./src-verify $(TOP)
@@ -1251,8 +1261,8 @@ SHELL_DEP = \
     $(TOP)/src/test_windirent.c \
     $(TOP)/src/test_windirent.h
 
-shell.c:	$(SHELL_DEP) $(TOP)/tool/mkshellc.tcl has_tclsh84
-	$(TCLSH_CMD) $(TOP)/tool/mkshellc.tcl >shell.c
+shell.c:	$(SHELL_DEP) $(TOP)/tool/mkshellc.tcl $(JIMSH) # has_tclsh84
+	$(JIMSH) $(TOP)/tool/mkshellc.tcl >shell.c
 #XX#
 #XX#
 #XX#
@@ -1668,7 +1678,6 @@ fts5.c: $(FTS5_SRC) has_tclsh84
 #XX#tclextension-list: 
 #XX#	$(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --info
 
-
 # Remove build products sufficient so that subsequent makes will recompile
 # everything from scratch.  Do not remove:
 #
@@ -1702,7 +1711,7 @@ clean:	tidy
 # Clean up everything.  No exceptions.
 #
 distclean:	clean
-	rm -f sqlite_cfg.h config.log config.status Makefile $(LIBTOOL)
+	rm -f sqlite_cfg.h config.log config.status $(JIMSH) Makefile $(LIBTOOL)
 
 #XX##
 #XX## Windows section
diff --git a/manifest b/manifest
index ac1cf1f641..9968255db6 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Remove\ssome\sgratuitous\soverengineering\sbefore\sit\scan\sspread.
-D 2024-09-27T01:04:09.944
+C Experimentally\sbuild\sshell.c\susing\sthe\sautosetup-provided\sJimTCL.
+D 2024-09-27T01:25:49.563
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in 32bcabed9be12d736ceada701df2976089dc3d072a2e4747ea7ef52a589092db
+F Makefile.in bcd7cdc63f4c1564ee0c6fdb7ff197abd566ce4f668f0d198fbbe592de3852df
 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
 F Makefile.msc e3c4723c27464acc31da4420b808c8d2690180ba2b915897bece0a9d5d2cecf6
 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
@@ -2233,8 +2233,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 e890c8508da4e126f43c61f809f750d6cb2d7d01600fe2173fbcd7dabbfce0fd
-R 4412cd3ef719ad30399056a948ff39f5
+P 94340011ed903434cd12ca982f226c548f7ec43019d449b4ee12e18ec886fb27
+R 1e4458ab0745592e456364479f74d688
 U stephan
-Z 4be646b67bd21ccf89d6b050e9348ec1
+Z 14336e6ef7079fcb9bc0bec73aa50ed7
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 18a1b6424a..4d49c5ea35 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-94340011ed903434cd12ca982f226c548f7ec43019d449b4ee12e18ec886fb27
+5bd62cdbc4b188a59c83fb04685f9967d6a5270772eb48f950a5d86409eb8a1b