Minor cleanups and fixes in the autoconf/tea pieces.

FossilOrigin-Name: 4d6536bd0ad333854309e825feaca26fdd13ac4458c7ccfbe77fc76cc5a968bc

diff --git a/autoconf/tea/Makefile.in b/autoconf/tea/Makefile.in
index cb16c544734b798083d410803a3d7a06ae270249..eae30567e902ed2b6b687ffb3b3cf72436efcfc6 100644 (file)
--- a/autoconf/tea/Makefile.in
+++ b/autoconf/tea/Makefile.in
@@ -205,13 +205,13 @@ tclsh: $(teaish.makefile) config.log
 # simply loads the DLL and success if it can.
 #
 #
-tx.tester.args = $(tx.dll) $(tx.loadPrefix) @TEAISH_TESTER_TCL@
+tx.tester.args = $(tx.dll) $(tx.loadPrefix) @TEAISH_MODULE_TEST_TCL@
 .PHONY: test-pre test-core test test-post test-extension
 test-extension: # this name is reserved for use by teaish.make
 test-prepre: $(tx.dll)
 test-pre: test-prepre
 test-core: test-pre
-       $(TCLSH) teaish.tester.tcl $(tx.tester.args)
+       $(TCLSH) @TEAISH_TESTER_TCL@ $(tx.tester.args)
 test-post: test-core
 test: test-post
 
@@ -286,12 +286,7 @@ $(tx.makefile): config.log
 #
 # Package archive generation ("dist") rules...
 #
-@if THEAISH_OUT_OF_EXT_TREE
-dist:
-       @echo "'dist' can only be used from an extension's home dir" 1>&2; \
-       echo "In this case: @TEAISH_DIR@" 1>&2; exit 1
-undist:
-@else
+@if TEAISH_ENABLE_DIST
 @if BIN_ZIP
 # Temp dir for dist.zip. Must be different than dist.tgz or else
 # parallel builds may hose the dist.
@@ -350,7 +345,14 @@ undist-tgz:
        rm -f $(dist.tgz)
 undist: undist-tgz
 @endif #BIN_TAR
-@endif #THEAISH_OUT_OF_EXT_TREE
+@else
+undist:
+dist:
+@if TEAISH_OUT_OF_EXT_TREE
+       @echo "'dist' can only be used from an extension's home dir" 1>&2; \
+       echo "In this case: @TEAISH_DIR@" 1>&2; exit 1
+@endif
+@endif #TEAISH_ENABLE_DIST
 
 @if TEAISH_MAKEFILE
 #

diff --git a/autoconf/tea/autosetup/core.tcl b/autoconf/tea/autosetup/core.tcl
index e46d49503b87a612b62efa1b87f56efd326bedd6..5cdfd6a14b6301dbeac22b310615afd0f6b72ab4 100644 (file)
--- a/autoconf/tea/autosetup/core.tcl
+++ b/autoconf/tea/autosetup/core.tcl
@@ -265,7 +265,8 @@ proc teaish__configure-phase1 {} {
 
   #define AS_LIBDIR $::autosetup(libdir)
   define TEAISH_LIBDIR $::autosetup(libdir)/teaish
-  define TEAISH_TESTER_TCL [get-define TEAISH_LIBDIR]/tester.tcl
+  define TEAISH_MODULE_TEST_TCL $::autosetup(libdir)/teaish/tester.tcl
+  define TEAISH_TESTER_TCL $::autosetup(builddir)/teaish.tester.tcl
   teaish__configure-finalize
 }
 
@@ -297,6 +298,10 @@ proc teaish__configure-finalize {} {
     define $f [join [get-define $f]]
   }
 
+  if {[get-define TEAISH_OUT_OF_EXT_TREE]} {
+    define TEAISH_ENABLE_DIST 0
+  }
+
   define TEAISH_AUTOSETUP_DIR $::autosetup(libdir)
   proj-setup-autoreconfig TEAISH_AUTORECONFIG
   proj-dot-ins-append $::autosetup(srcdir)/Makefile.in
@@ -622,7 +627,7 @@ proc teaish__find-extension {} {
   set ::argv $largv
   set dbld $::autosetup(builddir)
   set dsrc $::autosetup(srcdir)
-  set dext [get-define TEAISH_DIR $::autosetup(builddir)]
+  set dext [get-define TEAISH_DIR $dbld]
 
   #
   # teaish.tcl is a TCL script which implements various
@@ -631,7 +636,10 @@ proc teaish__find-extension {} {
   # We use the first one we find in the builddir or srcdir.
   #
   if {"" eq $extT} {
-    set flist [list $dext/teaish.tcl $dsrc/teaish.tcl]
+    set flist [list $dext/teaish.tcl]
+    if {[lindex $flist 0] ne "$dsrc/teaish.tcl"} {
+      lappend flist $dsrc/teaish.tcl
+    }
     if {![proj-first-file-found $flist extT]} {
       if {"--help" in $::argv} {
         return 0
@@ -663,7 +671,10 @@ use --teaish-extension-dir=/path/to/extension"
   # the builddir or the srcdir.
   #
   if {"" eq $extM} {
-    set flist [list $dext/teaish.make.in $dsrc/teaish.make.in]
+    set flist [list $dext/teaish.make.in]
+    if {[lindex $flist 0] ne "$dsrc/teaish.make.in"} {
+      lappend flist $dsrc/teaish.make.in
+    }
     proj-first-file-found $flist extM
   }
   if {"" ne $extM && [file readable $extM]} {
@@ -677,10 +688,14 @@ use --teaish-extension-dir=/path/to/extension"
     #proj-warn "Did not find an teaish.make.in."
   }
 
-  set extI $dext/teaish.pkginit.tcl
-  if {[file exists $extI]} {
-    define TEAISH_PKGINIT_TCL $extI
+  set flist [list $dext/teaish.pkginit.tcl]
+  if {[lindex $flist 0] ne "$dsrc/teaish.pkginit.in"} {
+    lappend flist $dsrc/teaish.pkginit.in
+  }
+  if {[proj-first-file-found $flist extI]} {
     msg-result "Extension post-load init = $extI"
+    define TEAISH_PKGINIT_TCL $extI
+    define TEAISH_PKGINIT_TCL_TAIL [file tail $extI]; # for use in pkgIndex.tcl
     #teaish-add-install $extI
   }
 
@@ -692,9 +707,9 @@ use --teaish-extension-dir=/path/to/extension"
   define TEAISH_LIBDIR_NAME [get-define TEAISH_PKGNAME]
   define TEAISH_VERSION 0.0.0
 
-  # THEAISH_OUT_OF_EXT_TREE = 1 if we're building from a dir other
+  # TEAISH_OUT_OF_EXT_TREE = 1 if we're building from a dir other
   # than the extension's home dir.
-  define THEAISH_OUT_OF_EXT_TREE \
+  define TEAISH_OUT_OF_EXT_TREE \
     [expr {[file-normalize $::autosetup(builddir)] ne [file-normalize [get-define TEAISH_DIR]]}]
 
   #
@@ -704,9 +719,11 @@ use --teaish-extension-dir=/path/to/extension"
   foreach {optionalDef dflt} [subst {
     TEAISH_LOAD_PREFIX "[string totitle [get-define TEAISH_PKGNAME]]"
     TEAISH_MAKEFILE_CODE ""
+    TEAISH_ENABLE_DIST 1
   }] {
     define $optionalDef $dflt
   }
+
   return 1
 }
 
@@ -944,6 +961,18 @@ proc teaish-combine-option-lists {args} {
   return $rv
 }
 
+# @teaish-enable-dist ?yes?
+#
+# Explicitly enables or disables the "dist" rules in the default
+# Makefile.in. This is equivalent to defining TEAISH_ENABLE_DIST
+# to $yes (which must be 0 or 1).
+#
+# By default, dist creation is enabled.
+#
+proc teaish-enable-dist {{yes 1}} {
+  define TEAISH_ENABLE_DIST $yes
+}
+
 #
 # Handles --teaish-create-extension=TARGET-DIR
 #

diff --git a/autoconf/tea/pkgIndex.tcl.in b/autoconf/tea/pkgIndex.tcl.in
index 7d6af1b8dd4ed69bd3f0e411485d2ea64f0e96a6..fe07e10016f82b9aaa6b7ab0f961e9cc2b952793 100644 (file)
--- a/autoconf/tea/pkgIndex.tcl.in
+++ b/autoconf/tea/pkgIndex.tcl.in
@@ -5,11 +5,11 @@
 if {[package vsatisfies [package provide Tcl] 9.0-]} {
   package ifneeded @TEAISH_PKGNAME@ @TEAISH_VERSION@ [list apply {{dir} {
     load [file join $dir @TEAISH_DLL9@] @TEAISH_LOAD_PREFIX@
-@if TEAISH_PKGINIT_TCL
-    set initScript [file join $dir @TEAISH_PKGINIT_TCL@]
-#    if {[file exists $initScript]} {
+@if TEAISH_PKGINIT_TCL_TAIL
+    set initScript [file join $dir [file tail @TEAISH_PKGINIT_TCL_TAIL@]]
+    if {[file exists $initScript]} {
       source -encoding utf-8 $initScript
-#    }
+    }
 @endif
   }} $dir]
 } else {
@@ -20,11 +20,11 @@ if {[package vsatisfies [package provide Tcl] 9.0-]} {
     } else {
       load {} @TEAISH_LOAD_PREFIX@
     }
-@if TEAISH_PKGINIT_TCL
-    set initScript [file join $dir @TEAISH_PKGINIT_TCL@]
-#    if {[file exists $initScript]} {
+@if TEAISH_PKGINIT_TCL_TAIL
+    set initScript [file join $dir [file tail @TEAISH_PKGINIT_TCL_TAIL@]]
+    if {[file exists $initScript]} {
       source -encoding utf-8 $initScript
-#    }
+    }
 @endif
   }} $dir]
 }

diff --git a/autoconf/tea/teaish.tcl b/autoconf/tea/teaish.tcl
index 56aeb9362a930feb85c1f45ffec0dc739825310b..e677ab95732a615351d98888c309f436a1b13aa1 100644 (file)
--- a/autoconf/tea/teaish.tcl
+++ b/autoconf/tea/teaish.tcl
@@ -112,6 +112,7 @@ proc teaish-configure {} {
     LDFLAGS_LIBRT
 
   teaish-add-cflags -define CFLAGS_LIBICU OPT_FEATURE_FLAGS
+  teaish-enable-dist 0
 
 }; # teaish-configure
 

diff --git a/manifest b/manifest
index 0bb1038ed2c62dcd8320cfc797521ee0d6109da7..125350b96b2edc70f1f38ee0073bf8dcd7dfe521 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Latest\supstream\steaish,\swhich\srestructures\sthe\steaish\sfiles\sa\sbit.
-D 2025-04-13T16:22:58.217
+C Minor\scleanups\sand\sfixes\sin\sthe\sautoconf/tea\spieces.
+D 2025-04-14T10:18:40.707
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -22,18 +22,18 @@ F autoconf/Makefile.msc 5bc67d3912444c40c6f96d003e5c90663e51abb83d204a520110b1b2
 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136
 F autoconf/README.txt b749816b8452b3af994dc6d607394bef3df1736d7e09359f1087de8439a52807
 F autoconf/auto.def 3d994f3a9cc9b712dbce92a5708570ddcf3b988141b6eb738f2ed16127a9f0ac
-F autoconf/tea/Makefile.in 9ca3a7ccbeda98aaf4d48582905f00b7c3b30c0c2843383dc4424d1e57969c44
+F autoconf/tea/Makefile.in 2a90dfab1e95cb3ec610429c78d88d4a7d26beb080ad45ff6a05928b901e8309
 F autoconf/tea/README.txt 656d4686c509d375f5988ff3deda94f65fe6cd8358cd55d1f1dcc7b6e2ff73aa
 F autoconf/tea/auto.def 81e2617cfb90d53c19b53b3ec632cd2893bf32f2e5dd272b1116fadf2ea86c2d
 F autoconf/tea/autosetup/README.txt b40071e6f8506500a2f7f71d5fc69e0bf87b9d7678dd9da1e5b4d0acbf40b1ca
-F autoconf/tea/autosetup/core.tcl a3b4e4521aec05ed53ce382b6fa16a49cba3636e211909d97872263b97919258 w autoconf/tea/autosetup/teaish-core.tcl
-F autoconf/tea/autosetup/feature-tests.tcl 0e2893c787edb26d2d4302ea5178d4c0a6878f396905bf8fa485afb7a6fad5f0 w autoconf/tea/autosetup/teaish-feature-tests.tcl
-F autoconf/tea/autosetup/tester.tcl 91beb9e26916cdb54400446e2890105cdea4186789141d5748c72b2f73b26ed0 w autoconf/tea/autosetup/teaish-tester.tcl
+F autoconf/tea/autosetup/core.tcl 85d6d484f75d9d2fa02517c20650cc7af50fe216f7848ebd6d0c59782f99ef01
+F autoconf/tea/autosetup/feature-tests.tcl 0e2893c787edb26d2d4302ea5178d4c0a6878f396905bf8fa485afb7a6fad5f0
+F autoconf/tea/autosetup/tester.tcl 91beb9e26916cdb54400446e2890105cdea4186789141d5748c72b2f73b26ed0
 F autoconf/tea/configure d0b12b984edca6030d1976375b80157ac78b5b90a5b4f0dcee39357f63f4a80b x
 F autoconf/tea/doc/sqlite3.n 9a97f4f717ceab73004ea412af7960625c1cb24b5c25e4ae4c8b5d8fa4300f4e
 F autoconf/tea/license.terms 13bd403c9610fd2b76ece0ab50c4c5eda933d523
-F autoconf/tea/pkgIndex.tcl.in ea13b90006ef3f1205f46fbd382736fe2f364caa644cc8e958c83a78ac7fa1d1
-F autoconf/tea/teaish.tcl f629718e52538031162dd8d74ce014a3d7d9c9f5428f59d4978da08549bdf09b
+F autoconf/tea/pkgIndex.tcl.in 2c99a64a0eff5dc2ad8e9657bb564fae2dbdfdb6b77a4c49b4387bd5a25c42ef
+F autoconf/tea/teaish.tcl 31efdeaadd4629dd883b7cfb52e18365a6c91bfb91f8b127570876032e920d1c
 F autoconf/tea/teaish.test.tcl cfe94e1fb79dd078f650295be59843d470125e0cc3a17a1414c1fb8d77f4aea6
 F autoconf/tea/teaish.tester.tcl.in 743fd0fe1e667f82fd8fc3ebe0a5c77763e4dbed7bbc8605a9d4b1d0663dac78
 F autosetup/LICENSE 41a26aebdd2cd185d1e2b210f71b7ce234496979f6b35aef2cbf6b80cbed4ce4
@@ -2216,8 +2216,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 0fe77341a0f1e869a909623cdd07b03355b90d302b4f8a875e520befab88ce35
-R 811a32afcc86e700c429419fd06d1b5a
+P 4f54f7d07d31938f271bc5d04a40cb1f7b5e6ea48e78ad06b7cc65483533f54e
+R 01a906f212b7ee1ccd4bda790fce8e28
 U stephan
-Z 6864eb9a6caa1acee33b5cc98d2d48ee
+Z 80aac49167f19af66627472602a3ae1a
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index f52cfd45375de04143272932232330d47db91a79..efe88d3b0fe2b1c99745ad6d80ef9e72f1176c8a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4f54f7d07d31938f271bc5d04a40cb1f7b5e6ea48e78ad06b7cc65483533f54e
+4d6536bd0ad333854309e825feaca26fdd13ac4458c7ccfbe77fc76cc5a968bc