Merge 9.0

1 files changed, 10 insertions, 16 deletions

diff --git a/win/makefile.vc b/win/makefile.vc
index 2e3a080..22dcc78 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -206,10 +206,10 @@ DDEVERSION = $(DDEDOTVERSION:.=)
 REGDOTVERSION = 1.3

 REGVERSION = $(REGDOTVERSION:.=)

 

-TCLREGLIBNAME	= $(PROJECT)registry$(REGVERSION)$(SUFX:t=).$(EXT)

+TCLREGLIBNAME	= $(PROJECT)9registry$(REGVERSION)$(SUFX:t=).$(EXT)

 TCLREGLIB	= $(OUT_DIR)\$(TCLREGLIBNAME)

 

-TCLDDELIBNAME	= $(PROJECT)dde$(DDEVERSION)$(SUFX:t=).$(EXT)

+TCLDDELIBNAME	= $(PROJECT)9dde$(DDEVERSION)$(SUFX:t=).$(EXT)

 TCLDDELIB	= $(OUT_DIR)\$(TCLDDELIBNAME)

 

 TCLTEST		= $(OUT_DIR)\$(PROJECT)test.exe

@@ -390,6 +390,7 @@ TOMMATHOBJS = \
 	$(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_unpack.obj \

 	$(TMP_DIR)\bn_mp_xor.obj \

 	$(TMP_DIR)\bn_mp_zero.obj \

 	$(TMP_DIR)\bn_s_mp_add.obj \

@@ -443,14 +444,7 @@ TCLSTUBOBJS = \
 TOMMATHDIR	= $(ROOT)\libtommath

 PKGSDIR		= $(ROOT)\pkgs

 

-# TIP430 ZIP file

 LIBTCLVFS = $(OUT_DIR)\libtcl.vfs

-!if "$(TCL_PATCH_LETTER)" == "."

-LIBTCLZIP = $(OUT_DIR)\libtcl_$(TCL_MAJOR_VERSION)_$(TCL_MINOR_VERSION)_$(TCL_RELEASE_SERIAL).zip

-!else

-LIBTCLZIP = $(OUT_DIR)\libtcl_$(TCL_MAJOR_VERSION)_$(TCL_MINOR_VERSION)_$(TCL_PATCH_LETTER)$(TCL_RELEASE_SERIAL).zip

-!endif

-

 

 # Additional include and C macro definitions for the implicit rules

 # defined in rules.vc

@@ -477,14 +471,14 @@ release:    setup $(TCLSH) $(TCLSTUBLIB) dlls libtclzip embed pkgs
 core:	    setup $(TCLLIB) $(TCLSTUBLIB)

 shell:	    setup $(TCLSH)

 dlls:	    setup $(TCLREGLIB) $(TCLDDELIB) $(OUT_DIR)\zlib1.dll $(OUT_DIR)\libtommath.dll

-libtclzip:  core dlls $(LIBTCLZIP)

+libtclzip:  core dlls $(TCLSCRIPTZIP)

 all:	    setup $(TCLSH) $(TCLSTUBLIB) dlls libtclzip embed pkgs

 embed:      setup $(TCLSH) $(TCLSTUBLIB) libtclzip

 !if $(TCL_EMBED_SCRIPTS)

 !if $(STATIC_BUILD)

-	@copy /y /b "$(TCLSH)"+"$(LIBTCLZIP)" "$(TCLSH)"

+	@copy /y /b "$(TCLSH)"+"$(TCLSCRIPTZIP)" "$(TCLSH)"

 !else

-	@copy /y /b "$(TCLLIB)"+"$(LIBTCLZIP)" "$(TCLLIB)"

+	@copy /y /b "$(TCLLIB)"+"$(TCLSCRIPTZIP)" "$(TCLLIB)"

 !endif

 !endif

 

@@ -499,8 +493,8 @@ test: test-core test-pkgs
 test-core: setup $(TCLTEST) dlls

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

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

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

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

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

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

 <<

 

 runtest: setup $(TCLTEST) dlls

@@ -579,7 +573,7 @@ $(OUT_DIR)\tommath.lib:	$(TOMMATHDIR)\win32\tommath.lib
 	$(COPY) $(TOMMATHDIR)\win32\tommath.lib $(OUT_DIR)\tommath.lib

 !endif

 

-$(LIBTCLZIP): .PHONY

+$(TCLSCRIPTZIP): .PHONY

 	@echo Building Tcl library zip file

 	@if exist "$(LIBTCLVFS)" $(RMDIR) "$(LIBTCLVFS)"

 	@$(MKDIR) "$(LIBTCLVFS)"

@@ -1002,7 +996,7 @@ install-libraries: tclConfig tcl-nmake install-msgs install-tzdata
 !endif

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

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

-	@$(CPY) "$(LIBTCLZIP)"                    "$(LIB_INSTALL_DIR)\"

+	@$(CPY) "$(TCLSCRIPTZIP)"                    "$(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\"