Merge 8.7

12 files changed, 44 insertions, 27 deletions

diff --git a/library/cookiejar/cookiejar.tcl b/library/cookiejar/cookiejar.tcl
index 4aea842..22f0f30 100644
--- a/library/cookiejar/cookiejar.tcl
+++ b/library/cookiejar/cookiejar.tcl
@@ -54,7 +54,7 @@ namespace eval [info object namespace ::http::cookiejar] {
 
     # Keep this in sync with pkgIndex.tcl and with the install directories in
     # Makefiles
-    variable version 0.1
+    variable version 0.2.0
 
     variable domainlist \
 	http://publicsuffix.org/list/effective_tld_names.dat
diff --git a/library/cookiejar/idna.tcl b/library/cookiejar/idna.tcl
index 2a7d289..1ab9fc4 100644
--- a/library/cookiejar/idna.tcl
+++ b/library/cookiejar/idna.tcl
@@ -284,7 +284,7 @@ namespace eval ::tcl::idna {
     }
 }
 
-package provide tcl::idna 1.0
+package provide tcl::idna 1.0.1
 
 # Local variables:
 # mode: tcl
diff --git a/library/cookiejar/pkgIndex.tcl b/library/cookiejar/pkgIndex.tcl
index a8d8742..b1853aa 100644
--- a/library/cookiejar/pkgIndex.tcl
+++ b/library/cookiejar/pkgIndex.tcl
@@ -1,3 +1,3 @@
 if {![package vsatisfies [package provide Tcl] 8.6-]} {return}
-package ifneeded cookiejar 0.1 [list source [file join $dir cookiejar.tcl]]
-package ifneeded tcl::idna 1.0 [list source [file join $dir idna.tcl]]
+package ifneeded cookiejar 0.2.0 [list source [file join $dir cookiejar.tcl]]
+package ifneeded tcl::idna 1.0.1 [list source [file join $dir idna.tcl]]
diff --git a/library/manifest.txt b/library/manifest.txt
index 6bbbb51..620f8b8 100644
--- a/library/manifest.txt
+++ b/library/manifest.txt
@@ -8,8 +8,8 @@ apply {{dir} {
     0 http            2.9.1 {http http.tcl}
     1 msgcat          1.7.0  {msgcat msgcat.tcl}
     1 opt             0.4.7  {opt optparse.tcl}
-    0 cookiejar       0.1    {cookiejar cookiejar.tcl}
-    0 tcl::idna       1.0    {cookiejar idna.tcl}
+    0 cookiejar       0.2.0  {cookiejar cookiejar.tcl}
+    0 tcl::idna       1.0.1  {cookiejar idna.tcl}
     0 platform        1.0.14 {platform platform.tcl}
     0 platform::shell 1.1.4  {platform shell.tcl}
     1 tcltest         2.5.1  {tcltest tcltest.tcl}
diff --git a/library/safe.tcl b/library/safe.tcl
index ef370b5..0f90372 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -20,7 +20,7 @@
 #
 
 # Needed utilities package
-package require opt 0.4.1
+package require opt 0.4.7
 
 # Create the safe namespace
 namespace eval ::safe {
diff --git a/tests/http.test b/tests/http.test
index 2184449..3f0b55d 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -670,7 +670,7 @@ test http-7.4 {http::formatQuery} -setup {
     http::config -urlencoding $enc
 } -result {%3F}
 
-package require -exact tcl::idna 1.0
+package require tcl::idna 1.0
 
 test http-idna-1.1 {IDNA package: basics} -returnCodes error -body {
     ::tcl::idna
diff --git a/tests/opt.test b/tests/opt.test
index 2732d40..14a6e04 100644
--- a/tests/opt.test
+++ b/tests/opt.test
@@ -17,7 +17,7 @@ if {[lsearch [namespace children] ::tcltest] == -1} {
 }
 
 # the package we are going to test
-package require opt 0.4.6
+package require opt 0.4.7
 
 # we are using implementation specifics to test the package
 
diff --git a/unix/Makefile.in b/unix/Makefile.in
index b40eb07..83022da 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1014,7 +1014,7 @@ install-libraries: libraries
 		$(INSTALL_DATA_DIR) "$$i"; \
 	    fi; \
 	done
-	@for i in opt0.4 cookiejar0.1 encoding ../tcl9 ../tcl9/9.0  ../tcl9/9.0/platform; do \
+	@for i in opt0.4 cookiejar0.2 encoding ../tcl9 ../tcl9/9.0  ../tcl9/9.0/platform; do \
 	    if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
 		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
 		$(INSTALL_DATA_DIR) "$(SCRIPT_INSTALL_DIR)"/$$i; \
@@ -1025,14 +1025,14 @@ install-libraries: libraries
 		$(UNIX_DIR)/tclAppInit.c @LDAIX_SRC@ @DTRACE_SRC@ ; do \
 	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \
 	done
-	@echo "Installing package cookiejar 0.1 files to $(SCRIPT_INSTALL_DIR)/cookiejar0.1/"
+	@echo "Installing package cookiejar 0.2 files to $(SCRIPT_INSTALL_DIR)/cookiejar0.2/"
 	@for i in $(TOP_DIR)/library/cookiejar/*.{tcl,txt.gz}; do \
-	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/cookiejar0.1; \
+	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/cookiejar0.2; \
 	done
 	@echo "Installing package http 2.9.1 as a Tcl Module"
 	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl \
 		"$(MODULE_INSTALL_DIR)"/tcl9/9.0/http-2.9.1.tm
-	@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/"
+	@echo "Installing package opt 0.4.7"
 	@for i in $(TOP_DIR)/library/opt/*.tcl; do \
 	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/opt0.4; \
 	done
diff --git a/win/Makefile.in b/win/Makefile.in
index 14accef..92e93fa 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -850,7 +850,7 @@ install-libraries: libraries install-tzdata install-msgs
 		else true; \
 		fi; \
 	    done;
-	@for i in opt0.4 cookiejar0.1 encoding ../tcl9 ../tcl9/9.0 ../tcl9/9.0/platform; \
+	@for i in opt0.4 cookiejar0.2 encoding ../tcl9 ../tcl9/9.0 ../tcl9/9.0/platform; \
 	    do \
 	    if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \
 		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
@@ -863,14 +863,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)/../tcl9/9.0/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 d61e403..a4cb9d7 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -152,6 +152,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

@@ -423,7 +429,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

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

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

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

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

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

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

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

 	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl9$(NULL)" \

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

 	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl9\9.0$(NULL)" \

@@ -914,12 +920,12 @@ 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/

+	    "$(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

diff --git a/win/rules.vc b/win/rules.vc
index 6081714..33d80b7 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)" == ""

@@ -1275,6 +1275,17 @@ INCLUDE_INSTALL_DIR	= $(_INSTALLDIR)\..\include
 #    define PRJ_LIBS before including rules.rc if additional libs are needed

 

 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

+!endif

+!if $(VCVERSION) >= 1800

+OPTDEFINES	= $(OPTDEFINES) /DHAVE_STDBOOL_H=1

+!endif

 

 !if $(TCL_MEM_DEBUG)

 OPTDEFINES	= $(OPTDEFINES) /DTCL_MEM_DEBUG

diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index 9cbbd99..8882046 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -81,7 +81,7 @@ typedef DWORD_PTR * PDWORD_PTR;
 #include <malloc.h>
 #include <process.h>
 #include <signal.h>
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
 #   include <inttypes.h>
 #endif
 #include <limits.h>