From 474cdc54ef4978816b337c9991201b1225b0cac4 Mon Sep 17 00:00:00 2001 From: stephan Date: Fri, 27 Sep 2024 01:42:52 +0000 Subject: [PATCH] Run all of the TCL-based code generators using JimTCL. FossilOrigin-Name: 3193b86a91d8096be68cb83133c7665129694521d7da81bf725e285c229271f7 --- Makefile.in | 28 +++++++++++++++------------- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/Makefile.in b/Makefile.in index 80ae609016..abe06b63cc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -128,7 +128,8 @@ HAVE_TCL = @HAVE_TCL@ # This is the command to use for tclsh - normally just "tclsh", but we may # know the specific version we want to use # -TCLSH_CMD = @TCLSH_CMD@ +# TCLSH_CMD = @TCLSH_CMD@ +TCLSH_CMD = exit 1 # Additional options when running tests using testrunner.tcl # This is usually either blank, or else --status @@ -880,12 +881,12 @@ has_tclsh85: # files are automatically generated. This target takes care of # all that automatic generation. # -.target_source: $(SRC) $(TOP)/tool/vdbe-compress.tcl has_tclsh84 fts5.c +.target_source: $(SRC) $(TOP)/tool/vdbe-compress.tcl fts5.c $(JIMSH) # has_tclsh84 rm -rf tsrc mkdir tsrc cp -f $(SRC) tsrc rm tsrc/sqlite.h.in tsrc/parse.y - $(TCLSH_CMD) $(TOP)/tool/vdbe-compress.tcl $(OPTS) vdbe.new + $(JIMSH) $(TOP)/tool/vdbe-compress.tcl $(OPTS) vdbe.new mv vdbe.new tsrc/vdbe.c cp fts5.c fts5.h tsrc touch .target_source @@ -896,14 +897,14 @@ sqlite3.c: .target_source $(TOP)/tool/mksqlite3c.tcl src-verify \ cp tsrc/sqlite3ext.h . cp $(TOP)/ext/session/sqlite3session.h . -sqlite3r.h: sqlite3.h has_tclsh84 - $(TCLSH_CMD) $(TOP)/tool/mksqlite3h.tcl $(TOP) --enable-recover >sqlite3r.h +sqlite3r.h: sqlite3.h $(JIMSH) # has_tclsh84 + $(JIMSH) $(TOP)/tool/mksqlite3h.tcl $(TOP) --enable-recover >sqlite3r.h -sqlite3r.c: sqlite3.c sqlite3r.h has_tclsh84 +sqlite3r.c: sqlite3.c sqlite3r.h $(JIMSH) # has_tclsh84 cp $(TOP)/ext/recover/sqlite3recover.c tsrc/ cp $(TOP)/ext/recover/sqlite3recover.h tsrc/ cp $(TOP)/ext/recover/dbdata.c tsrc/ - $(TCLSH_CMD) $(TOP)/tool/mksqlite3c.tcl --enable-recover $(AMALGAMATION_LINE_MACROS) $(EXTRA_SRC) + $(JIMSH) $(TOP)/tool/mksqlite3c.tcl --enable-recover $(AMALGAMATION_LINE_MACROS) $(EXTRA_SRC) sqlite3ext.h: .target_source cp tsrc/sqlite3ext.h . @@ -1202,11 +1203,12 @@ mksourceid$(BEXE): $(TOP)/tool/mksourceid.c # Rules to build opcodes.c and opcodes.h # -opcodes.c: opcodes.h $(TOP)/tool/mkopcodec.tcl has_tclsh84 - $(TCLSH_CMD) $(TOP)/tool/mkopcodec.tcl opcodes.h >opcodes.c +opcodes.c: opcodes.h $(TOP)/tool/mkopcodec.tcl $(JIMSH) # has_tclsh84 + $(JIMSH) $(TOP)/tool/mkopcodec.tcl opcodes.h >opcodes.c -opcodes.h: parse.h $(TOP)/src/vdbe.c $(TOP)/tool/mkopcodeh.tcl has_tclsh84 - cat parse.h $(TOP)/src/vdbe.c | $(TCLSH_CMD) $(TOP)/tool/mkopcodeh.tcl >opcodes.h +opcodes.h: parse.h $(TOP)/src/vdbe.c \ + $(TOP)/tool/mkopcodeh.tcl $(JIMSH) # has_tclsh84 + cat parse.h $(TOP)/src/vdbe.c | $(JIMSH) $(TOP)/tool/mkopcodeh.tcl >opcodes.h # Rules to build parse.c and parse.h - the outputs of lemon. # @@ -1351,8 +1353,8 @@ fts5parse.c: $(TOP)/ext/fts5/fts5parse.y lemon$(BEXE) fts5parse.h: fts5parse.c -fts5.c: $(FTS5_SRC) has_tclsh84 - $(TCLSH_CMD) $(TOP)/ext/fts5/tool/mkfts5c.tcl +fts5.c: $(FTS5_SRC) $(JIMSH) # has_tclsh84 + $(JIMSH) $(TOP)/ext/fts5/tool/mkfts5c.tcl cp $(TOP)/ext/fts5/fts5.h . #XX#fts5.lo: fts5.c $(HDR) $(EXTHDR) diff --git a/manifest b/manifest index 92f082e4d1..4641f3848d 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C Generate\ssqlite3.h/.c\swith\sjimsh,\ssomewhat\sto\smy\ssurprise. -D 2024-09-27T01:30:34.027 +C Run\sall\sof\sthe\sTCL-based\scode\sgenerators\susing\sJimTCL. +D 2024-09-27T01:42:52.890 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 -F Makefile.in f4756fd992cd7b87c70c5cdbe8c9b1465c00b2b815f9421057968187477a03b9 +F Makefile.in ab329ecf862e1fca897c944c638ab7e4501ce963e68bc36189409f2da0fa805d 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 5bd62cdbc4b188a59c83fb04685f9967d6a5270772eb48f950a5d86409eb8a1b -R ef803379c968170516afffb5463c2345 +P c365d8e1f7aa19e424f60f976db683c3ccb489900124811541e02d47f9a1cbe3 +R 6deba968ac63d8a58c958b1d9fa280a1 U stephan -Z 9899a937a86e0eff95554dd8ceadaf0f +Z 4c81e3416eed085f7fee6ec13899f0d9 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index cb275555ed..3bb145c9c5 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c365d8e1f7aa19e424f60f976db683c3ccb489900124811541e02d47f9a1cbe3 +3193b86a91d8096be68cb83133c7665129694521d7da81bf725e285c229271f7 -- 2.47.2