merge 8.6

1 files changed, 97 insertions, 104 deletions

diff --git a/win/makefile.vc b/win/makefile.vc
index 2a3d050..cf30498 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.tk/tips/doc/trunk/tip/477.md)

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

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

 #

 # Possible values of TARGET are:

@@ -52,29 +52,32 @@
 # turn on the 64-bit compiler, if your SDK has it.

 #

 # Basic macros and options usable on the commandline (see rules.vc for more info):

-#	OPTS=msvcrt,static,staticpkg,symbols,nothreads,profile,unchecked,time64bit,none

+#	OPTS=msvcrt,nothreads,pdbs,profile,static,staticpkg,symbols,thrdalloc,time64bit,unchecked,utfmax,none

 #		Sets special options for the core.  The default is for none.

 #		Any combination of the above may be used (comma separated).

 #		'none' will over-ride everything to nothing.

 #

-#		msvcrt   = Affects the static option only to switch it from

-#			   using libcmt(d) as the C runtime [by default] to

-#			   msvcrt(d). This is useful for static embedding

-#			   support.

-#		static   = Builds a static library of the core instead of a

-#			   dll.  The shell will be static (and large), as well.

-#		staticpkg= Affects the static option only to switch

-#			   tclshXX.exe to have the dde and reg extension linked

-#			   inside it.

-#		nothreads  = Turns off full multithreading support (default on).

+#		msvcrt    = Affects the static option only to switch it from

+#			    using libcmt(d) as the C runtime [by default] to

+#			    msvcrt(d). This is useful for static embedding

+#			    support.

+#		nothreads = Turns off full multithreading support (default on).

+#		pbds      =  Produce separate debug symbol files.

+#		profile   =  Adds profiling hooks.  Map file is assumed.

+#		static    = Builds a static library of the core instead of a

+#			    dll.  The shell will be static (and large), as well.

+#		staticpkg = Affects the static option only to switch

+#			    tclshXX.exe to have the dde and reg extension linked

+#			    inside it.

+#		symbols   =  Adds symbols for step debugging.

 #		thrdalloc = Use the thread allocator (shared global free pool).

-#		symbols =  Adds symbols for step debugging.

-#		profile =  Adds profiling hooks.  Map file is assumed.

-#		unchecked = Allows a symbols build to not use the debug

-#			   enabled runtime (msvcrt.dll not msvcrtd.dll

-#			   or libcmt.lib not libcmtd.lib).

 #		time64bit = Forces a build using 64-bit time_t for 32-bit build

-#			   (CRT library should support this).

+#			    (CRT library should support this).

+#		unchecked = Allows a symbols build to not use the debug

+#			    enabled runtime (msvcrt.dll not msvcrtd.dll

+#			    or libcmt.lib not libcmtd.lib).

+#		utfmax    = Forces a build allowing 4-byte UTF-8 sequences

+#			    internally.

 #

 #	STATS=compdbg,memdbg,none

 #		Sets optional memory and bytecode compiler debugging code added

@@ -153,6 +156,9 @@ VERSION         = $(TCL_MAJOR_VERSION)$(TCL_MINOR_VERSION)
 !if [echo PKG_HTTP_VER = \>> versions.vc] \

    && [nmakehlp -V ..\library\http\pkgIndex.tcl http >> versions.vc]

 !endif

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

+   && [nmakehlp -V ..\library\opt\pkgIndex.tcl opt >> versions.vc]

+!endif

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

    && [nmakehlp -V ..\library\tcltest\pkgIndex.tcl tcltest >> versions.vc]

 !endif

@@ -261,8 +267,8 @@ COREOBJS = \
 	$(TMP_DIR)\tclListObj.obj \

 	$(TMP_DIR)\tclLiteral.obj \

 	$(TMP_DIR)\tclLoad.obj \

+	$(TMP_DIR)\tclMainW.obj \

 	$(TMP_DIR)\tclMain.obj \

-	$(TMP_DIR)\tclMain2.obj \

 	$(TMP_DIR)\tclNamesp.obj \

 	$(TMP_DIR)\tclNotify.obj \

 	$(TMP_DIR)\tclOO.obj \

@@ -317,9 +323,6 @@ ZLIBOBJS = \
 	$(TMP_DIR)\zutil.obj

 

 TOMMATHOBJS = \

-	$(TMP_DIR)\bn_reverse.obj \

-	$(TMP_DIR)\bn_fast_s_mp_mul_digs.obj \

-	$(TMP_DIR)\bn_fast_s_mp_sqr.obj \

 	$(TMP_DIR)\bn_mp_add.obj \

 	$(TMP_DIR)\bn_mp_add_d.obj \

 	$(TMP_DIR)\bn_mp_and.obj \

@@ -338,18 +341,13 @@ TOMMATHOBJS = \
 	$(TMP_DIR)\bn_mp_div_2d.obj \

 	$(TMP_DIR)\bn_mp_div_3.obj \

 	$(TMP_DIR)\bn_mp_exch.obj \

-	$(TMP_DIR)\bn_mp_expt_d.obj \

-	$(TMP_DIR)\bn_mp_expt_d_ex.obj \

-	$(TMP_DIR)\bn_s_mp_get_bit.obj \

+	$(TMP_DIR)\bn_mp_expt_u32.obj \

 	$(TMP_DIR)\bn_mp_grow.obj \

 	$(TMP_DIR)\bn_mp_init.obj \

 	$(TMP_DIR)\bn_mp_init_copy.obj \

 	$(TMP_DIR)\bn_mp_init_multi.obj \

 	$(TMP_DIR)\bn_mp_init_set.obj \

-	$(TMP_DIR)\bn_mp_init_set_int.obj \

 	$(TMP_DIR)\bn_mp_init_size.obj \

-	$(TMP_DIR)\bn_mp_karatsuba_mul.obj \

-	$(TMP_DIR)\bn_mp_karatsuba_sqr.obj \

 	$(TMP_DIR)\bn_mp_lshd.obj \

 	$(TMP_DIR)\bn_mp_mod.obj \

 	$(TMP_DIR)\bn_mp_mod_2d.obj \

@@ -364,26 +362,29 @@ TOMMATHOBJS = \
 	$(TMP_DIR)\bn_mp_read_radix.obj \

 	$(TMP_DIR)\bn_mp_rshd.obj \

 	$(TMP_DIR)\bn_mp_set.obj \

-	$(TMP_DIR)\bn_mp_set_int.obj \

-	$(TMP_DIR)\bn_mp_set_long.obj \

 	$(TMP_DIR)\bn_mp_shrink.obj \

 	$(TMP_DIR)\bn_mp_sqr.obj \

 	$(TMP_DIR)\bn_mp_sqrt.obj \

 	$(TMP_DIR)\bn_mp_sub.obj \

 	$(TMP_DIR)\bn_mp_sub_d.obj \

 	$(TMP_DIR)\bn_mp_signed_rsh.obj \

-	$(TMP_DIR)\bn_mp_to_unsigned_bin.obj \

-	$(TMP_DIR)\bn_mp_to_unsigned_bin_n.obj \

-	$(TMP_DIR)\bn_mp_toom_mul.obj \

-	$(TMP_DIR)\bn_mp_toom_sqr.obj \

-	$(TMP_DIR)\bn_mp_toradix_n.obj \

-	$(TMP_DIR)\bn_mp_unsigned_bin_size.obj \

+	$(TMP_DIR)\bn_mp_to_ubin.obj \

+	$(TMP_DIR)\bn_mp_to_radix.obj \

+	$(TMP_DIR)\bn_mp_ubin_size.obj \

 	$(TMP_DIR)\bn_mp_xor.obj \

 	$(TMP_DIR)\bn_mp_zero.obj \

 	$(TMP_DIR)\bn_s_mp_add.obj \

+	$(TMP_DIR)\bn_s_mp_balance_mul.obj \

+	$(TMP_DIR)\bn_s_mp_karatsuba_mul.obj \

+	$(TMP_DIR)\bn_s_mp_karatsuba_sqr.obj \

 	$(TMP_DIR)\bn_s_mp_mul_digs.obj \

+	$(TMP_DIR)\bn_s_mp_mul_digs_fast.obj \

+	$(TMP_DIR)\bn_s_mp_reverse.obj \

 	$(TMP_DIR)\bn_s_mp_sqr.obj \

-	$(TMP_DIR)\bn_s_mp_sub.obj

+	$(TMP_DIR)\bn_s_mp_sqr_fast.obj \

+	$(TMP_DIR)\bn_s_mp_sub.obj \

+	$(TMP_DIR)\bn_s_mp_toom_sqr.obj \

+	$(TMP_DIR)\bn_s_mp_toom_mul.obj

 

 PLATFORMOBJS = \

 	$(TMP_DIR)\tclWin32Dll.obj \

@@ -422,7 +423,7 @@ PKGSDIR		= $(ROOT)\pkgs
 # Additional include and C macro definitions for the implicit rules

 # defined in rules.vc

 PRJ_INCLUDES	= -I"$(TOMMATHDIR)"

-PRJ_DEFINES	= -DTCL_TOMMATH -DMP_PREC=4 -Dinline=__inline -DHAVE_ZLIB=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE

+PRJ_DEFINES	= /DTCL_TOMMATH /DMP_PREC=4 /Dinline=__inline /DHAVE_ZLIB=1 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DMP_FIXED_CUTOFFS

 

 # Additional Link libraries needed beyond those in rules.vc

 PRJ_LIBS   = netapi32.lib user32.lib userenv.lib ws2_32.lib

@@ -456,8 +457,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.1 [list load "$(TCLDDELIB:\=/)" dde]

-		package ifneeded registry 1.3.3 [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)

@@ -482,11 +483,11 @@ $(TCLLIB): $(TCLOBJS)
 $**

 <<

 	$(_VC_MANIFEST_EMBED_DLL)

+

 $(TCLIMPLIB): $(TCLLIB)

 

 !endif # $(STATIC_BUILD)

 

-

 $(TCLSTUBLIB): $(TCLSTUBOBJS)

 	$(LIBCMD) -nodefaultlib $(TCLSTUBOBJS)

 

@@ -548,8 +549,9 @@ clean-pkgs:
 	    popd \

 	  )

 

-$(CAT32): $(WINDIR)\cat.c

-	$(cc32) $(cflags) $(crt) -D_CRT_NONSTDC_NO_DEPRECATE -DCONSOLE -Fo$(TMP_DIR)\ $?

+$(CAT32): $(WIN_DIR)\cat.c

+	$(cc32) $(cflags) $(crt) /D_CRT_NONSTDC_NO_DEPRECATE /DCONSOLE \

+	    /DUNICODE /D_UNICODE -Fo$(TMP_DIR)\ $?

 	$(CONEXECMD) -stack:16384 $(TMP_DIR)\cat.obj

 	$(_VC_MANIFEST_EMBED_EXE)

 

@@ -648,7 +650,6 @@ CORE_MACHINE = $(MACHINE)
 CORE_DEBUG = $(DEBUG)

 CORE_TCL_THREADS = $(TCL_THREADS)

 CORE_USE_THREAD_ALLOC = $(USE_THREAD_ALLOC)

-CORE_USE_WIDECHAR_API = $(USE_WIDECHAR_API)

 <<

 

 #---------------------------------------------------------------------

@@ -658,7 +659,7 @@ CORE_USE_WIDECHAR_API = $(USE_WIDECHAR_API)
 tclConfig: $(OUT_DIR)\tclConfig.sh

 

 # TBD - is this tclConfig.sh file ever used? The values are incorrect!

-$(OUT_DIR)\tclConfig.sh: $(WINDIR)\tclConfig.sh.in

+$(OUT_DIR)\tclConfig.sh: $(WIN_DIR)\tclConfig.sh.in

 	@echo Creating tclConfig.sh

         @nmakehlp -s << $** >$@

 @TCL_DLL_FILE@       $(TCLLIBNAME)

@@ -734,13 +735,13 @@ gendate:
 # Special case object file targets

 #---------------------------------------------------------------------

 

-$(TMP_DIR)\testMain.obj: $(WINDIR)\tclAppInit.c

-	$(cc32) $(appcflags) -DTCL_TEST \

-	    -DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \

+$(TMP_DIR)\testMain.obj: $(WIN_DIR)\tclAppInit.c

+	$(cc32) $(appcflags) /DTCL_TEST /DUNICODE /D_UNICODE \

+	    /DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \

 	    -Fo$@ $?

 

-$(TMP_DIR)\tclMain2.obj: $(GENERICDIR)\tclMain.c

-	$(cc32) $(pkgcflags) -DTCL_ASCII_MAIN \

+$(TMP_DIR)\tclMainW.obj: $(GENERICDIR)\tclMain.c

+	$(cc32) $(pkgcflags) /DUNICODE /D_UNICODE \

 	    -Fo$@ $?

 

 $(TMP_DIR)\tclTest.obj: $(GENERICDIR)\tclTest.c

@@ -749,7 +750,7 @@ $(TMP_DIR)\tclTest.obj: $(GENERICDIR)\tclTest.c
 $(TMP_DIR)\tclTestObj.obj: $(GENERICDIR)\tclTestObj.c

 	$(cc32) $(appcflags) -Fo$@ $?

 

-$(TMP_DIR)\tclWinTest.obj: $(WINDIR)\tclWinTest.c

+$(TMP_DIR)\tclWinTest.obj: $(WIN_DIR)\tclWinTest.c

 	$(CCAPPCMD) $?

 

 $(TMP_DIR)\tclZlib.obj: $(GENERICDIR)\tclZlib.c

@@ -757,40 +758,32 @@ $(TMP_DIR)\tclZlib.obj: $(GENERICDIR)\tclZlib.c
 

 $(TMP_DIR)\tclPkgConfig.obj: $(GENERICDIR)\tclPkgConfig.c

 	$(cc32) $(pkgcflags) \

-	-DCFG_INSTALL_LIBDIR="\"$(LIB_INSTALL_DIR:\=\\)\"" \

-	-DCFG_INSTALL_BINDIR="\"$(BIN_INSTALL_DIR:\=\\)\"" \

-	-DCFG_INSTALL_SCRDIR="\"$(SCRIPT_INSTALL_DIR:\=\\)\"" \

-	-DCFG_INSTALL_INCDIR="\"$(INCLUDE_INSTALL_DIR:\=\\)\"" \

-	-DCFG_INSTALL_DOCDIR="\"$(DOC_INSTALL_DIR:\=\\)\""	\

-	-DCFG_RUNTIME_LIBDIR="\"$(LIB_INSTALL_DIR:\=\\)\"" \

-	-DCFG_RUNTIME_BINDIR="\"$(BIN_INSTALL_DIR:\=\\)\"" \

-	-DCFG_RUNTIME_SCRDIR="\"$(SCRIPT_INSTALL_DIR:\=\\)\"" \

-	-DCFG_RUNTIME_INCDIR="\"$(INCLUDE_INSTALL_DIR:\=\\)\"" \

-	-DCFG_RUNTIME_DOCDIR="\"$(DOC_INSTALL_DIR:\=\\)\""     \

+	/DCFG_INSTALL_LIBDIR="\"$(LIB_INSTALL_DIR:\=\\)\"" \

+	/DCFG_INSTALL_BINDIR="\"$(BIN_INSTALL_DIR:\=\\)\"" \

+	/DCFG_INSTALL_SCRDIR="\"$(SCRIPT_INSTALL_DIR:\=\\)\"" \

+	/DCFG_INSTALL_INCDIR="\"$(INCLUDE_INSTALL_DIR:\=\\)\"" \

+	/DCFG_INSTALL_DOCDIR="\"$(DOC_INSTALL_DIR:\=\\)\""	\

+	/DCFG_RUNTIME_LIBDIR="\"$(LIB_INSTALL_DIR:\=\\)\"" \

+	/DCFG_RUNTIME_BINDIR="\"$(BIN_INSTALL_DIR:\=\\)\"" \

+	/DCFG_RUNTIME_SCRDIR="\"$(SCRIPT_INSTALL_DIR:\=\\)\"" \

+	/DCFG_RUNTIME_INCDIR="\"$(INCLUDE_INSTALL_DIR:\=\\)\"" \

+	/DCFG_RUNTIME_DOCDIR="\"$(DOC_INSTALL_DIR:\=\\)\""     \

 	-Fo$@ $?

 

-$(TMP_DIR)\tclAppInit.obj: $(WINDIR)\tclAppInit.c

-	$(cc32) $(appcflags) \

-	    -DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \

+$(TMP_DIR)\tclAppInit.obj: $(WIN_DIR)\tclAppInit.c

+	$(cc32) $(appcflags) /DUNICODE /D_UNICODE \

+	    /DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \

 	    -Fo$@ $?

 

 ### The following objects should be built using the stub interfaces

-### *ALL* extensions need to built with -DTCL_THREADS=1

+### *ALL* extensions need to built with /DTCL_THREADS=1

 

-$(TMP_DIR)\tclWinReg.obj: $(WINDIR)\tclWinReg.c

-!if $(STATIC_BUILD)

-	$(cc32) $(appcflags) -DSTATIC_BUILD -Fo$@ $?

-!else

-	$(cc32) $(appcflags) -DUSE_TCL_STUBS -Fo$@ $?

-!endif

+$(TMP_DIR)\tclWinReg.obj: $(WIN_DIR)\tclWinReg.c

+	$(cc32) $(appcflags) /DUSE_TCL_STUBS -Fo$@ $?

 

 

-$(TMP_DIR)\tclWinDde.obj: $(WINDIR)\tclWinDde.c

-!if $(STATIC_BUILD)

-	$(cc32) $(appcflags) -DSTATIC_BUILD -Fo$@ $?

-!else

-	$(cc32) $(appcflags) -DUSE_TCL_STUBS -Fo$@ $?

-!endif

+$(TMP_DIR)\tclWinDde.obj: $(WIN_DIR)\tclWinDde.c

+	$(cc32) $(appcflags) /DUSE_TCL_STUBS -Fo$@ $?

 

 

 ### The following objects are part of the stub library and should not

@@ -806,7 +799,7 @@ $(TMP_DIR)\tclTomMathStubLib.obj: $(GENERICDIR)\tclTomMathStubLib.c
 $(TMP_DIR)\tclOOStubLib.obj: $(GENERICDIR)\tclOOStubLib.c

 	$(cc32) $(stubscflags) -Fo$@ $?

 

-$(TMP_DIR)\tclsh.exe.manifest: $(WINDIR)\tclsh.exe.manifest.in

+$(TMP_DIR)\tclsh.exe.manifest: $(WIN_DIR)\tclsh.exe.manifest.in

 	@nmakehlp -s << $** >$@

 @MACHINE@	  $(MACHINE:IX86=X86)

 @TCL_WIN_VERSION@  $(DOTVERSION).0.0

@@ -825,8 +818,8 @@ depend:
 	@echo Build tclsh first!

 !else

 	$(TCLSH) $(TOOLSDIR:\=/)/mkdepend.tcl -vc32 -out:"$(OUT_DIR)\depend.mk" \

-		-passthru:"-DBUILD_tcl $(TCL_INCLUDES) $(PRJ_INCLUDES)" $(GENERICDIR),$$(GENERICDIR) \

-		$(COMPATDIR),$$(COMPATDIR) $(TOMMATHDIR),$$(TOMMATHDIR) $(WINDIR),$$(WINDIR) @<<

+		-passthru:"/DBUILD_tcl $(TCL_INCLUDES) $(PRJ_INCLUDES)" $(GENERICDIR),$$(GENERICDIR) \

+		$(COMPATDIR),$$(COMPATDIR) $(TOMMATHDIR),$$(TOMMATHDIR) $(WIN_DIR),$$(WIN_DIR) @<<

 $(TCLOBJS)

 <<

 !endif

@@ -863,7 +856,7 @@ $<
 $<

 <<

 

-$(TMP_DIR)\tclsh.res: $(TMP_DIR)\tclsh.exe.manifest $(WINDIR)\tclsh.rc

+$(TMP_DIR)\tclsh.res: $(TMP_DIR)\tclsh.exe.manifest $(WIN_DIR)\tclsh.rc

 

 

 #---------------------------------------------------------------------

@@ -887,16 +880,18 @@ install-binaries:
 install-libraries: tclConfig tcl-nmake install-msgs install-tzdata

 	@if not exist "$(SCRIPT_INSTALL_DIR)" \

 		$(MKDIR) "$(SCRIPT_INSTALL_DIR)"

-	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8" \

-		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8"

-	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4" \

-		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4"

-	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\platform" \

-		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\platform"

-	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.5" \

-		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.5"

-	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.6" \

-		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.6"

+	@if not exist "$(SCRIPT_INSTALL_DIR)\opt0.4" \

+		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\opt0.4"

+	@if not exist "$(MODULE_INSTALL_DIR)" \

+		$(MKDIR) "$(MODULE_INSTALL_DIR)"

+	@if not exist "$(MODULE_INSTALL_DIR)\8.4" \

+		$(MKDIR) "$(MODULE_INSTALL_DIR)\8.4"

+	@if not exist "$(MODULE_INSTALL_DIR)\8.4\platform" \

+		$(MKDIR) "$(MODULE_INSTALL_DIR)\8.4\platform"

+	@if not exist "$(MODULE_INSTALL_DIR)\8.5" \

+		$(MKDIR) "$(MODULE_INSTALL_DIR)\8.5"

+	@if not exist "$(MODULE_INSTALL_DIR)\8.6" \

+		$(MKDIR) "$(MODULE_INSTALL_DIR)\8.6"

 	@if not exist "$(LIB_INSTALL_DIR)\nmake" \

 		$(MKDIR) "$(LIB_INSTALL_DIR)\nmake"

 	@echo Installing header files

@@ -907,8 +902,6 @@ install-libraries: tclConfig tcl-nmake install-msgs install-tzdata
 	@$(CPY) "$(GENERICDIR)\tclPlatDecls.h"    "$(INCLUDE_INSTALL_DIR)\"

 	@$(CPY) "$(GENERICDIR)\tclTomMath.h"      "$(INCLUDE_INSTALL_DIR)\"

 	@$(CPY) "$(GENERICDIR)\tclTomMathDecls.h" "$(INCLUDE_INSTALL_DIR)\"

-	@$(CPY) "$(TOMMATHDIR)\tommath_class.h"   "$(INCLUDE_INSTALL_DIR)\"

-	@$(CPY) "$(TOMMATHDIR)\tommath_superclass.h" "$(INCLUDE_INSTALL_DIR)\"

 	@echo Installing library files to $(SCRIPT_INSTALL_DIR)

 	@$(CPY) "$(ROOT)\library\history.tcl"     "$(SCRIPT_INSTALL_DIR)\"

 	@$(CPY) "$(ROOT)\library\init.tcl"        "$(SCRIPT_INSTALL_DIR)\"

@@ -921,32 +914,32 @@ install-libraries: tclConfig tcl-nmake install-msgs install-tzdata
 	@$(CPY) "$(ROOT)\library\word.tcl"        "$(SCRIPT_INSTALL_DIR)\"

 	@$(CPY) "$(ROOT)\library\auto.tcl"        "$(SCRIPT_INSTALL_DIR)\"

 	@$(CPY) "$(OUT_DIR)\tclConfig.sh"         "$(LIB_INSTALL_DIR)\"

-	@$(CPY) "$(WINDIR)\tclooConfig.sh"        "$(LIB_INSTALL_DIR)\"

-	@$(CPY) "$(WINDIR)\rules.vc"              "$(LIB_INSTALL_DIR)\nmake\"

-	@$(CPY) "$(WINDIR)\targets.vc"              "$(LIB_INSTALL_DIR)\nmake\"

-	@$(CPY) "$(WINDIR)\nmakehlp.c"            "$(LIB_INSTALL_DIR)\nmake\"

+	@$(CPY) "$(WIN_DIR)\tclooConfig.sh"        "$(LIB_INSTALL_DIR)\"

+	@$(CPY) "$(WIN_DIR)\rules.vc"              "$(LIB_INSTALL_DIR)\nmake\"

+	@$(CPY) "$(WIN_DIR)\targets.vc"              "$(LIB_INSTALL_DIR)\nmake\"

+	@$(CPY) "$(WIN_DIR)\nmakehlp.c"            "$(LIB_INSTALL_DIR)\nmake\"

 	@$(CPY) "$(OUT_DIR)\tcl.nmake"            "$(LIB_INSTALL_DIR)\nmake\"

-	@echo Installing library http1.0 directory

+	@echo Installing package http 1.0 (obsolete)

 	@$(CPY) "$(ROOT)\library\http1.0\*.tcl" \

 	    "$(SCRIPT_INSTALL_DIR)\http1.0\"

-	@echo Installing library opt0.4 directory

+	@echo Installing package opt $(PKG_OPT_VER)

 	@$(CPY) "$(ROOT)\library\opt\*.tcl" \

 	    "$(SCRIPT_INSTALL_DIR)\opt0.4\"

 	@echo Installing package http $(PKG_HTTP_VER) as a Tcl Module

 	@$(COPY) "$(ROOT)\library\http\http.tcl" \

-	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.6\http-$(PKG_HTTP_VER).tm"

+	    "$(MODULE_INSTALL_DIR)\8.6\http-$(PKG_HTTP_VER).tm"

 	@echo Installing package msgcat $(PKG_MSGCAT_VER) as a Tcl Module

 	@$(COPY) "$(ROOT)\library\msgcat\msgcat.tcl" \

-	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.5\msgcat-$(PKG_MSGCAT_VER).tm"

+	    "$(MODULE_INSTALL_DIR)\8.5\msgcat-$(PKG_MSGCAT_VER).tm"

 	@echo Installing package tcltest $(PKG_TCLTEST_VER) as a Tcl Module

 	@$(COPY) "$(ROOT)\library\tcltest\tcltest.tcl" \

-	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.5\tcltest-$(PKG_TCLTEST_VER).tm"

+	    "$(MODULE_INSTALL_DIR)\8.5\tcltest-$(PKG_TCLTEST_VER).tm"

 	@echo Installing package platform $(PKG_PLATFORM_VER) as a Tcl Module

 	@$(COPY) "$(ROOT)\library\platform\platform.tcl" \

-	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\platform-$(PKG_PLATFORM_VER).tm"

+	    "$(MODULE_INSTALL_DIR)\8.4\platform-$(PKG_PLATFORM_VER).tm"

 	@echo Installing package platform::shell $(PKG_SHELL_VER) as a Tcl Module

 	@$(COPY) "$(ROOT)\library\platform\shell.tcl" \

-	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\platform\shell-$(PKG_SHELL_VER).tm"

+	    "$(MODULE_INSTALL_DIR)\8.4\platform\shell-$(PKG_SHELL_VER).tm"

 	@echo Installing $(TCLDDELIBNAME)

 !if $(STATIC_BUILD)

 !if !$(TCL_USE_STATIC_PACKAGES)