Handle DESTDIR at an earlier phase in buildtclext.tcl to account for the is-writable...

FossilOrigin-Name: 2f6e5946cf34e0948e177aa12a4a768fcd6dc413909a97566e0abff51230c87c

diff --git a/manifest b/manifest
index 69c0f142496f9dd55773f1ed4501a79e78c2d4cf..3e90e348267c5561fd5e72aedbd4d3b78a755151 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sDESTDIR\ssupport\sto\sthe\stclextension-install\starget,\svia\s[67a3ca0c013b]\sand\s[d1663cf05f7d].
-D 2024-11-16T14:33:01.118
+C Handle\sDESTDIR\sat\san\searlier\sphase\sin\sbuildtclext.tcl\sto\saccount\sfor\sthe\sis-writable-dir\scheck\sand\sto\sfilter\sout\s//zipfs:\sdirs\sas\s(im)possible\sinstallation\stargets.
+D 2024-11-16T17:12:17.894
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -2110,7 +2110,7 @@ F tool/GetTclKit.bat d84033c6a93dfe735d247f48ba00292a1cc284dcf69963e5e672444e045
 F tool/Replace.cs 02c67258801c2fb5f63231e0ac0f220b4b36ba91
 F tool/build-all-msvc.bat c817b716e0edeecaf265a6775b63e5f45c34a6544f1d4114a222701ed5ac79ab x
 F tool/build-shell.sh 369c4b171cc877ad974fef691e4da782b4c1e99fe8f4361316c735f64d49280f
-F tool/buildtclext.tcl fd82a984df88bc7b169b76ff1f2aaae5509c30e312b0799a7d8c97bc19825788
+F tool/buildtclext.tcl 2b0d03bdb303bd3aeadc9fd8f785a11c8f8f863bf1e5aabe1441b60caef14ff4
 F tool/cg_anno.tcl c1f875f5a4c9caca3d59937b16aff716f8b1883935f1b4c9ae23124705bc8099 x
 F tool/checkSpacing.c 810e51703529a204fc4e1eb060e9ab663e3c06d2
 F tool/cktclsh.sh 6075eef9c6b9ba4b38fef2ca2a66d25f2311bd3c610498d18a9b01f861629cca
@@ -2220,9 +2220,9 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 17bc57fa16096177684ee7246d2996219eeb7178c7687af808b5f56d8decd5fa
-Q +67a3ca0c013b6a9da3b2c50ffc86b96b14454d1e45fa90d3b0a238488a783e79
-R 6f8c6e03eb522ac16a81588a4d545346
+P 38136b33f9536b63520d3810f397a3b4b5372028b31108806f84fe44bf338425
+Q +d2e8c161a14fbbcc52c50dfd9274c9969e3c273e2cb7cbf2f865541af9f39ead
+R ed752121f17fd47c6910e911691642a7
 U stephan
-Z c2350f360586b2c5573da51acff873d4
+Z f48a12bc3f78d3fb11f8f898794a2476
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index b2eedb4061d0bf4de4d080af407bf2d75e9435e7..64b1f9b7020d7ba45b651513054cc1924336910c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-38136b33f9536b63520d3810f397a3b4b5372028b31108806f84fe44bf338425
+2f6e5946cf34e0948e177aa12a4a768fcd6dc413909a97566e0abff51230c87c

diff --git a/tool/buildtclext.tcl b/tool/buildtclext.tcl
index ba3731e2ee0e787f142f4dbed07c05b327b6c376..1908c2dcb5aef9b39761118b8e25b426b41ee428 100644 (file)
--- a/tool/buildtclext.tcl
+++ b/tool/buildtclext.tcl
@@ -198,7 +198,15 @@ if {$install} {
   #
   set DEST {}
   foreach dir $auto_path {
-    if {[file writable $dir]} {
+    if {[string match //*:* $dir]} {
+      # We can't install to //zipfs: paths
+      continue
+    } elseif {"" ne $DESTDIR && ![file writable $DESTDIR]} {
+      continue
+    }
+    set dir ${DESTDIR}$dir
+    if {[file writable $dir] || "" ne $DESTDIR} {
+      # the dir will be created later ^^^^^^^^
       set DEST $dir
       break
     } elseif {[glob -nocomplain $dir/sqlite3*/pkgIndex.tcl]!=""} {
@@ -216,7 +224,7 @@ if {$install} {
     puts "to work around this problem.\n"
     puts "These are the (unwritable) \$auto_path directories:\n"
     foreach dir $auto_path {
-      puts "  *  $dir"
+      puts "  *  ${DESTDIR}$dir"
     }
     exit 1
   }
@@ -250,7 +258,7 @@ package ifneeded sqlite3 $VERSION \\
 
 if {$install} {
   # Install the extension
-  set DEST2 ${DESTDIR}$DEST/sqlite$VERSION
+  set DEST2 $DEST/sqlite$VERSION
   file mkdir $DEST2
   puts "installing $DEST2/pkgIndex.tcl"
   file copy -force pkgIndex.tcl $DEST2