* library/tcltest/tcltest.tcl: Revise tcltest bump to 2.3a1.

        * library/tcltest/pkgIndex.tcl: This permits more features to be
        * unix/Makefile.in:     added to tcltest before we reach version 2.3.0,
        * win/Makefile.in:      best timed to match the release of Tcl 8.5.0.
        * win/makefile.vc:      This also serves as a demo of TIP 268 features.

7 files changed, 25 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index dc83751..1568e96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,13 @@
+2006-10-16  Don Porter  <dgp@users.sourceforge.net>
+
+	* library/tcltest/tcltest.tcl:	Revise tcltest bump to 2.3a1.
+	* library/tcltest/pkgIndex.tcl:	This permits more features to be
+	* unix/Makefile.in:	added to tcltest before we reach version 2.3.0,
+	* win/Makefile.in:	best timed to match the release of Tcl 8.5.0.
+	* win/makefile.vc:	This also serves as a demo of TIP 268 features.
+
 2006-10-13  Colin McCormack <coldstore@users.sf.net>
+
 	* win/tclWinFile.c: corrected erroneous attempt to protect
 	against NULL return from Tcl_FSGetNormalizedPath
 	per Bug 1548263 causing Bug 1575837.
diff --git a/changes b/changes
index b0df572..7bea005 100644
--- a/changes
+++ b/changes
@@ -1,6 +1,6 @@
 Recent user-visible changes to Tcl:
 
-RCS: @(#) $Id: changes,v 1.107 2006/10/11 03:47:14 dgp Exp $
+RCS: @(#) $Id: changes,v 1.108 2006/10/16 15:22:05 dgp Exp $
 
 1. No more [command1] [command2] construct for grouping multiple
 commands on a single command line.
@@ -6801,7 +6801,7 @@ For any code relying on exact error messages.
 => msgcat 1.4.2
 
 2006-09-10 (new feature) tcltest option: -verbose line (steffen)
-=> tcltest 2.3.0
+=> tcltest 2.3a1
 
 2006-09-19 (bug fix)[1555271,1561260] Several ** operator bugs (porter)
 
diff --git a/library/tcltest/pkgIndex.tcl b/library/tcltest/pkgIndex.tcl
index 3b8d5a2..80991ab 100644
--- a/library/tcltest/pkgIndex.tcl
+++ b/library/tcltest/pkgIndex.tcl
@@ -8,5 +8,6 @@
 # script is sourced, the variable $dir must contain the
 # full path name of this file's directory.
 
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
 if {![package vsatisfies [package provide Tcl] 8.3]} {return}
-package ifneeded tcltest 2.3.0 [list source [file join $dir tcltest.tcl]]
+package ifneeded tcltest 2.3a1 [list source [file join $dir tcltest.tcl]]
diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl
index 183ebf6..d9d37bc 100644
--- a/library/tcltest/tcltest.tcl
+++ b/library/tcltest/tcltest.tcl
@@ -16,15 +16,16 @@
 # Contributions from Don Porter, NIST, 2002.  (not subject to US copyright)
 # All rights reserved.
 #
-# RCS: @(#) $Id: tcltest.tcl,v 1.97 2006/09/11 03:54:09 dgp Exp $
+# RCS: @(#) $Id: tcltest.tcl,v 1.98 2006/10/16 15:22:06 dgp Exp $
 
+package require Tcl 8.5		;# To provide an alpha version
 package require Tcl 8.3		;# uses [glob -directory]
 namespace eval tcltest {
 
     # When the version number changes, be sure to update the pkgIndex.tcl file,
     # and the install directory in the Makefiles.  When the minor version
     # changes (new feature) be sure to update the man page as well.
-    variable Version 2.3.0
+    variable Version 2.3a1
 
     # Compatibility support for dumb variables defined in tcltest 1
     # Do not use these.  Call [package provide Tcl] and [info patchlevel]
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 5812864..991a7cf 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.192 2006/09/16 01:22:16 dgp Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.193 2006/10/16 15:22:06 dgp Exp $
 
 VERSION 		= @TCL_VERSION@
 MAJOR_VERSION		= @TCL_MAJOR_VERSION@
@@ -799,8 +799,8 @@ install-libraries: libraries install-tzdata install-msgs
 	    done;
 	@echo "Installing package msgcat 1.4.2 as a Tcl Module";
 	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/msgcat-1.4.2.tm;
-	@echo "Installing package tcltest 2.3.0 as a Tcl Module";
-	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.3/tcltest-2.3.0.tm;
+	@echo "Installing package tcltest 2.3a1 as a Tcl Module";
+	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/tcltest-2.3a1.tm;
 	@echo "Installing library encoding directory";
 	@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
 		$(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/encoding; \
diff --git a/win/Makefile.in b/win/Makefile.in
index 8c11e2c..e90957f 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -5,7 +5,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.105 2006/09/16 01:22:16 dgp Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.106 2006/10/16 15:22:06 dgp Exp $
 
 VERSION = @TCL_VERSION@
 
@@ -653,8 +653,8 @@ install-libraries: libraries install-tzdata install-msgs
 	    done;
 	@echo "Installing package msgcat 1.4.2 as a Tcl Module";
 	@$(COPY) $(ROOT_DIR)/library/msgcat/msgcat.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/msgcat-1.4.2.tm;
-	@echo "Installing package tcltest 2.3.0 as a Tcl Module";
-	@$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.3/tcltest-2.3.0.tm;
+	@echo "Installing package tcltest 2.3a1 as a Tcl Module";
+	@$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/tcltest-2.3a1.tm;
 	@echo "Installing encodings";
 	@for i in $(ROOT_DIR)/library/encoding/*.enc ; do \
 		$(COPY) "$$i" "$(SCRIPT_INSTALL_DIR)/encoding"; \
diff --git a/win/makefile.vc b/win/makefile.vc
index 238069d..af8a8d7 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
 # Copyright (c) 2001-2004 David Gravereaux.
 #
 #------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.150 2006/09/26 20:47:03 patthoyts Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.151 2006/10/16 15:22:07 dgp Exp $
 #------------------------------------------------------------------------------
 
 # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -1020,9 +1020,9 @@ install-libraries: tclConfig install-msgs install-tzdata
 	@echo Installing package msgcat 1.4 as a Tcl Module
 	@$(COPY) "$(ROOT)\library\msgcat\msgcat.tcl" \
 	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.5\msgcat-1.4.2.tm"
-	@echo Installing package tcltest 2.3.0 as a Tcl Module
+	@echo Installing package tcltest 2.3a1 as a Tcl Module
 	@$(COPY) "$(ROOT)\library\tcltest\tcltest.tcl" \
-	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.3\tcltest-2.3.0.tm"
+	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.5\tcltest-2.3a1.tm"
 	@echo Installing $(TCLDDELIBNAME)
 !if $(STATIC_BUILD)
 	@$(CPY) "$(TCLDDELIB)" "$(LIB_INSTALL_DIR)\"