From 97e6368abcaff3d202954cc8d493646a388f52d5 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 14 Jul 2025 18:27:32 +0000
Subject: [PATCH] Add the snapshot-zip makefile targets for both Windows and
 Posix.

FossilOrigin-Name: 8c73c0c5935431556f687556bfdb459754609f07c6366c810a55bf7583ee303d
---
 Makefile.msc       |  3 +++
 main.mk            |  4 ++++
 manifest           | 16 ++++++++--------
 manifest.uuid      |  2 +-
 tool/mktoolzip.tcl | 37 ++++++++++++++++++++++++++++++++-----
 5 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/Makefile.msc b/Makefile.msc
index 85b0456309..e67638287f 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -2599,6 +2599,9 @@ extensiontest:	testfixture.exe testloadext.dll
 tool-zip:	testfixture.exe sqlite3.exe sqldiff.exe sqlite3_analyzer.exe sqlite3_rsync.exe sqlite3.dll $(TOP)\tool\mktoolzip.tcl
 	.\testfixture.exe $(TOP)\tool\mktoolzip.tcl
 
+snapshot-zip:	testfixture.exe sqlite3.exe sqldiff.exe sqlite3_analyzer.exe sqlite3_rsync.exe sqlite3.dll $(TOP)\tool\mktoolzip.tcl
+	.\testfixture.exe $(TOP)\tool\mktoolzip.tcl --snapshot
+
 coretestprogs:	testfixture.exe sqlite3.exe
 
 testprogs:	$(TESTPROGS) srcck1.exe fuzzcheck.exe sessionfuzz.exe
diff --git a/main.mk b/main.mk
index 34c1cc3cf2..40d059ad42 100644
--- a/main.mk
+++ b/main.mk
@@ -2113,6 +2113,10 @@ tool-zip:	testfixture$(T.exe) sqlite3$(T.exe) sqldiff$(T.exe) \
             sqlite3_analyzer$(T.exe) sqlite3_rsync$(T.exe) $(TOP)/tool/mktoolzip.tcl
 	strip sqlite3$(T.exe) sqldiff$(T.exe) sqlite3_analyzer$(T.exe) sqlite3_rsync$(T.exe)
 	./testfixture$(T.exe) $(TOP)/tool/mktoolzip.tcl
+snapshot-zip:	testfixture$(T.exe) sqlite3$(T.exe) sqldiff$(T.exe) \
+            sqlite3_analyzer$(T.exe) sqlite3_rsync$(T.exe) $(TOP)/tool/mktoolzip.tcl
+	strip sqlite3$(T.exe) sqldiff$(T.exe) sqlite3_analyzer$(T.exe) sqlite3_rsync$(T.exe)
+	./testfixture$(T.exe) $(TOP)/tool/mktoolzip.tcl --snapshot
 clean-tool-zip:
 	rm -f sqlite-tools-*.zip
 clean: clean-tool-zip
diff --git a/manifest b/manifest
index 4d685ee4f3..df55310f69 100644
--- a/manifest
+++ b/manifest
@@ -1,12 +1,12 @@
-C Enhance\sthe\s"mktoolzip.tcl"\sscript\s(used\sby\sthe\s"tool-zip"\smakefile\starget)\sso\sthat\nit\suses\s"fossil\stest-filezip"\sto\sbuild\sthe\sZIP\sarchive\sif\savailable,\sand\sso\sthat\nit\salso\sgenerates\swindows-dll-*.zip\son\sWindows\splatforms.
-D 2025-07-14T16:05:59.333
+C Add\sthe\ssnapshot-zip\smakefile\stargets\sfor\sboth\sWindows\sand\sPosix.
+D 2025-07-14T18:27:32.150
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
 F Makefile.in a6c14b6906f5322920dd5d1ff9a84808337911068f2a6e777ec7088a87cbc3a8
 F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0
-F Makefile.msc 495e61b4940984b3e25f654c1625115352d6f10af088a4a8d4d360e1c88c5898
+F Makefile.msc e17608035fb75d3e5b322f846c6c3cbe80a5f34abf5df9e400c40dd55436dc14
 F README.md e28077cfbef795e99c9c75ed95aa7257a1166709b562076441a8506ac421b7c1
 F VERSION 16eddb43056a79c1977427ab7a05f3457c373fa159dcdced8754eb89ce7e06b8
 F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5
@@ -710,7 +710,7 @@ F ext/wasm/tests/opfs/sahpool/sahpool-pausing.js f264925cfc82155de38cecb3d204c36
 F ext/wasm/tests/opfs/sahpool/sahpool-worker.js bd25a43fc2ab2d1bafd8f2854ad3943ef673f7c3be03e95ecf1612ff6e8e2a61
 F ext/wasm/wasmfs.make 68999f5bd8c489239592d59a420f8c627c99169bbd6fa16a404751f757b9f702
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
-F main.mk 3ced12d068b22957f4e82a0b94a2c1d83b37dcf39c087263691267f7bfb39a84
+F main.mk a5d698cf8d38e4eb42a89f08a9521906b24f4acac61bbafa56d72cd9b39617b6
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@ -2173,7 +2173,7 @@ F tool/mksqlite3c.tcl f11b63445c4840509248bd4aa151a81aea25d5415fef71943c8d436eba
 F tool/mksqlite3h.tcl 989948c6a26e188e673d7c2f2f093ea3acd816ad6ac65bab596280075c8f3a45
 F tool/mksqlite3internalh.tcl 46ef6ed6ccd3c36e23051109dd25085d8edef3887635cea25afa81c4adf4d4db
 F tool/mksrczip.tcl 81efd9974dbb36005383f2cd655520057a2ae5aa85ac2441a80c7c28f803ac52
-F tool/mktoolzip.tcl 0beb5f0e58401ab85f71cc57e8de73a248ad481c0b1fbe5e577b440ee326f004
+F tool/mktoolzip.tcl c9f388b2b0751982aef29a0c1d80f7959dbe38065ebb4421c39844e92622b086
 F tool/mkvsix.tcl 67b40996a50f985a573278eea32fc5a5eb6110bdf14d33f1d8086e48c69e540a
 F tool/offsets.c 8ed2b344d33f06e71366a9b93ccedaa38c096cc1dbd4c3c26ad08c6115285845
 F tool/omittest-msvc.tcl d6b8f501ac1d7798c4126065030f89812379012cad98a1735d6d7221492abc08
@@ -2213,8 +2213,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 3c0afda372cd688e9aff7be1c0a41f557c8c8819f5f47420166ce8255cd806c8
-R e290ca399c8e663ed9c1c500434c64ea
+P 63ddc215eb6106985c53d3c8d99f5445a92acf4359a6bb2681882c49583df871
+R d564e67ede86bc5b3c0bb80782639393
 U drh
-Z 55552671916a227c18ab9a99dcc87aef
+Z be924e4628c0fead0c508f3649455f46
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index b83975833f..37f76ee003 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-63ddc215eb6106985c53d3c8d99f5445a92acf4359a6bb2681882c49583df871
+8c73c0c5935431556f687556bfdb459754609f07c6366c810a55bf7583ee303d
diff --git a/tool/mktoolzip.tcl b/tool/mktoolzip.tcl
index 130f6677bd..041bf28cdd 100644
--- a/tool/mktoolzip.tcl
+++ b/tool/mktoolzip.tcl
@@ -12,6 +12,24 @@
 #     sqlite3_analyzer        -- Space analyzer
 #     sqlite3_rsync           -- Remote db sync
 #
+# On Windows, add:
+#
+#     sqlite3.def
+#     sqlite3.dll
+#
+# Add the --snapshot option to generate a snapshot ZIP archive instead of
+# a release ZIP archive.
+#
+set bSnapshot 0
+for {set i 0} {$i<[llength $argv]} {incr i} {
+  set a [lindex $argv $i]
+  if {$a eq "-snapshot" || $a eq "--snapshot"} {
+    set bSnapshot 1
+    continue
+  }
+  puts stderr "unknown argument: $a"
+  exit 1
+} 
 switch $tcl_platform(os) {
   {Windows NT} {
     set OS win
@@ -49,11 +67,20 @@ switch $tcl_platform(machine) {
     set ARCH unk
   }
 }
-set in [open [file join [file dirname [file dirname [info script]]] VERSION]]
-set vers [read $in]
-close $in
-scan $vers %d.%d.%d v1 v2 v3
-set v2 [format 3%02d%02d00 $v2 $v3]
+if {$bSnapshot} {
+  set in [open [file join [file dirname [file dirname [info script]]] manifest]]
+  set manifest [read $in]
+  close $in
+  regexp {\nD (.{16})} $manifest all date
+  regsub -all {[-:T]} $date {} v2
+} else {
+  set in [open [file join [file dirname [file dirname [info script]]] VERSION]]
+  set vers [read $in]
+  close $in
+  scan $vers %d.%d.%d v1 v2 v3
+  set v2 [format 3%02d%02d00 $v2 $v3]
+}
+
 set name sqlite-tools-$OS-$ARCH-$v2.zip
 set filelist "sqlite3$EXE sqldiff$EXE sqlite3_analyzer$EXE sqlite3_rsync$EXE"
 proc make_zip_archive {name filelist} {
-- 
2.47.2