From 499e962572ad76700414e1c910b330ac52578cf8 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 17 Feb 2021 08:32:53 +0000
Subject: Don't try to use ln when creating libtcl.vfs on windows: It doesn't
 work for encodings or msg-files (anything on a deeper level) when zipping (at
 least not on cygwin)

---
 win/Makefile.in | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/win/Makefile.in b/win/Makefile.in
index cdaeec4..3a8e0a9 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -524,15 +524,6 @@ ${TCL_ZIP_FILE}:  ${ZIP_INSTALL_OBJS} ${DDE_DLL_FILE} ${REG_DLL_FILE}
 	@mkdir -p ${TCL_VFS_PATH}
 	@echo "creating ${TCL_VFS_PATH} (prepare compression)"
 	@( \
-	  $(LN) $$(find $(TOP_DIR)/library/* -maxdepth 0 -type f) ${TCL_VFS_PATH}/ && \
-	  (for D in $$(find $(TOP_DIR)/library/* -maxdepth 0 -type d); do \
-	    mkdir -p "${TCL_VFS_PATH}/$$(basename $$D)"; \
-	    $(LN) -s $$D/* ${TCL_VFS_PATH}/$$(basename $$D)/; \
-	  done) && \
-	  $(LN) ${TCL_VFS_PATH}/manifest.txt ${TCL_VFS_PATH}/pkgIndex.tcl && \
-	  $(LN) ${DDE_DLL_FILE} ${TCL_VFS_PATH}/dde/ && \
-	  $(LN) ${REG_DLL_FILE} ${TCL_VFS_PATH}/registry/ \
-	) || ( \
 	  $(COPY) -a $(TOP_DIR)/library/* ${TCL_VFS_PATH}; \
 	  $(COPY) -a ${TCL_VFS_PATH}/manifest.txt ${TCL_VFS_PATH}/pkgIndex.tcl; \
 	  $(COPY) ${DDE_DLL_FILE} ${TCL_VFS_PATH}/dde; \
-- 
cgit v0.12


From b3d34ad31717286dabbaa72b93d7ff5f3e0626a6 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 17 Feb 2021 08:35:44 +0000
Subject: Another TIP #430 fix for cygwin: libtcl8.7.dll is installed in
 /usr/bin, not in /usr/lib as on other platforms

---
 generic/tclZipfs.c | 15 ++++++---------
 unix/Makefile.in   |  2 +-
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c
index 0d646aa..f052c2e 100644
--- a/generic/tclZipfs.c
+++ b/generic/tclZipfs.c
@@ -3157,18 +3157,15 @@ TclZipfs_TclLibrary(void)
 	return Tcl_NewStringObj(zipfs_literal_tcl_library, -1);
     }
 #else
-# if defined(CFG_RUNTIME_LIBDIR)
     if (ZipfsAppHookFindTclInit(
-	    CFG_RUNTIME_LIBDIR "/" CFG_RUNTIME_DLLFILE) == TCL_OK) {
-	return Tcl_NewStringObj(zipfs_literal_tcl_library, -1);
-    }
-# endif
-# if defined(CFG_RUNTIME_BINDIR)
-    if (ZipfsAppHookFindTclInit(
-	    CFG_RUNTIME_BINDIR "/" CFG_RUNTIME_DLLFILE) == TCL_OK) {
+#ifdef __CYGWIN__
+		CFG_RUNTIME_BINDIR
+#else
+		CFG_RUNTIME_LIBDIR
+#endif
+		"/" CFG_RUNTIME_DLLFILE) == TCL_OK) {
 	return Tcl_NewStringObj(zipfs_literal_tcl_library, -1);
     }
-# endif
 #endif /* _WIN32 */
 #endif /* !defined(STATIC_BUILD) */
 
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 32b99a2..9c64d05 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1523,7 +1523,7 @@ tclZipfs.o: $(GENERIC_DIR)/tclZipfs.c
 	$(CC) -c $(CC_SWITCHES) \
 		-DCFG_RUNTIME_DLLFILE="\"$(TCL_LIB_FILE)\"" \
 		-DCFG_RUNTIME_LIBDIR="\"$(libdir)\"" \
-		-DCFG_RUNTIME_SCRDIR="\"$(TCL_LIBRARY)\"" \
+		-DCFG_RUNTIME_BINDIR="\"$(bindir)\"" \
 		-I$(ZLIB_DIR) -I$(ZLIB_DIR)/contrib/minizip \
 		$(GENERIC_DIR)/tclZipfs.c
 
-- 
cgit v0.12


From 6ee6cd1ae4ffb8a3fe3e602632cd3f0683c392d1 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 17 Feb 2021 08:50:17 +0000
Subject: Fix "make dist" on UNIX, broken due to TIP #590

---
 unix/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unix/Makefile.in b/unix/Makefile.in
index 9c64d05..e8b5110 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -2218,7 +2218,7 @@ DISTROOT = /tmp/dist
 DISTNAME = tcl${VERSION}${PATCH_LEVEL}
 ZIPNAME	 = tcl${MAJOR_VERSION}${MINOR_VERSION}${PATCH_LEVEL}-src.zip
 DISTDIR	 = $(DISTROOT)/$(DISTNAME)
-BUILTIN_PACKAGE_LIST = cookiejar http opt msgcat reg dde tcltest platform
+BUILTIN_PACKAGE_LIST = cookiejar http opt msgcat registry dde tcltest platform
 
 $(UNIX_DIR)/configure: $(UNIX_DIR)/configure.ac $(UNIX_DIR)/tcl.m4 \
 		$(UNIX_DIR)/aclocal.m4
-- 
cgit v0.12


From 467337387f361bbb38bc6e50b6d3a5432399ef68 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 17 Feb 2021 09:41:46 +0000
Subject: Don't pack tcl_library/registry/pkgIndex in zip-file on UNIX

---
 unix/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unix/Makefile.in b/unix/Makefile.in
index e8b5110..15d80cb 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -778,7 +778,7 @@ ${TCL_ZIP_FILE}: ${ZIP_INSTALL_OBJS}
 	    cp -a $(TOP_DIR)/library/* ${TCL_VFS_PATH}; \
 	fi
 	mv ${TCL_VFS_PATH}/manifest.txt ${TCL_VFS_PATH}/pkgIndex.tcl
-	rm -rf ${TCL_VFS_PATH}/dde ${TCL_VFS_PATH}/reg
+	rm -rf ${TCL_VFS_PATH}/dde ${TCL_VFS_PATH}/registry
 	@find ${TCL_VFS_ROOT} -type d -empty -delete
 	@echo "creating ${TCL_ZIP_FILE} from ${TCL_VFS_PATH}"
 	@(zip=`(realpath '${NATIVE_ZIP}' || readlink -m '${NATIVE_ZIP}' || \
-- 
cgit v0.12