cleaned up tests, upped version to 1.2

diff --git a/ChangeLog b/ChangeLog
index c98d65d95bb648be26165e4a5b5cdc4defaa06ed..096b565654c0ca501972da754e7b5c6429bb7d1a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-01-28  Vince Darley <vincentdarley@sourceforge.net>
+
+       * tests/*.test: cleanup
+       
+       Also updated version of the package to 1.2 (not 1.1 since there's
+       a Windows binary floating around with that number, and we want to
+       avoid confusion).  It's been fixed at 1.0 for far too long.
+       
 2003-02-01  Jean-Claude Wippler  <jcw@equi4.com>
 
        * library/mk4vfs.tcl:  fixed bad mk4vfs::_umount change

diff --git a/DESCRIPTION.txt b/DESCRIPTION.txt
index e2010af1882568001967b9ac15d2a2d984c1cd5a..d6ef0b642cdda56a0ebf23a5f5c7f29b092f2e6b 100644 (file)
--- a/DESCRIPTION.txt
+++ b/DESCRIPTION.txt
@@ -1,5 +1,5 @@
 Identifier: vfs
-Version: 1.0
+Version: 1.2
 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/Makefile.in b/Makefile.in
index af28b99b2eaaf47f7659b225be7b7ec411ccb996..34b85db7657866a24b8b84a0d6d054cdf99db748 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,9 +35,9 @@ vfs_LIB_FILE  = @vfs_LIB_FILE@
 #========================================================================
 
 RUNTIME_SOURCES        = ftpvfs.tcl httpvfs.tcl mk4vfs.tcl starkit.tcl \
-                 tarvfs.tcl tclIndex tclprocvfs.tcl testvfs.tcl \
+                 tarvfs.tcl tclprocvfs.tcl testvfs.tcl \
                  vfsUrl.tcl vfsUtils.tcl vfslib.tcl \
-                 webdavvfs.tcl zipvfs.tcl
+                 webdavvfs.tcl zipvfs.tcl tclIndex
 
 #========================================================================
 # This is a list of header files to be installed

diff --git a/Readme.txt b/Readme.txt
index dca28d4bcfe7b215bcbadcb128a41623d350f080..ed66b0c019cc30f17946193b239a65ea8fa661b0 100644 (file)
--- a/Readme.txt
+++ b/Readme.txt
@@ -10,10 +10,10 @@ This is an implementation of a 'vfs' extension (and a 'vfs' package,
 including a small library of Tcl code).  The goal of this extension
 is to expose Tcl 8.4's new filesystem C API to the Tcl level.
 
-Using this extension, the editor Alphatk can actually auto-mount, view and
-edit (but not save, since they're read-only) the contents of .zip files
-directly (see <http://www.santafe.edu/~vince/Alphatk.html>), and you can
-do things like:
+Using this extension, the editor Alphatk can actually auto-mount,
+view and edit (but not save, since they're read-only) the contents of
+.zip files directly (see <http://www.purl.org/net/alphatk/>), and you
+can do things like:
 
     file copy ftp://ftp.foo.com/pub/readme.txt .
 
@@ -25,7 +25,7 @@ that reason, code contributions are very welcome.  Many of them still
 contain various debugging code, etc.  This will be gradually removed and
 the code completely cleaned up and documented as the package evolves.
 
--- Vince Darley, April 2002
+-- Vince Darley, April 2002-February 2003
 
 Compile/build
 -------------

diff --git a/configure b/configure
index bb04580b54bb1f58d934b8d1dd3c273dca86f7d5..eaaf0da4365449ee2656461726e081f4be425355 100755 (executable)
--- a/configure
+++ b/configure
@@ -2694,7 +2694,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   rm -rf conftest*
   echo "$ac_t""no" 1>&6
-                   SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
+                   SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.2'
                
 fi
 rm -f conftest*
@@ -2900,7 +2900,7 @@ EOF
            # requires an extra version number at the end of .so file names.
            # So, the library has to have a name like libtcl75.so.1.0
 
-           SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
+           SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.2'
            UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
            TCL_LIB_VERSIONS_OK=nodots
            ;;

diff --git a/configure.in b/configure.in
index 7ca0042d437a916c1558c792165ce08026120d1c..1942a569066c473736e4f70edfecfa9824027f40 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -25,7 +25,7 @@ AC_SUBST(CONFIGDIR)
 PACKAGE=vfs
 
 MAJOR_VERSION=1
-MINOR_VERSION=0
+MINOR_VERSION=2
 PATCHLEVEL=
 
 VERSION=${MAJOR_VERSION}.${MINOR_VERSION}${PATCHLEVEL}

diff --git a/generic/vfs.c b/generic/vfs.c
index ab4bbee1786b2d67f58295c36cf5932884627737..8ba028f47d76480f14f5261d18ec38cc309fbcc3 100644 (file)
--- a/generic/vfs.c
+++ b/generic/vfs.c
@@ -317,7 +317,7 @@ Vfs_Init(interp)
     if (Tcl_IsSafe(interp)) {
         return TCL_ERROR;
     }
-    if (Tcl_PkgProvide(interp, "vfs", "1.0") == TCL_ERROR) {
+    if (Tcl_PkgProvide(interp, "vfs", "1.2") == TCL_ERROR) {
         return TCL_ERROR;
     }
 

diff --git a/library/pkgIndex.tcl b/library/pkgIndex.tcl
index 4fdb6e1077ee4ea2a91ec837f01c52845feab3d1..5f719ec8a72f9c203a06103f73ba758c44d813ce 100644 (file)
--- a/library/pkgIndex.tcl
+++ b/library/pkgIndex.tcl
@@ -17,14 +17,14 @@ variable vfs::dll
 
 if {$::tcl_platform(platform) eq "unix"} {
     if {[info exists ::tcl_platform(debug)]} {
-       set dll libvfs1.0g
+       set dll libvfs1.2g
     } else {
-       set dll libvfs1.0
+       set dll libvfs1.2
     }
 } elseif {[info exists ::tcl_platform(debug)]} {
-    set dll vfs10d
+    set dll vfs12d
 } else {
-    set dll vfs10
+    set dll vfs12
 }
 set dll [file join $dir $dll[info sharedlibextension]]
 
@@ -38,7 +38,7 @@ proc loadvfs {dll} {
     load $dll
 }
 
-package ifneeded vfs 1.0 [list loadvfs $dll]
+package ifneeded vfs 1.2 [list loadvfs $dll]
 package ifneeded starkit 1.1 [list source [file join $dir starkit.tcl]]
 package ifneeded vfslib 1.3.1 [list source [file join $dir vfslib.tcl]]
 

diff --git a/tests/vfs.test b/tests/vfs.test
index cec1f68be2f1b78ad3badaaf22f89cc580107069..3f720c0313700e12e272a803cb4b90ad24e3051d 100644 (file)
--- a/tests/vfs.test
+++ b/tests/vfs.test
@@ -93,23 +93,39 @@ test vfs-3.1 {vfs helpers: in memory channels} {
     # probably many other tests will fail too.  In particular
     # any use of 'open', 'source', 'load', and usually also
     # 'file copy', 'file rename' in a vfs will fail.
+    # 
+    # What this means is that tclvfs can't find some other
+    # extension/code it requires -- you may need to install
+    # the Memchan or Rchan extension for example.
 } {}
 
 test vfs-3.2 {vfs helpers: crc} {
     # If this test fails, probably many other tests will fail too (at
     # least anything to do with 'zip' vfs).
+    # 
+    # What this means is that tclvfs can't find some other
+    # extension/code it requires -- you may need to install
+    # the Trf extension for example.
     ::vfs::crc abcd
 } {Kc*}
 
 test vfs-3.3 {vfs helpers: zip} {
     # If this test fails, probably many other tests will fail too (at
     # least anything to do with 'zip' vfs).
+    # 
+    # What this means is that tclvfs can't find some other
+    # extension/code it requires -- you may need to install
+    # the Try extension for example.
     ::vfs::zip -mode compress 1234567890
 } "\x78\x9c\x33\x34\x32\x36\x31\x35\x33\xb7\xb0\x34\x0\x0\xb\x2c\x2\xe"
 
 test vfs-3.4 {vfs helpers: zip} {
     # If this test fails, probably many other tests will fail too (at
     # least anything to do with 'zip' vfs).
+    # 
+    # What this means is that tclvfs can't find some other
+    # extension/code it requires -- you may need to install
+    # the Try extension for example.
     ::vfs::zip -mode decompress "\x78\x9c\x33\x34\x32\x36\x31\x35\x33\xb7\xb0\x34\x0\x0\xb\x2c\x2\xe"
 } {1234567890}
 

diff --git a/win/makefile.vc b/win/makefile.vc
index 97f67ab9e372dc85e349a688af782a0827b0c820..d7e012bd2e150907c6e82f9ca2db73d309e40f69 100644 (file)
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -9,8 +9,8 @@
 #
 MACHINE                = IX86
 
-VFS_VERSION = 1.0
-DLL_VERSION = 10
+VFS_VERSION = 1.2
+DLL_VERSION = 12
 
 # comment the following line to compile with symbols
 NODEBUG=1
@@ -33,7 +33,7 @@ PROJECT = vfs$(DLL_VERSION)$(DBGX)
 # TCL --        location where Tcl is installed.
 # TCLLIB --     define the Tcl lib (with correct version)
 
-# note that the tcl  vclibs should have been unpacked in $(TCL)\lib !!
+# note that the tcl vclibs should have been unpacked in $(TCL)\lib !!
 
 ROOT    = ..
 !IF "$(NODEBUG)" == "1"
@@ -58,7 +58,7 @@ include32     = -I"$(TOOLS32)\include"
 
 TCL     = c:\progra~1\tcl
 TCLLIB  = $(TCL)\lib\tclstub84$(DBGX).lib
-INSTALLDIR = $(TCL)\lib\vfs1.0
+INSTALLDIR = $(TCL)\lib\vfs$(VFS_VERSION)
 
 ######################################################################
 # Compile flags
@@ -143,7 +143,8 @@ INCLUDES = \
     -I$(TOOLS32)/include       \
     -I../generic
 
-DEFINES = -nologo $(DEBUGDEFINES) -DUSE_TCL_STUBS -DVERSION=\"1.0\" 
+DEFINES = -nologo $(DEBUGDEFINES) -DUSE_TCL_STUBS \
+    -DVERSION=\"$(VFS_VERSION)\" 
 
 # 
 # Global makefile settings