Bug in tclPkg.c, use semantic version in more places., but don't use "+" syntax yet.

10 files changed, 14 insertions, 11 deletions

diff --git a/README b/README
index 8a5c2d5..929af23 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 README:  Tcl
-    This is the Tcl 8.7a0 source distribution.
+    This is the Tcl 8.7.0-alpha.0 source distribution.
 	http://sourceforge.net/projects/tcl/files/Tcl/
     You can get any source release of Tcl from the URL above.
 
diff --git a/generic/tcl.h b/generic/tcl.h
index aaf0ce7..49f6a0c 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -59,7 +59,7 @@ extern "C" {
 #define TCL_RELEASE_SERIAL  0
 
 #define TCL_VERSION	    "8.7"
-#define TCL_PATCH_LEVEL	    "8.7-alpha.0"
+#define TCL_PATCH_LEVEL	    "8.7.0-alpha.0"
 
 /*
  *----------------------------------------------------------------------------
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 4f10702..5c5bc64 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -935,7 +935,7 @@ Tcl_CreateInterp(void)
      * Set up other variables such as tcl_version and tcl_library
      */
 
-    Tcl_SetVar(interp, "tcl_patchLevel", TCL_PATCH_LEVEL "+foo", TCL_GLOBAL_ONLY);
+    Tcl_SetVar(interp, "tcl_patchLevel", TCL_PATCH_LEVEL, TCL_GLOBAL_ONLY);
     Tcl_SetVar(interp, "tcl_version", TCL_VERSION, TCL_GLOBAL_ONLY);
     Tcl_TraceVar2(interp, "tcl_precision", NULL,
 	    TCL_GLOBAL_ONLY|TCL_TRACE_READS|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
@@ -958,7 +958,7 @@ Tcl_CreateInterp(void)
      * TIP #268: Full patchlevel instead of just major.minor
      */
 
-    Tcl_PkgProvideEx(interp, "Tcl", TCL_PATCH_LEVEL "+foo", &tclStubs);
+    Tcl_PkgProvideEx(interp, "Tcl", TCL_PATCH_LEVEL, &tclStubs);
 
     if (TclTommath_Init(interp) != TCL_OK) {
 	Tcl_Panic("%s", Tcl_GetString(Tcl_GetObjResult(interp)));
diff --git a/generic/tclPkg.c b/generic/tclPkg.c
index 9e4fb74..dcf7c3b 100644
--- a/generic/tclPkg.c
+++ b/generic/tclPkg.c
@@ -1635,7 +1635,7 @@ CheckRequirement(
     }
 
     buf = strchr(dash+1, '-');
-    if ((buf != NULL) && isdigit(UCHAR(dash[1]))) {
+    if ((buf != NULL) && isdigit(UCHAR(buf[1]))) {
 	/*
 	 * More dashes found after the first. This is wrong.
 	 */
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 83d147d..600f5ec 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -552,7 +552,7 @@ Tcltest_Init(
     }
     /* TIP #268: Full patchlevel instead of just major.minor */
 
-    if (Tcl_PkgProvide(interp, "Tcltest", TCL_PATCH_LEVEL "+foo") == TCL_ERROR) {
+    if (Tcl_PkgProvide(interp, "Tcltest", TCL_PATCH_LEVEL) == TCL_ERROR) {
 	return TCL_ERROR;
     }
 
diff --git a/generic/tclTomMathInterface.c b/generic/tclTomMathInterface.c
index f278986..48db8c3 100644
--- a/generic/tclTomMathInterface.c
+++ b/generic/tclTomMathInterface.c
@@ -41,7 +41,7 @@ TclTommath_Init(
 {
     /* TIP #268: Full patchlevel instead of just major.minor */
 
-    if (Tcl_PkgProvideEx(interp, "tcl::tommath", TCL_PATCH_LEVEL "+foo",
+    if (Tcl_PkgProvideEx(interp, "tcl::tommath", TCL_PATCH_LEVEL,
 	    &tclTomMathStubs) != TCL_OK) {
 	return TCL_ERROR;
     }
diff --git a/library/init.tcl b/library/init.tcl
index 0ebdb3a..730d1ab 100644
--- a/library/init.tcl
+++ b/library/init.tcl
@@ -16,7 +16,7 @@
 if {[info commands package] == ""} {
     error "version mismatch: library\nscripts expect Tcl version 7.5b1 or later but the loaded version is\nonly [info patchlevel]"
 }
-package require -exact Tcl 8.7a0
+package require -exact Tcl 8.7.0-alpha.0
 
 # Compute the auto path to use in this interpreter.
 # The values on the path come from several locations:
diff --git a/unix/configure b/unix/configure
index da09b09..0b0ba0e 100755
--- a/unix/configure
+++ b/unix/configure
@@ -641,6 +641,7 @@ INSTALL_TZDATA
 TCL_HAS_LONGLONG
 TCL_UNSHARED_LIB_SUFFIX
 TCL_SHARED_LIB_SUFFIX
+TCL_LIB_VERSIONS_OK
 TCL_BUILD_LIB_SPEC
 LD_LIBRARY_PATH_VAR
 TCL_SHARED_BUILD
@@ -2324,7 +2325,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 TCL_VERSION=8.7
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=7
-TCL_PATCH_LEVEL="a0"
+TCL_PATCH_LEVEL="0-alpha.0"
 VERSION=${TCL_MAJOR_VERSION}
 
 EXTRA_INSTALL_BINARIES=${EXTRA_INSTALL_BINARIES:-"@:"}
@@ -10253,6 +10254,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
 
 # tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed
 # since on some platforms TCL_LIB_FILE contains shell escapes.
+# (See also: TCL_TRIM_DOTS, which is deprecated).
 
 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
 
@@ -10472,6 +10474,7 @@ TCL_SHARED_BUILD=${SHARED_BUILD}
 
 
 
+
 ac_config_files="$ac_config_files Makefile:../unix/Makefile.in dltest/Makefile:../unix/dltest/Makefile.in tclConfig.sh:../unix/tclConfig.sh.in tcl.pc:../unix/tcl.pc.in"
 
 cat >confcache <<\_ACEOF
diff --git a/unix/configure.in b/unix/configure.in
index 8090b40..e62be15 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -25,7 +25,7 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [
 TCL_VERSION=8.7
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=7
-TCL_PATCH_LEVEL="a0"
+TCL_PATCH_LEVEL="0-alpha.0"
 VERSION=${TCL_MAJOR_VERSION}
 
 EXTRA_INSTALL_BINARIES=${EXTRA_INSTALL_BINARIES:-"@:"}
diff --git a/unix/tcl.spec b/unix/tcl.spec
index 868a226..a11f230 100644
--- a/unix/tcl.spec
+++ b/unix/tcl.spec
@@ -4,7 +4,7 @@
 
 Name:          tcl
 Summary:       Tcl scripting language development environment
-Version:       8.7a0
+Version:       8.7.0-alpha.0
 Release:       2
 License:       BSD
 Group:         Development/Languages