1
0
mirror of https://github.com/sqlite/sqlite.git synced 2026-01-06 08:01:16 +03:00

More work on the tcl build parts.

FossilOrigin-Name: 292ad7d519d39f16f130d082d3f134deadd5409d56ffb5340064a1996f4b4d57
This commit is contained in:
stephan
2024-10-09 13:20:25 +00:00
parent 92860ade7a
commit fa2770fec5
3 changed files with 49 additions and 43 deletions

View File

@@ -811,13 +811,54 @@ $(libtclsqlite3.DLL): tclsqlite.o $(libsqlite3.LIB)
$(TCL_STUB_LIB_SPEC) $(TLIBS) \
@TCLLIB_RPATH@
libtcl: $(libtclsqlite3.DLL)
all: $(libtclsqlite3.DLL)
pkgIndex.tcl:
echo 'package ifneeded sqlite3 $(RELEASE) [list load [file join $$dir libtclsqlite3[info sharedlibextension]] sqlite3]' > $@
install.tcldir = "$(DESTDIR)@TCLLIBDIR@"
install-tcl: $(libtclsqlite3.DLL) pkgIndex.tcl
$(INSTALL) -d $(install.tcldir)
$(INSTALL) $(libtclsqlite3.DLL) $(install.tcldir)
$(INSTALL_noexec) pkgIndex.tcl $(install.tcldir)
install: install-tcl
tclsqlite3.c: sqlite3.c
echo '#ifndef USE_SYSTEM_SQLITE' >tclsqlite3.c
cat sqlite3.c >>tclsqlite3.c
echo '#endif /* USE_SYSTEM_SQLITE */' >>tclsqlite3.c
cat $(TOP)/src/tclsqlite.c >>tclsqlite3.c
#sqlite3-all.c: sqlite3.c $(TOP)/tool/split-sqlite3c.tcl $(BTCL) # has_tclsh84
# $(TCLSH_CMD) $(TOP)/tool/split-sqlite3c.tcl
# Build the SQLite TCL extension in a way that make it compatible
# with whatever version of TCL is running as $TCLSH_CMD, possibly defined
# by --with-tclsh=
#
tclextension: tclsqlite3.c
$(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --build-only --cc "$(CC)" $(CFLAGS) $(OPT_FEATURE_FLAGS) $(OPTS)
# Install the SQLite TCL extension in a way that is appropriate for $TCLSH_CMD
# to find it.
#
tclextension-install: tclsqlite3.c
$(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --cc "$(CC)" $(CFLAGS) $(OPT_FEATURE_FLAGS) $(OPTS)
# Install the SQLite TCL extension that is used by $TCLSH_CMD
#
tclextension-uninstall:
$(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --uninstall
# List all installed the SQLite TCL extension that is are accessible
# by $TCLSH_CMD, included prior versions.
#
tclextension-list:
$(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --info
# end of @if HAVE_TCL
@endif
sqlite3$(TEXE): shell.c sqlite3.c
@@ -1035,16 +1076,6 @@ sqlite3r.c: sqlite3.c sqlite3r.h $(BTCL) # has_tclsh84
sqlite3ext.h: .target_source
cp tsrc/sqlite3ext.h .
#XX#tclsqlite3.c: sqlite3.c
#XX# echo '#ifndef USE_SYSTEM_SQLITE' >tclsqlite3.c
#XX# cat sqlite3.c >>tclsqlite3.c
#XX# echo '#endif /* USE_SYSTEM_SQLITE */' >>tclsqlite3.c
#XX# cat $(TOP)/src/tclsqlite.c >>tclsqlite3.c
#XX#
#XX#sqlite3-all.c: sqlite3.c $(TOP)/tool/split-sqlite3c.tcl has_tclsh84
#XX# $(TCLSH_CMD) $(TOP)/tool/split-sqlite3c.tcl
#XX#
# Rules to build the LEMON compiler generator
#
lemon$(BEXE): $(TOP)/tool/lemon.c $(TOP)/tool/lempar.c
@@ -1770,38 +1801,12 @@ sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlit
#XX# $(INSTALL) -d $(DESTDIR)$(pkgconfigdir)
#XX# $(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(pkgconfigdir)
#XX#
pkgIndex.tcl:
echo 'package ifneeded sqlite3 $(RELEASE) [list load [file join $$dir libtclsqlite3[info sharedlibextension]] sqlite3]' > $@
#XX#
#XX#tcl_install: lib_install libtclsqlite3.la pkgIndex.tcl
#XX# $(INSTALL) -d $(DESTDIR)$(TCLLIBDIR)
#XX# $(LTINSTALL) libtclsqlite3.la $(DESTDIR)$(TCLLIBDIR)
#XX# rm -f $(DESTDIR)$(TCLLIBDIR)/libtclsqlite3.la $(DESTDIR)$(TCLLIBDIR)/libtclsqlite3.a
#XX# $(INSTALL) -m 0644 pkgIndex.tcl $(DESTDIR)$(TCLLIBDIR)
#XX#
#XX## Build the SQLite TCL extension in a way that make it compatible
#XX## with whatever version of TCL is running as $TCLSH_CMD, possibly defined
#XX## by --with-tclsh=
#XX##
#XX#tclextension: tclsqlite3.c
#XX# $(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --build-only --cc $(CC) $(CFLAGS) $(OPT_FEATURE_FLAGS) $(OPTS)
#XX#
#XX## Install the SQLite TCL extension in a way that is appropriate for $TCLSH_CMD
#XX## to find it.
#XX##
#XX#tclextension-install: tclsqlite3.c
#XX# $(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --cc $(CC) $(CFLAGS) $(OPT_FEATURE_FLAGS) $(OPTS)
#XX#
#XX## Install the SQLite TCL extension that is used by $TCLSH_CMD
#XX##
#XX#tclextension-uninstall:
#XX# $(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --uninstall
#XX#
#XX## List all installed the SQLite TCL extension that is are accessible
#XX## by $TCLSH_CMD, included prior versions.
#XX##
#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:
@@ -1827,6 +1832,7 @@ tidy:
rm -f fuzzershell$(TEXE) fuzzcheck$(TEXE) sqldiff$(TEXE) dbhash$(TEXE)
rm -f threadtest5$(TEXE)
rm -f src-verify has_tclsh*
rm -f tclsqlite3.c
# FIXME? (rm *.def) will remove auto.def (part of autosetup)
#
# Removes build products and test logs. Retains ./configure outputs.

View File

@@ -1,9 +1,9 @@
C Remove\sextra\slayer\sof\squotes\saround\sinstall\starget\sdirs.
D 2024-10-09T08:05:21.230
C More\swork\son\sthe\stcl\sbuild\sparts.
D 2024-10-09T13:20:25.332
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
F Makefile.in 77e637423518a13f901da15cc2faee0b8bf19bf3a5d6e78f9f5e6fd526318047
F Makefile.in 6b2af34fd34078d0e3fa2a96b19c45c676809ffccf35e0045361537a3874e7d7
F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
F Makefile.msc 9c6d80d9d103fa42e931f4c464884a5e577fae8563acc7589bff4e43fbe8f864
F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
@@ -2236,8 +2236,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 f00988a909dd4338083a6e09231932c6fa57a40e35968c51483615121d20d25f
R f1cf57e7d2a38201da3601f8ddb82096
P f2e3cf219e28c369ad6de240f0780eb3b638c47e1bab56ab80713a9bf63e2aa7
R 9655f65151ed80683dca7e9653bd7560
U stephan
Z 7c98480696b78887885abe8d02f332ed
Z 9dbf98f5a4875d0b1d5b97e8ccbcb61d
# Remove this line to create a well-formed Fossil manifest.

View File

@@ -1 +1 @@
f2e3cf219e28c369ad6de240f0780eb3b638c47e1bab56ab80713a9bf63e2aa7
292ad7d519d39f16f130d082d3f134deadd5409d56ffb5340064a1996f4b4d57