From c139ad34debcccb989c47d545a4cbc23d820a6fe Mon Sep 17 00:00:00 2001 From: stephan Date: Fri, 27 Sep 2024 09:40:55 +0000 Subject: [PATCH] Rename TCL_GENERATOR to BTCL for consistency with BCC/TCC. FossilOrigin-Name: a7ff8f3c2c86f435a08d568a07f019a59dcca8f66a719d242289fa0c7097c2af --- Makefile.in | 46 +++++++++++++++++++++++++--------------------- auto.def | 4 ++-- manifest | 14 +++++++------- manifest.uuid | 2 +- 4 files changed, 35 insertions(+), 31 deletions(-) diff --git a/Makefile.in b/Makefile.in index 0b76e01e3f..bcae830f58 100644 --- a/Makefile.in +++ b/Makefile.in @@ -772,8 +772,12 @@ $(JIMSH): $(TOP)/autosetup/jimsh0.c Makefile $(BCC) -o $(JIMSH) @CFLAGS_JIMSH@ $< @endif -TCL_GENERATOR = @TCL_GENERATOR@ -$(TCL_GENERATOR): +# BTCL is the tclsh-compatible app used for running various code +# generators and other in-tree tools, as opposed to the TCL-based +# tests, which must be built and run using the canonical TCL +# distribution. +BTCL = @BTCL@ +$(BTCL): #XX# #XX#verify-source: ./src-verify @@ -885,30 +889,30 @@ has_tclsh85: # files are automatically generated. This target takes care of # all that automatic generation. # -.target_source: $(SRC) $(TOP)/tool/vdbe-compress.tcl fts5.c $(TCL_GENERATOR) # has_tclsh84 +.target_source: $(SRC) $(TOP)/tool/vdbe-compress.tcl fts5.c $(BTCL) # has_tclsh84 rm -rf tsrc mkdir tsrc cp -f $(SRC) tsrc rm tsrc/sqlite.h.in tsrc/parse.y - $(TCL_GENERATOR) $(TOP)/tool/vdbe-compress.tcl $(OPTS) vdbe.new + $(BTCL) $(TOP)/tool/vdbe-compress.tcl $(OPTS) vdbe.new mv vdbe.new tsrc/vdbe.c cp fts5.c fts5.h tsrc touch .target_source sqlite3.c: .target_source $(TOP)/tool/mksqlite3c.tcl src-verify \ - $(TCL_GENERATOR) # has_tclsh84 - $(TCL_GENERATOR) $(TOP)/tool/mksqlite3c.tcl $(AMALGAMATION_LINE_MACROS) $(EXTRA_SRC) + $(BTCL) # has_tclsh84 + $(BTCL) $(TOP)/tool/mksqlite3c.tcl $(AMALGAMATION_LINE_MACROS) $(EXTRA_SRC) cp tsrc/sqlite3ext.h . cp $(TOP)/ext/session/sqlite3session.h . -sqlite3r.h: sqlite3.h $(TCL_GENERATOR) # has_tclsh84 - $(TCL_GENERATOR) $(TOP)/tool/mksqlite3h.tcl $(TOP) --enable-recover >sqlite3r.h +sqlite3r.h: sqlite3.h $(BTCL) # has_tclsh84 + $(BTCL) $(TOP)/tool/mksqlite3h.tcl $(TOP) --enable-recover >sqlite3r.h -sqlite3r.c: sqlite3.c sqlite3r.h $(TCL_GENERATOR) # has_tclsh84 +sqlite3r.c: sqlite3.c sqlite3r.h $(BTCL) # has_tclsh84 cp $(TOP)/ext/recover/sqlite3recover.c tsrc/ cp $(TOP)/ext/recover/sqlite3recover.h tsrc/ cp $(TOP)/ext/recover/dbdata.c tsrc/ - $(TCL_GENERATOR) $(TOP)/tool/mksqlite3c.tcl --enable-recover $(AMALGAMATION_LINE_MACROS) $(EXTRA_SRC) + $(BTCL) $(TOP)/tool/mksqlite3c.tcl --enable-recover $(AMALGAMATION_LINE_MACROS) $(EXTRA_SRC) sqlite3ext.h: .target_source cp tsrc/sqlite3ext.h . @@ -1207,12 +1211,12 @@ mksourceid$(BEXE): $(TOP)/tool/mksourceid.c # Rules to build opcodes.c and opcodes.h # -opcodes.c: opcodes.h $(TOP)/tool/mkopcodec.tcl $(TCL_GENERATOR) # has_tclsh84 - $(TCL_GENERATOR) $(TOP)/tool/mkopcodec.tcl opcodes.h >opcodes.c +opcodes.c: opcodes.h $(TOP)/tool/mkopcodec.tcl $(BTCL) # has_tclsh84 + $(BTCL) $(TOP)/tool/mkopcodec.tcl opcodes.h >opcodes.c opcodes.h: parse.h $(TOP)/src/vdbe.c \ - $(TOP)/tool/mkopcodeh.tcl $(TCL_GENERATOR) # has_tclsh84 - cat parse.h $(TOP)/src/vdbe.c | $(TCL_GENERATOR) $(TOP)/tool/mkopcodeh.tcl >opcodes.h + $(TOP)/tool/mkopcodeh.tcl $(BTCL) # has_tclsh84 + cat parse.h $(TOP)/src/vdbe.c | $(BTCL) $(TOP)/tool/mkopcodeh.tcl >opcodes.h # Rules to build parse.c and parse.h - the outputs of lemon. # @@ -1223,8 +1227,8 @@ parse.c: $(TOP)/src/parse.y lemon$(BEXE) ./lemon$(BEXE) $(OPT_FEATURE_FLAGS) $(OPTS) -S parse.y sqlite3.h: $(TOP)/src/sqlite.h.in $(TOP)/manifest mksourceid$(BEXE) \ - $(TOP)/VERSION $(TCL_GENERATOR) # has_tclsh84 - $(TCL_GENERATOR) $(TOP)/tool/mksqlite3h.tcl $(TOP) >sqlite3.h + $(TOP)/VERSION $(BTCL) # has_tclsh84 + $(BTCL) $(TOP)/tool/mksqlite3h.tcl $(TOP) >sqlite3.h #XX#sqlite3rc.h: $(TOP)/src/sqlite3.rc $(TOP)/VERSION has_tclsh84 #XX# echo '#ifndef SQLITE_RESOURCE_VERSION' >$@ @@ -1269,8 +1273,8 @@ SHELL_DEP = \ $(TOP)/src/test_windirent.c \ $(TOP)/src/test_windirent.h -shell.c: $(SHELL_DEP) $(TOP)/tool/mkshellc.tcl $(TCL_GENERATOR) # has_tclsh84 - $(TCL_GENERATOR) $(TOP)/tool/mkshellc.tcl >shell.c +shell.c: $(SHELL_DEP) $(TOP)/tool/mkshellc.tcl $(BTCL) # has_tclsh84 + $(BTCL) $(TOP)/tool/mkshellc.tcl >shell.c #XX# #XX# #XX# @@ -1357,8 +1361,8 @@ fts5parse.c: $(TOP)/ext/fts5/fts5parse.y lemon$(BEXE) fts5parse.h: fts5parse.c -fts5.c: $(FTS5_SRC) $(TCL_GENERATOR) # has_tclsh84 - $(TCL_GENERATOR) $(TOP)/ext/fts5/tool/mkfts5c.tcl +fts5.c: $(FTS5_SRC) $(BTCL) # has_tclsh84 + $(BTCL) $(TOP)/ext/fts5/tool/mkfts5c.tcl cp $(TOP)/ext/fts5/fts5.h . #XX#fts5.lo: fts5.c $(HDR) $(EXTHDR) @@ -1719,7 +1723,7 @@ clean: tidy # Clean up everything. No exceptions. # distclean: clean - rm -f sqlite_cfg.h config.log config.status $(TCL_GENERATOR) Makefile $(LIBTOOL) + rm -f sqlite_cfg.h config.log config.status $(BTCL) Makefile $(LIBTOOL) #XX## #XX## Windows section diff --git a/auto.def b/auto.def index ba434d5d62..33a9cdfa5f 100644 --- a/auto.def +++ b/auto.def @@ -248,7 +248,7 @@ if {1} { # Check which TCL to use as a code generator define CFLAGS_JIMSH {} puts "Looking for path-resolution function for JimTCL... " -define TCL_GENERATOR "\$(JIMSH)" +define BTCL "\$(JIMSH)" if {[cc-check-functions realpath]} { define-append CFLAGS_JIMSH -DHAVE_REALPATH } elseif {[cc-check-functions _fullpath]} { @@ -325,7 +325,7 @@ if {"" eq [get-define CFLAGS_JIMSH]} { user-error "Cannot find tclsh, which is required to build certain files." } define TCLSH_CMD $tclsh - define TCL_GENERATOR $tclsh + define BTCL $tclsh define HAVE_TCL 0 ; # until the following elseif block is ported } elseif {0} { # Porting this section of configure.ac is going to be a bit of a slog... diff --git a/manifest b/manifest index 37b726c7c3..222245855f 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C Disable\sthe\soptional\sextending\sof\sJimTCL\son\sthe\sgrounds\sof\sYAGNI. -D 2024-09-27T03:16:01.551 +C Rename\sTCL_GENERATOR\sto\sBTCL\sfor\sconsistency\swith\sBCC/TCC. +D 2024-09-27T09:40:55.075 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 -F Makefile.in 9bdbffc3a2c1b609d855b6b6daa7769b8a12cd56d156f99420a2a9243831bd0c +F Makefile.in fe90969736fa820a80433efe1c7eab7edc7a3f3784150268baa370a6e279f192 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6 F Makefile.msc e3c4723c27464acc31da4420b808c8d2690180ba2b915897bece0a9d5d2cecf6 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159 @@ -14,7 +14,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 30290b22601486ec60f45fc43262fa0dadaf77b93f5cd69e272718913df45d94 +F auto.def fa4c056d8225c195213bdacdb1aa40b4a4bdee598d7076e9bafd9899327efae5 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac @@ -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 da197946dbaacedb6e74827db9b5dd195d4aaf78ad9411a14aca732ab77917c6 -R ab854d117274fb20de9c561e9133e97f +P f395c269d55c2b5ceb074f26d0b63f65b1f04ec513fe203c7e73e3a876b1f055 +R 29a5fb72187eaa096ca16d979b700320 U stephan -Z 4cbb4cf43f8c57e15bc8dd370627f837 +Z c604f90d680170e4b76ef7797c6d4f74 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index f7586c2e1c..1a05538def 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f395c269d55c2b5ceb074f26d0b63f65b1f04ec513fe203c7e73e3a876b1f055 +a7ff8f3c2c86f435a08d568a07f019a59dcca8f66a719d242289fa0c7097c2af -- 2.47.2