Updates to the mktoolzip.tcl to work on win32.

FossilOrigin-Name: 166b775bb523362ffe17722ce175278726303c319fbe7e4a1e9291736db38a5d

diff --git a/Makefile.msc b/Makefile.msc
index d0ca0e76a68050accbacdd02a52cef6d749263b8..4adbbee2a56dea65437f4ad742c2e3428ce81237 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -2467,7 +2467,7 @@ extensiontest:    testfixture.exe testloadext.dll
        @set PATH=$(LIBTCLPATH);$(PATH)
        .\testfixture.exe $(TOP)\test\loadext.test $(TESTOPTS)
 
-tool-zip:      testfixture.exe sqlite3.exe sqldiff.exe sqlite3_analyzer.exe tool\mktoolzip.tcl
+tool-zip:      testfixture.exe sqlite3.exe sqldiff.exe sqlite3_analyzer.exe $(TOP)\tool\mktoolzip.tcl
        .\testfixture.exe $(TOP)\tool\mktoolzip.tcl
 
 coretestprogs: $(TESTPROGS)

diff --git a/manifest b/manifest
index 8ad88c14141f6602da5f9227cb62908c3fac9f07..29386b9844a00403b863727b6a37703276d51e10 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,11 +1,11 @@
-C Add\san\sALWAYS\son\sbranch\sthat\swas\smade\salways-true\sby\sthe\sDISTINCT\sORDER\sBY\nfix.
-D 2023-10-25T15:30:11.779
+C Updates\sto\sthe\smktoolzip.tcl\sto\swork\son\swin32.
+D 2023-10-25T20:08:21.183
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
 F Makefile.in 2ea4105b72561483befe0a18a37f94ca3adbc2324bad3770f99555d95fb9b0ea
 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
-F Makefile.msc 0e088e4fc718668e640aafe148f4d6bf9131d63ba91d85253478a20cd37a4a80
+F Makefile.msc c1aa09e0212d8609df041d13da6ca63198d1c1e29846f33104beecf19917102b
 F README.md 963d30019abf0cc06b263cd2824bce022893f3f93a531758f6f04ff2194a16a8
 F VERSION 4c09b629c03b8ae32317cb336a32f3aa3252841d6dcd51184cecc4278d08f21e
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -2072,7 +2072,7 @@ F tool/mksqlite3c-noext.tcl 4f7cfef5152b0c91920355cbfc1d608a4ad242cb819f1aea07f6
 F tool/mksqlite3c.tcl 2c760ab786cb509b47f00c96fea82994866cb99f5e046df81c768288f57897b4
 F tool/mksqlite3h.tcl d391cff7cad0a372ee1406faee9ccc7dad9cb80a0c95cae0f73d10dd26e06762
 F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
-F tool/mktoolzip.tcl 6e17f53eb924c76ea5f290cf7b8f554cc245ad6299e46928419abcd2de691663
+F tool/mktoolzip.tcl c7a9b685f5131d755e7d941cec50cee7f34178b9e34c9a89811eeb08617f8423
 F tool/mkvsix.tcl b9e0777a213c23156b6542842c238479e496ebf5
 F tool/offsets.c 8ed2b344d33f06e71366a9b93ccedaa38c096cc1dbd4c3c26ad08c6115285845
 F tool/omittest-msvc.tcl d6b8f501ac1d7798c4126065030f89812379012cad98a1735d6d7221492abc08
@@ -2138,8 +2138,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P d2dbbdf7194bab4e5e3b74d3dbffb012a335829824c775c72dd7347c013d2125
-R 69224f49fd227efd4871d1e294714787
-U drh
-Z 09c12c04ae80362f6524540f0fd3a848
+P c29ebcb0be8e969c359c077bd4ce752a9c952d2659062868f12efdd2cc77186d
+R f15a5fdcd63b6841b7a7c9c0886fae2f
+T *branch * win32-mktoolzip
+T *sym-win32-mktoolzip *
+T -sym-trunk *
+U dan
+Z f7ced12f7649f08d9657796243d67be4
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index d996fb461a8f728897e0734232db3325576474e0..3d08a7357f3bbea942cef6a76e17738114fcef87 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c29ebcb0be8e969c359c077bd4ce752a9c952d2659062868f12efdd2cc77186d
\ No newline at end of file
+166b775bb523362ffe17722ce175278726303c319fbe7e4a1e9291736db38a5d
\ No newline at end of file

diff --git a/tool/mktoolzip.tcl b/tool/mktoolzip.tcl
index 0eb678825f9377f6407a6a53bf03ff2fe690280c..885bae960b80a4ea38703019bef46ac00cdf4ea0 100644 (file)
--- a/tool/mktoolzip.tcl
+++ b/tool/mktoolzip.tcl
@@ -48,12 +48,22 @@ switch $tcl_platform(machine) {
     set ARCH unk
   }
 }
-set in [open VERSION]
+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
-puts "zip $name sqlite3$EXE sqldiff$EXE sqlite3_analyzer$EXE"
-puts [exec zip $name sqlite3$EXE sqldiff$EXE sqlite3_analyzer$EXE]
-puts [exec ls -l $name]
+
+if {$OS=="win32"} {
+  # The win32 tar.exe supports the -a ("auto-compress") option. This causes
+  # tar to create an archive type based on the extension of the output file.
+  # In this case, a zip file.
+  puts "tar -a -cf $name sqlite3$EXE sqldiff$EXE sqlite3_analyzer$EXE"
+  puts [exec tar -a -cf $name sqlite3$EXE sqldiff$EXE sqlite3_analyzer$EXE]
+  puts "$name: [file size $name] bytes"
+} else {
+  puts "zip $name sqlite3$EXE sqldiff$EXE sqlite3_analyzer$EXE"
+  puts [exec zip $name sqlite3$EXE sqldiff$EXE sqlite3_analyzer$EXE]
+  puts [exec ls -l $name]
+}