Merge 8.7

3 files changed, 22 insertions, 14 deletions

diff --git a/win/Makefile.in b/win/Makefile.in
index 9febe60..b96d3d6 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -846,7 +846,7 @@ install-libraries: libraries install-tzdata install-msgs
 		else true; \
 		fi; \
 	    done;
-	@for i in opt0.4 cookiejar0.1 encoding ../tcl8 ../tcl8/8.4  ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6 ../tcl8/8.7; \
+	@for i in opt0.4 cookiejar0.2 encoding ../tcl8 ../tcl8/8.4  ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6 ../tcl8/8.7; \
 	    do \
 	    if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \
 		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
@@ -859,14 +859,14 @@ install-libraries: libraries install-tzdata install-msgs
 	    do \
 	    $(COPY) "$$i" "$(SCRIPT_INSTALL_DIR)"; \
 	    done;
-	@echo "Installing package cookiejar 0.1 files to $(SCRIPT_INSTALL_DIR)/cookiejar0.1/"
-	@for j in $(ROOT_DIR)/library/cookiejar/*.{tcl,txt.gz}; do \
+	@echo "Installing package cookiejar 0.2"
+	@for j in $(ROOT_DIR)/library/cookiejar/*.{tcl,txt.gz}; \
 	    do \
-	    $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/cookiejar0.1"; \
+	    $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/cookiejar0.2"; \
 	    done;
 	@echo "Installing package http 2.9.1 as a Tcl Module";
 	@$(COPY) $(ROOT_DIR)/library/http/http.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.6/http-2.9.1.tm;
-	@echo "Installing library opt0.4 directory";
+	@echo "Installing package opt 0.4.7";
 	@for j in $(ROOT_DIR)/library/opt/*.tcl; \
 	    do \
 	    $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/opt0.4"; \
diff --git a/win/makefile.vc b/win/makefile.vc
index e5629ff..45bb0b9 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -154,6 +154,12 @@ 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_COOKIEJAR_VER = \>> versions.vc] \

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

+!endif

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

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

 !endif

@@ -431,7 +437,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 /DMP_FIXED_CUTOFFS /DMP_NO_STDINT /DMP_WUR=

+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 /DMP_WUR=

 

 # Additional Link libraries needed beyond those in rules.vc

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

@@ -897,8 +903,8 @@ install-libraries: tclConfig tcl-nmake install-msgs install-tzdata
 		$(MKDIR) "$(SCRIPT_INSTALL_DIR)"

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

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

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

-		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\cookiejar0.1"

+	@if not exist "$(SCRIPT_INSTALL_DIR)\cookiejar0.2" \

+		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\cookiejar0.2"

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

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

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

@@ -939,13 +945,13 @@ install-libraries: tclConfig tcl-nmake install-msgs install-tzdata
 	@$(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 package cookiejar 0.1 files to $(SCRIPT_INSTALL_DIR)/cookiejar0.1/

+	@echo Installing package cookiejar $(PKG_COOKIEJAR_VER)

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

-	    "$(SCRIPT_INSTALL_DIR)\cookiejar0.1\"

+	    "$(SCRIPT_INSTALL_DIR)\cookiejar0.2\"

 	@$(CPY) "$(ROOT)\library\cookiejar\*.gz" \

-	    "$(SCRIPT_INSTALL_DIR)\cookiejar0.1\"

-	@echo Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/

-	@$(CPY) "$(ROOT)\library\opt0.4\*.tcl" \

+	    "$(SCRIPT_INSTALL_DIR)\cookiejar0.2\"

+	@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" \

diff --git a/win/rules.vc b/win/rules.vc
index 75bc185..cdd8068 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -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 = 5

+RULES_VERSION_MINOR = 6

 

 # The PROJECT macro must be defined by parent makefile.

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

@@ -1299,6 +1299,8 @@ INCLUDE_INSTALL_DIR	= $(_INSTALLDIR)\..\include
 OPTDEFINES	= /DTCL_CFGVAL_ENCODING=$(CFG_ENCODING) /DSTDC_HEADERS

 !if $(VCVERSION) >= 1600

 OPTDEFINES	= $(OPTDEFINES) /DHAVE_STDINT_H=1

+!else

+OPTDEFINES	= $(OPTDEFINES) /DMP_NO_STDINT=1

 !endif

 !if $(VCVERSION) >= 1700

 OPTDEFINES	= $(OPTDEFINES) /DHAVE_INTTYPES_H=1