From ee0eca0b1c59cf2a163c2aa0340fc35ef071244e Mon Sep 17 00:00:00 2001 From: Andreas Kupries Date: Tue, 15 Apr 2008 21:11:52 +0000 Subject: [PATCH] * library/pkgIndex.tcl: Moved the backward compatibility package * library/mkvfs.tcl: names (mk4vfs, zipvfs) into separate files, * library/zipvfs.tcl: as true packages. They properly load the new * library/mk4vfscompat.tcl: packages. The mess with one file * library/zipvfscompat.tcl: annoncing itself as two packages has been removed. Patchlevels bumped (1.10.1, 1.0.1 respectively), considering it as bug fix. --- ChangeLog | 10 ++++++++++ library/mk4vfs.tcl | 5 +++-- library/mk4vfscompat.tcl | 6 ++++++ library/pkgIndex.tcl | 10 ++++++---- library/zipvfs.tcl | 6 +++--- library/zipvfscompat.tcl | 6 ++++++ 6 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 library/mk4vfscompat.tcl create mode 100644 library/zipvfscompat.tcl diff --git a/ChangeLog b/ChangeLog index e02c649..3026c49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-04-15 Andreas Kupries + + * library/pkgIndex.tcl: Moved the backward compatibility package + * library/mkvfs.tcl: names (mk4vfs, zipvfs) into separate files, + * library/zipvfs.tcl: as true packages. They properly load the new + * library/mk4vfscompat.tcl: packages. The mess with one file + * library/zipvfscompat.tcl: annoncing itself as two packages has + been removed. Patchlevels bumped (1.10.1, 1.0.1 respectively), + considering it as bug fix. + 2008-04-11 Andreas Kupries * library/pkgIndex.tcl: Bumped version of starkit to 1.3.2. We diff --git a/library/mk4vfs.tcl b/library/mk4vfs.tcl index be44862..aa59bff 100644 --- a/library/mk4vfs.tcl +++ b/library/mk4vfs.tcl @@ -16,8 +16,9 @@ # 17mar03 jcw 1.9 start with mode translucent or readwrite # 18oct05 jcw 1.10 add fallback to MK Compatible Lite driver (vfs::mkcl) -package provide mk4vfs 1.10 -package provide vfs::mk4 1.10 +# Removed provision of the backward compatible name. Moved to separate +# file/package. +package provide vfs::mk4 1.10.1 package require vfs # need this so init failure in interactive mode does not mess up errorInfo diff --git a/library/mk4vfscompat.tcl b/library/mk4vfscompat.tcl new file mode 100644 index 0000000..8d3be3c --- /dev/null +++ b/library/mk4vfscompat.tcl @@ -0,0 +1,6 @@ +# Compatibility package to keep the ability to use vfs::mk4 via +# mk4vfs. Keep the version number in sync with version of vfs::mk4, +# and pkgIndex.tcl, of course. There is no other functionality, only +# the redirection. +package require vfs::mk4 1.10.1 +package provide mk4vfs 1.10.1 diff --git a/library/pkgIndex.tcl b/library/pkgIndex.tcl index aa8c872..825ba18 100644 --- a/library/pkgIndex.tcl +++ b/library/pkgIndex.tcl @@ -49,20 +49,22 @@ package ifneeded starkit 1.3.2 [list source [file join $dir starkit.tcl]] package ifneeded vfslib 1.3.1 [list source [file join $dir vfslib.tcl]] # Old -package ifneeded mk4vfs 1.10 [list source [file join $dir mk4vfs.tcl]] -package ifneeded zipvfs 1.0 [list source [file join $dir zipvfs.tcl]] +package ifneeded mk4vfs 1.10.1 [list source [file join $dir mk4vfscompat.tcl]] +package ifneeded zipvfs 1.0.1 [list source [file join $dir zipvfscompat.tcl]] + +# New, for the old, keep version numbers synchronized. +package ifneeded vfs::mk4 1.10.1 [list source [file join $dir mk4vfs.tcl]] +package ifneeded vfs::zip 1.0.1 [list source [file join $dir zipvfs.tcl]] # New package ifneeded vfs::ftp 1.0 [list source [file join $dir ftpvfs.tcl]] package ifneeded vfs::http 0.6 [list source [file join $dir httpvfs.tcl]] -package ifneeded vfs::mk4 1.10 [list source [file join $dir mk4vfs.tcl]] package ifneeded vfs::mkcl 1.4 [list source [file join $dir mkclvfs.tcl]] package ifneeded vfs::ns 0.5 [list source [file join $dir tclprocvfs.tcl]] package ifneeded vfs::tar 0.9 [list source [file join $dir tarvfs.tcl]] package ifneeded vfs::test 1.0 [list source [file join $dir testvfs.tcl]] package ifneeded vfs::urltype 1.0 [list source [file join $dir vfsUrl.tcl]] package ifneeded vfs::webdav 0.1 [list source [file join $dir webdavvfs.tcl]] -package ifneeded vfs::zip 1.0 [list source [file join $dir zipvfs.tcl]] package ifneeded vfs::tk 0.5 [list source [file join $dir tkvfs.tcl]] diff --git a/library/zipvfs.tcl b/library/zipvfs.tcl index d86d619..e3458c1 100644 --- a/library/zipvfs.tcl +++ b/library/zipvfs.tcl @@ -1,8 +1,8 @@ - -package provide vfs::zip 1.0 +# Removed provision of the backward compatible name. Moved to separate +# file/package. +package provide vfs::zip 1.0.1 package require vfs -package provide zipvfs 1.0 # Using the vfs, memchan and Trf extensions, we ought to be able # to write a Tcl-only zip virtual filesystem. What we have below diff --git a/library/zipvfscompat.tcl b/library/zipvfscompat.tcl new file mode 100644 index 0000000..012c49b --- /dev/null +++ b/library/zipvfscompat.tcl @@ -0,0 +1,6 @@ +# Compatibility package to keep the ability to use vfs::zip via +# zipvfs. Keep the version number in sync with version of vfs::zip, +# and pkgIndex.tcl, of course. There is no other functionality, only +# the redirection. +package require vfs::zip 1.0.1 +package provide zipvfs 1.0.1 -- 2.23.0