Merge 8.7

6 files changed, 15 insertions, 37 deletions

diff --git a/win/Makefile.in b/win/Makefile.in
index 95dd8ed..bb4d986 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -656,7 +656,6 @@ tclZipfs.${OBJEXT}: $(GENERIC_DIR)/tclZipfs.c
 	$(CC) -c $(CC_SWITCHES) -DBUILD_tcl \
 	-DCFG_RUNTIME_PATH="\"$(bindir_native)\"" \
 	-DCFG_RUNTIME_DLLFILE="\"$(TCL_DLL_FILE)\"" \
-	-DCFG_RUNTIME_ZIPFILE="\"$(TCL_ZIP_FILE)\"" \
 	-DCFG_RUNTIME_LIBDIR="\"$(bindir_native)\"" \
 	-DCFG_RUNTIME_SCRDIR="\"$(TCL_LIBRARY_NATIVE)\"" \
 	$(ZLIB_INCLUDE) -I$(MINIZIP_DIR_NATIVE)  @DEPARG@ $(CC_OBJNAME)
@@ -684,7 +683,6 @@ tclPkgConfig.${OBJEXT}: tclPkgConfig.c
 		-DCFG_RUNTIME_INCDIR="\"$(includedir_native)\"" \
 		-DCFG_RUNTIME_DOCDIR="\"$(mandir_native)\"" \
 		-DCFG_RUNTIME_DLLFILE="\"$(TCL_DLL_FILE)\"" \
-		-DCFG_RUNTIME_ZIPFILE="\"$(TCL_ZIP_FILE)\"" \
 		-DBUILD_tcl \
 		@DEPARG@ $(CC_OBJNAME)
 
@@ -839,11 +837,6 @@ install-binaries: binaries
 	    $(COPY) $(REG_LIB_FILE) "$(LIB_INSTALL_DIR)/registry${REGDOTVER}"; \
 	    fi
 
-install-libraries-zipfs-shared: libraries
-
-install-libraries-zipfs-static: install-libraries-zipfs-shared
-	$(COPY) ${TCL_ZIP_FILE} "$(LIB_INSTALL_DIR)"
-
 install-libraries: libraries install-tzdata install-msgs
 	@for i in "$(prefix)/lib" "$(INCLUDE_INSTALL_DIR)" \
 		"$(SCRIPT_INSTALL_DIR)" "$(MODULE_INSTALL_DIR)"; \
@@ -1126,6 +1119,6 @@ html-tk: $(TCLSH)
 .PHONY: gdb depend cleanhelp clean distclean packages install-packages
 .PHONY: test-packages clean-packages distclean-packages genstubs html
 .PHONY: html-tcl html-tk
-.PHONY: iinstall-libraries-zipfs-shared install-libraries-zipfs-static tclzipfile
+.PHONY: tclzipfile
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/win/configure b/win/configure
index 9c9a8e7..e3f299f 100755
--- a/win/configure
+++ b/win/configure
@@ -5113,7 +5113,7 @@ printf "%s\n" "No zip found on PATH building minizip" >&6; }
 
 
 	ZIPFS_BUILD=1
-	TCL_ZIP_FILE=libtcl_${TCL_MAJOR_VERSION}_${TCL_MINOR_VERSION}${TCL_PATCH_LEVEL}.zip
+	TCL_ZIP_FILE=libtcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}${TCL_PATCH_LEVEL}.zip
 else
 	ZIPFS_BUILD=0
 	TCL_ZIP_FILE=
@@ -5127,17 +5127,13 @@ if test "${ZIPFS_BUILD}" = 1; then
 
 printf "%s\n" "#define ZIPFS_BUILD 2" >>confdefs.h
 
-       INSTALL_LIBRARIES=install-libraries-zipfs-static
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
      else
 
 printf "%s\n" "#define ZIPFS_BUILD 1" >>confdefs.h
 \
-       INSTALL_LIBRARIES=install-libraries-zipfs-shared
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
     fi
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 else
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
diff --git a/win/configure.ac b/win/configure.ac
index 4590a95..b412ec2 100644
--- a/win/configure.ac
+++ b/win/configure.ac
@@ -166,7 +166,7 @@ if test "$tcl_ok" = "yes" ; then
     SC_PROG_TCLSH
     SC_ZIPFS_SUPPORT
 	ZIPFS_BUILD=1
-	TCL_ZIP_FILE=libtcl_${TCL_MAJOR_VERSION}_${TCL_MINOR_VERSION}${TCL_PATCH_LEVEL}.zip
+	TCL_ZIP_FILE=libtcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}${TCL_PATCH_LEVEL}.zip
 else
 	ZIPFS_BUILD=0
 	TCL_ZIP_FILE=
@@ -177,13 +177,10 @@ if test "${ZIPFS_BUILD}" = 1; then
     if test "${SHARED_BUILD}" = 0; then
        ZIPFS_BUILD=2;
        AC_DEFINE(ZIPFS_BUILD, 2, [Are we building with zipfs enabled?])
-       INSTALL_LIBRARIES=install-libraries-zipfs-static
-       AC_MSG_RESULT([yes])
      else
        AC_DEFINE(ZIPFS_BUILD, 1, [Are we building with zipfs enabled?])\
-       INSTALL_LIBRARIES=install-libraries-zipfs-shared
-       AC_MSG_RESULT([yes])
     fi
+    AC_MSG_RESULT([yes])
 else
 AC_MSG_RESULT([no])
 INSTALL_LIBRARIES=install-libraries
diff --git a/win/makefile.vc b/win/makefile.vc
index 36e194d..386d4ff 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -573,18 +573,21 @@ $(OUT_DIR)\tommath.lib:	$(TOMMATHDIR)\win32\tommath.lib
 	$(COPY) $(TOMMATHDIR)\win32\tommath.lib $(OUT_DIR)\tommath.lib

 !endif

 

-$(TCLSCRIPTZIP): .PHONY

+$(TCLSCRIPTZIP): $(TCLDDELIB) $(TCLREGLIB)

 	@echo Building Tcl library zip file

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

 	@$(MKDIR) "$(LIBTCLVFS)"

 	@$(CPYDIR) $(LIBDIR) "$(LIBTCLVFS)\tcl_library"

 	@move /y "$(LIBTCLVFS)\tcl_library\manifest.txt"  "$(LIBTCLVFS)\tcl_library\pkgIndex.tcl" > NUL

-!if ! $(STATIC_BUILD)

+!if $(STATIC_BUILD)

 # Remove the registry and dde directories as the DLLS are still external

 	@del "$(LIBTCLVFS)\tcl_library\registry\pkgIndex.tcl"

 	@rmdir "$(LIBTCLVFS)\tcl_library\registry"

 	@del "$(LIBTCLVFS)\tcl_library\dde\pkgIndex.tcl"

 	@rmdir "$(LIBTCLVFS)\tcl_library\dde"

+!else

+    @$(COPY) $(TCLDDELIB) "$(LIBTCLVFS)\tcl_library\dde

+    @$(COPY) $(TCLREGLIB) "$(LIBTCLVFS)\tcl_library\registry

 !endif

 	@echo file delete -force {$@} > "$(OUT_DIR)\zipper.tcl"

 	@echo zipfs mkzip {$@} {$(LIBTCLVFS)} {$(LIBTCLVFS)} >> "$(OUT_DIR)\zipper.tcl"

@@ -821,7 +824,7 @@ $(TMP_DIR)\tclZlib.obj: $(GENERICDIR)\tclZlib.c
 	$(cc32) $(pkgcflags) -I$(COMPATDIR)\zlib -Fo$@ $?

 

 # Following the lead of the autoconf based make, we define the

-# CFG_RUNTIME_DLLFILE and CFG_RUNTIME_ZIPFILE flags specifically for tclPkgConfig

+# CFG_RUNTIME_*DIR flags specifically for tclPkgConfig

 # and not as part of the global defines. These are all defined

 # as empty strings because they are intended to represent paths

 # at *runtime*, not build time. This may make sense on Unix systems

@@ -845,8 +848,7 @@ $(TMP_DIR)\tclPkgConfig.obj: $(GENERICDIR)\tclPkgConfig.c
 	/DCFG_RUNTIME_SCRDIR="\"$(SCRIPT_INSTALL_DIR:\=\\)\"" \

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

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

-	/DCFG_RUNTIME_DLLFILE="\"\""     \

-	/DCFG_RUNTIME_ZIPFILE="\"\""     \

+	/DCFG_RUNTIME_DLLFILE="\"$(TCL_LIB_FILE)\""     \

 	-Fo$@ $?

 

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

diff --git a/win/rules.vc b/win/rules.vc
index e678c34..2ec5292 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -1122,16 +1122,8 @@ STUBPREFIX      = $(PROJECT)stub
 #

 

 # TIP 430. Unused for 8.6 but no harm defining it to allow a common rules.vc

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

-TCLSCRIPTZIPNAME = libtcl_$(TCL_MAJOR_VERSION)_$(TCL_MINOR_VERSION)_$(TCL_RELEASE_SERIAL).zip

-!else

-TCLSCRIPTZIPNAME = libtcl_$(TCL_MAJOR_VERSION)_$(TCL_MINOR_VERSION)_$(TCL_PATCH_LETTER)$(TCL_RELEASE_SERIAL).zip

-!endif

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

-TKSCRIPTZIPNAME = libtk_$(TK_MAJOR_VERSION)_$(TK_MINOR_VERSION)_$(TK_RELEASE_SERIAL).zip

-!else

-TKSCRIPTZIPNAME = libtk_$(TK_MAJOR_VERSION)_$(TK_MINOR_VERSION)_$(TK_PATCH_LETTER)$(TK_RELEASE_SERIAL).zip

-!endif

+TCLSCRIPTZIPNAME = libtcl$(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)$(TCL_PATCH_LETTER)$(TCL_RELEASE_SERIAL).zip

+TKSCRIPTZIPNAME = libtk$(TK_MAJOR_VERSION)$(TK_MINOR_VERSION)$(TK_PATCH_LETTER)$(TK_RELEASE_SERIAL).zip

 

 !if $(DOING_TCL)

 TCLSHNAME       = $(PROJECT)sh$(VERSION)$(SUFX).exe

diff --git a/win/tcl.m4 b/win/tcl.m4
index 773f8ae..dd9110b 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -251,7 +251,6 @@ AC_DEFUN([SC_PATH_TKCONFIG], [
 #		TCL_BIN_DIR
 #		TCL_SRC_DIR
 #		TCL_LIB_FILE
-#		TCL_ZIP_FILE
 #
 #------------------------------------------------------------------------
 
@@ -288,7 +287,6 @@ AC_DEFUN([SC_LOAD_TCLCONFIG], [
     AC_SUBST(TCL_BIN_DIR)
     AC_SUBST(TCL_SRC_DIR)
 
-    AC_SUBST(TCL_ZIP_FILE)
     AC_SUBST(TCL_LIB_FILE)
     AC_SUBST(TCL_LIB_FLAG)
     AC_SUBST(TCL_LIB_SPEC)