minor fixes, new tests and update to 1.2.1

diff --git a/ChangeLog b/ChangeLog
index c9344fcba0f0fae2b9675a25b86e984e964e3280..de4e75bc4aaf207334fd253771a6b1555a6264fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2003-07-15  Vince Darley <vincentdarley@sourceforge.net>
+
+       * tests/vfsZip.test:
+       * tests/vfsTar.test: added some new tests for recently fixed
+        bugs.
+        * library/tarvfs.tcl: fix to bug when closing an empty archive.
+
+        Also updated package to version 1.2.1 since a variety of bugs
+        have been fixed since the 1.2 release
+       
 2003-07-06  Vince Darley <vincentdarley@sourceforge.net>
 
        * library/ftpvfs.tcl: fix to 'file stat' on a directory, which

diff --git a/DESCRIPTION.txt b/DESCRIPTION.txt
index d6ef0b642cdda56a0ebf23a5f5c7f29b092f2e6b..2041e63db5c299829eeb54376b24dd10811462e3 100644 (file)
--- a/DESCRIPTION.txt
+++ b/DESCRIPTION.txt
@@ -1,5 +1,5 @@
 Identifier: vfs
-Version: 1.2
+Version: 1.2.1
 Title: Interface to Virtual File Systems for Tcl 8.4
 Creator: Vince Darley
 Description: The goal of this extension is to expose Tcl 8.4's new

diff --git a/doc/vfs.n b/doc/vfs.n
index 0706a209140b0b8a391804ad01f6d39b89ecd522..651aa9b14c8b38551608e2fdab121db04774491d 100644 (file)
--- a/doc/vfs.n
+++ b/doc/vfs.n
@@ -3,7 +3,7 @@
 '\" 
 '\" 
 .so man.macros
-.TH vfs n 1.2 Vfs "Tcl-only Virtual File Systems"
+.TH vfs n 1.2.1 Vfs "Tcl-only Virtual File Systems"
 .BS
 '\" Note:  do not modify the .sh NAME line immediately below!
 .SH NAME
@@ -13,7 +13,7 @@
 .sp
 \fBpackage require Tcl 8.4\fR
 .sp
-\fBpackage require vfs ?1.2?\fR
+\fBpackage require vfs ?1.2.1?\fR
 .sp
 \fBvfs::filesystem\fR \fIinfo\fR
 .sp

diff --git a/doc/vfslib.n b/doc/vfslib.n
index d3c9349c309b1b43d2f5abedc3bf43b70d07dfd7..8d68219f2d50b8c061fbccad25a667389d9448e6 100644 (file)
--- a/doc/vfslib.n
+++ b/doc/vfslib.n
@@ -13,7 +13,7 @@
 .sp
 \fBpackage require Tcl 8.4\fR
 .sp
-\fBpackage require vfs ?1.2?\fR
+\fBpackage require vfs ?1.2.1?\fR
 .sp
 \fBpackage require vfs::zip ?1.0?\fR
 .sp

diff --git a/generic/vfs.c b/generic/vfs.c
index 15569353f01c8634b39f434520a0c408d1c834ce..1b3104ad31e38a200b2f5c9c950c4e9eb0ee72ba 100644 (file)
--- a/generic/vfs.c
+++ b/generic/vfs.c
@@ -333,7 +333,7 @@ Vfs_Init(interp)
     if (Tcl_IsSafe(interp)) {
         return TCL_ERROR;
     }
-    if (Tcl_PkgProvide(interp, "vfs", "1.2") == TCL_ERROR) {
+    if (Tcl_PkgProvide(interp, "vfs", "1.2.1") == TCL_ERROR) {
         return TCL_ERROR;
     }
 

diff --git a/library/pkgIndex.tcl b/library/pkgIndex.tcl
index 56e962be677df889ac6466b23c510b94cc43c5fe..3e4023e27ed75f52008bf0cd64468495f882c9e4 100644 (file)
--- a/library/pkgIndex.tcl
+++ b/library/pkgIndex.tcl
@@ -38,7 +38,7 @@ proc loadvfs {dll} {
     load $dll
 }
 
-package ifneeded vfs 1.2 [list loadvfs $dll]
+package ifneeded vfs 1.2.1 [list loadvfs $dll]
 package ifneeded starkit 1.2 [list source [file join $dir starkit.tcl]]
 package ifneeded vfslib 1.3.1 [list source [file join $dir vfslib.tcl]]
 

diff --git a/library/pkgIndex.tcl.in b/library/pkgIndex.tcl.in
index 660c866983da2543216ac4672a2571864f59efdb..137c77c9a61875a6fdfface50b31aed0a99cd9f4 100644 (file)
--- a/library/pkgIndex.tcl.in
+++ b/library/pkgIndex.tcl.in
@@ -25,7 +25,7 @@ proc loadvfs {dll} {
     load $dll
 }
 
-package ifneeded vfs          1.0 [list loadvfs $vfs::dll]
+package ifneeded vfs          1.2.1 [list loadvfs $vfs::dll]
 package ifneeded starkit      1.2 [list source [file join $dir starkit.tcl]]
 package ifneeded vfslib     1.3.1 [list source [file join $dir vfslib.tcl]]
 

diff --git a/library/tarvfs.tcl b/library/tarvfs.tcl
index 9e5ffcfd456c2771eb9dbce8be38a42baa00aef0..04135c959e28485ba97231833decc317d0cfe0b3 100644 (file)
--- a/library/tarvfs.tcl
+++ b/library/tarvfs.tcl
@@ -433,6 +433,6 @@ proc tar::getdir {fd path {pat *}} {
 
 proc tar::_close {fd} {
     variable $fd.toc
-    unset $fd.toc
+    unset -nocomplain $fd.toc
     ::close $fd
 }

diff --git a/make55.tcl b/make55.tcl
index bddf07589cbb21955545118d43c09be7a96c50f7..621e5544b002d68985c408a5f8072077e4cc9598 100644 (file)
--- a/make55.tcl
+++ b/make55.tcl
@@ -66,4 +66,4 @@ close $config
 parray files
 
 
-makepackage vfs1.0
+makepackage vfs1.2.1

diff --git a/tests/vfsTar.test b/tests/vfsTar.test
new file mode 100644 (file)
index 0000000..28a7bdd
Binary files /dev/null and b/tests/vfsTar.test differ

diff --git a/tests/vfsZip.test b/tests/vfsZip.test
index c324d2e770b452b26e05747ffaee2c62d00426c8..b32132338b31555f0a2f8c942343f4e37b86a0ec 100644 (file)
--- a/tests/vfsZip.test
+++ b/tests/vfsZip.test
@@ -17,3 +17,11 @@ if {[lsearch [namespace children] ::tcltest] == -1} {
 
 package require vfs::zip
 
+test vfsZip-1.1 {mount with error} {
+    set f [file join [temporaryDirectory] vfszip.zip]
+    close [open $f w]
+    set res [catch {vfs::zip::Mount $f localmount} err]
+    #lappend res $err
+    lappend res [catch {file delete $f}]
+    set res
+} {1 0}

diff --git a/win/makefile.vc b/win/makefile.vc
index 8b43baecabeb4d12848b2863b130bbbe2f474d3f..d6872fe54f557727a89f701b3d04a265edbd7cab 100644 (file)
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -9,7 +9,7 @@
 #
 MACHINE                = IX86
 
-VFS_VERSION = 1.2
+VFS_VERSION = 1.2.1
 DLL_VERSION = 12
 
 # comment the following line to compile with symbols