merge 8.6

6 files changed, 37 insertions, 38 deletions

diff --git a/win/Makefile.in b/win/Makefile.in
index f984114..c6cdf89 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -730,8 +730,8 @@ install-libraries: libraries install-tzdata install-msgs
 	@$(COPY) $(ROOT_DIR)/library/msgcat/msgcat.tcl "$(MODULE_INSTALL_DIR)/8.5/msgcat-1.6.1.tm";
 	@echo "Installing package tcltest 2.5.3 as a Tcl Module";
 	@$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl "$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.3.tm";
-	@echo "Installing package platform 1.0.14 as a Tcl Module";
-	@$(COPY) $(ROOT_DIR)/library/platform/platform.tcl "$(MODULE_INSTALL_DIR)/8.4/platform-1.0.14.tm";
+	@echo "Installing package platform 1.0.15 as a Tcl Module";
+	@$(COPY) $(ROOT_DIR)/library/platform/platform.tcl "$(MODULE_INSTALL_DIR)/8.4/platform-1.0.15.tm";
 	@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
 	@$(COPY) $(ROOT_DIR)/library/platform/shell.tcl "$(MODULE_INSTALL_DIR)/8.4/platform/shell-1.1.4.tm";
 	@echo "Installing encodings";
diff --git a/win/configure b/win/configure
index 5df540b..e3addbf 100755
--- a/win/configure
+++ b/win/configure
@@ -3133,14 +3133,6 @@ if test "${enable_shared+set}" = set; then
 else
   tcl_ok=yes
 fi;
-
-    if test "${enable_shared+set}" = set; then
-	enableval="$enable_shared"
-	tcl_ok=$enableval
-    else
-	tcl_ok=yes
-    fi
-
     if test "$tcl_ok" = "yes" ; then
 	echo "$as_me:$LINENO: result: shared" >&5
 echo "${ECHO_T}shared" >&6
diff --git a/win/makefile.vc b/win/makefile.vc
index 99cae58..60b6bf0 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -16,7 +16,7 @@
 # General usage:

 #   nmake [-nologo] -f makefile.vc [TARGET|MACRODEF [TARGET|MACRODEF] [...]]

 #

-# For MACRODEF, see TIP 477 (https://core.tcl-lang.org/tips/doc/trunk/tip/477.md)

+# For MACRODEF, see TIP 477 (https://core.tcl-lang.org/tips/doc/main/tip/477.md)

 # or examine Sections 6-8 in rules.vc.

 #

 # Possible values of TARGET are:

@@ -451,8 +451,8 @@ test: test-core test-pkgs
 test-core: setup $(TCLTEST) dlls $(CAT32)

 	set TCL_LIBRARY=$(ROOT:\=/)/library

 	$(DEBUGGER) $(TCLTEST) "$(ROOT:\=/)/tests/all.tcl" $(TESTFLAGS) -loadfile <<

-		package ifneeded dde 1.4.3 [list load "$(TCLDDELIB:\=/)" dde]

-		package ifneeded registry 1.3.5 [list load "$(TCLREGLIB:\=/)" registry]

+		package ifneeded dde 1.4.3 [list load "$(TCLDDELIB:\=/)" Dde]

+		package ifneeded registry 1.3.5 [list load "$(TCLREGLIB:\=/)" Registry]

 <<

 

 runtest: setup $(TCLTEST) dlls $(CAT32)

diff --git a/win/rules.vc b/win/rules.vc
index f3e5439..a0084a4 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -6,7 +6,7 @@
 # compiler switches, defining common targets and macros. The Tcl makefile

 # directly includes this. Extensions include it via "rules-ext.vc".

 #

-# See TIP 477 (https://core.tcl-lang.org/tips/doc/trunk/tip/477.md) for

+# See TIP 477 (https://core.tcl-lang.org/tips/doc/main/tip/477.md) for

 # detailed documentation.

 #

 # See the file "license.terms" for information on usage and redistribution

@@ -24,7 +24,7 @@ _RULES_VC = 1
 # For modifications that are not backward-compatible, you *must* change

 # the major version.

 RULES_VERSION_MAJOR = 1

-RULES_VERSION_MINOR = 6

+RULES_VERSION_MINOR = 7

 

 # The PROJECT macro must be defined by parent makefile.

 !if "$(PROJECT)" == ""

@@ -907,10 +907,14 @@ WARNINGS		    = $(WARNINGS) -Wp64
 # Sets the following macros:

 # TCL_MAJOR_VERSION

 # TCL_MINOR_VERSION

+# TCL_RELEASE_SERIAL

 # TCL_PATCH_LEVEL

+# TCL_PATCH_LETTER

 # TCL_VERSION

 # TK_MAJOR_VERSION

 # TK_MINOR_VERSION

+# TK_RELEASE_SERIAL

+# TK_PATCH_LEVEL

 # TK_PATCH_LEVEL

 # TK_VERSION

 # DOTVERSION - set as (for example) 2.5

@@ -925,6 +929,9 @@ WARNINGS		    = $(WARNINGS) -Wp64
 !if [echo TCL_MINOR_VERSION = \>> versions.vc] \

    && [nmakehlp -V "$(_TCL_H)" TCL_MINOR_VERSION >> versions.vc]

 !endif

+!if [echo TCL_RELEASE_SERIAL = \>> versions.vc] \

+   && [nmakehlp -V "$(_TCL_H)" TCL_RELEASE_SERIAL >> versions.vc]

+!endif

 !if [echo TCL_PATCH_LEVEL = \>> versions.vc] \

    && [nmakehlp -V "$(_TCL_H)" TCL_PATCH_LEVEL >> versions.vc]

 !endif

@@ -936,6 +943,9 @@ WARNINGS		    = $(WARNINGS) -Wp64
 !if [echo TK_MINOR_VERSION = \>> versions.vc] \

    && [nmakehlp -V $(_TK_H) TK_MINOR_VERSION >> versions.vc]

 !endif

+!if [echo TK_RELEASE_SERIAL = \>> versions.vc] \

+   && [nmakehlp -V "$(_TK_H)" TK_RELEASE_SERIAL >> versions.vc]

+!endif

 !if [echo TK_PATCH_LEVEL = \>> versions.vc] \

    && [nmakehlp -V $(_TK_H) TK_PATCH_LEVEL >> versions.vc]

 !endif

@@ -945,9 +955,26 @@ WARNINGS		    = $(WARNINGS) -Wp64
 

 TCL_VERSION	= $(TCL_MAJOR_VERSION)$(TCL_MINOR_VERSION)

 TCL_DOTVERSION	= $(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)

+!if [nmakehlp -f $(TCL_PATCH_LEVEL) "a"]

+TCL_PATCH_LETTER = a

+!elseif [nmakehlp -f $(TCL_PATCH_LEVEL) "b"]

+TCL_PATCH_LETTER = b

+!else

+TCL_PATCH_LETTER = .

+!endif

+

 !if defined(_TK_H)

+

 TK_VERSION	= $(TK_MAJOR_VERSION)$(TK_MINOR_VERSION)

 TK_DOTVERSION	= $(TK_MAJOR_VERSION).$(TK_MINOR_VERSION)

+!if [nmakehlp -f $(TK_PATCH_LEVEL) "a"]

+TK_PATCH_LETTER = a

+!elseif [nmakehlp -f $(TK_PATCH_LEVEL) "b"]

+TK_PATCH_LETTER = b

+!else

+TK_PATCH_LETTER = .

+!endif

+

 !endif

 

 # Set DOTVERSION and VERSION

@@ -1481,18 +1508,6 @@ lflags	= -nologo -machine:$(MACHINE) $(LINKERFLAGS) $(ldebug)
 lflags	= $(lflags) -nodefaultlib:libucrt.lib

 !endif

 

-# Old linkers (Visual C++ 6 in particular) will link for fast loading

-# on Win98. Since we do not support Win98 any more, we specify nowin98

-# as recommended for NT and later. However, this is only required by

-# IX86 on older compilers and only needed if we are not doing a static build.

-

-!if "$(MACHINE)" == "IX86" && !$(STATIC_BUILD)

-!if [nmakehlp -l -opt:nowin98 $(LINKER_TESTFLAGS)]

-# Align sections for PE size savings.

-lflags	= $(lflags) -opt:nowin98

-!endif

-!endif

-

 dlllflags = $(lflags) -dll

 conlflags = $(lflags) -subsystem:console

 guilflags = $(lflags) -subsystem:windows

@@ -1550,11 +1565,11 @@ default-target: $(DEFAULT_BUILD_TARGET)
 !if $(MULTIPLATFORM_INSTALL)

 default-pkgindex:

 	@echo package ifneeded $(PRJ_PACKAGE_TCLNAME) $(DOTVERSION) \

-	    [list load [file join $$dir $(PLATFORM_IDENTIFY) $(PRJLIBNAME)]] > $(OUT_DIR)\pkgIndex.tcl

+	    [list load [file join $$dir $(PLATFORM_IDENTIFY) $(PRJLIBNAME)] [string totitle $(PRJ_PACKAGE_TCLNAME)]] > $(OUT_DIR)\pkgIndex.tcl

 !else

 default-pkgindex:

 	@echo package ifneeded $(PRJ_PACKAGE_TCLNAME) $(DOTVERSION) \

-	    [list load [file join $$dir $(PRJLIBNAME)]] > $(OUT_DIR)\pkgIndex.tcl

+	    [list load [file join $$dir $(PRJLIBNAME)] [string totitle $(PRJ_PACKAGE_TCLNAME)]] > $(OUT_DIR)\pkgIndex.tcl

 !endif

 

 default-pkgindex-tea:

diff --git a/win/targets.vc b/win/targets.vc
index 6bfebc7..077e8f7 100644
--- a/win/targets.vc
+++ b/win/targets.vc
@@ -4,7 +4,7 @@
 # Part of the nmake based build system for Tcl and its extensions.

 # This file defines some standard targets for the convenience of extensions

 # and can be optionally included by the extension makefile.

-# See TIP 477 (https://core.tcl-lang.org/tips/doc/trunk/tip/477.md) for docs.

+# See TIP 477 (https://core.tcl-lang.org/tips/doc/main/tip/477.md) for docs.

 

 $(PROJECT): setup pkgindex $(PRJLIB)

 

diff --git a/win/tcl.m4 b/win/tcl.m4
index 44bb380..70b7b19 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -364,14 +364,6 @@ AC_DEFUN([SC_ENABLE_SHARED], [
     AC_ARG_ENABLE(shared,
 	[  --enable-shared         build and link with shared libraries (default: on)],
 	[tcl_ok=$enableval], [tcl_ok=yes])
-
-    if test "${enable_shared+set}" = set; then
-	enableval="$enable_shared"
-	tcl_ok=$enableval
-    else
-	tcl_ok=yes
-    fi
-
     if test "$tcl_ok" = "yes" ; then
 	AC_MSG_RESULT([shared])
 	SHARED_BUILD=1