Make TIP #430 (finally) work with Tk.

5 files changed, 25 insertions, 7 deletions

diff --git a/win/Makefile.in b/win/Makefile.in
index ed5fdae..836df4a 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -656,11 +656,16 @@ install-private-headers: libraries
 	    $(INSTALL_DATA) $$i $(PRIVATE_INCLUDE_INSTALL_DIR); \
 	    done;
 
-$(WISH): $(WISH_OBJS) @LIBRARIES@ $(TK_STUB_LIB_FILE) wish.$(RES)
+$(WISH): $(WISH_OBJS) @LIBRARIES@ $(TK_STUB_LIB_FILE) wish.$(RES) ${TK_ZIP_FILE}
 	$(CC) $(CFLAGS) $(WISH_OBJS) $(TK_LIB_FILE) \
 	$(TK_STUB_LIB_FILE) $(TCL_LIB_FILE) $(LIBS) \
 	wish.$(RES) $(CC_EXENAME) $(LDFLAGS_WINDOW)
 	@VC_MANIFEST_EMBED_EXE@
+	@if test "${ZIPFS_BUILD}" = "2" ; then \
+		cat ${TK_ZIP_FILE} >> ${WISH}; \
+		${NATIVE_ZIP} -A ${WISH} \
+		  || echo 'ignore zip-error by adjust sfx process (not executable?)'; \
+	fi
 
 tktest: $(TKTEST)
 
@@ -697,6 +702,12 @@ ${TK_ZIP_FILE}:  ${ZIP_INSTALL_OBJS}
 	) || ( \
 	  $(COPY) -a $(TOP_DIR)/library/* ${TK_VFS_PATH}; \
 	)
+	$(RMDIR) ${TCL_VFS_PATH}/demos
+	@if test "${ZIPFS_BUILD}" = "2" ; then \
+	    (zip=`(realpath '${NATIVE_ZIP}' || readlink -m '${NATIVE_ZIP}') 2>/dev/null || \
+		(echo '${NATIVE_ZIP}' | sed "s?^\./?$$(pwd)/?")`; \
+		cd ${TK_VFS_ROOT} && cp ${BUILD_TCLSH}s.exe ../${TK_ZIP_FILE} && $$zip -J ../${TK_ZIP_FILE}) \
+	fi
 	(zip=`(realpath '${NATIVE_ZIP}' || readlink -m '${NATIVE_ZIP}') 2>/dev/null || \
 	  (echo '${NATIVE_ZIP}' | sed "s?^\./?$$(pwd)/?")`; \
 	  cd ${TK_VFS_ROOT} && \
@@ -763,6 +774,12 @@ tkUnixMenubu.$(OBJEXT): ${UNIX_DIR}/tkUnixMenubu.c
 tkUnixScale.$(OBJEXT): ${UNIX_DIR}/tkUnixScale.c
 	$(CC) -c $(CC_SWITCHES) -DBUILD_tk -DBUILD_ttk @DEPARG@ $(CC_OBJNAME)
 
+tkPkgConfig.$(OBJEXT): $(GENERIC_DIR)/tkPkgConfig.c
+	$(CC) -c $(CC_SWITCHES)	 -DBUILD_tk -DBUILD_ttk		\
+		-DCFG_RUNTIME_DLLFILE="\"$(TK_DLL_FILE)\"" \
+		@DEPARG@ $(CC_OBJNAME)
+
+
 # Extra dependency info
 tkConsole.$(OBJEXT): configure Makefile
 tkMain.$(OBJEXT): configure Makefile
diff --git a/win/configure b/win/configure
index d80d32d..dc846fa 100755
--- a/win/configure
+++ b/win/configure
@@ -740,7 +740,6 @@ TCL_STUB_LIB_FILE
 TCL_LIB_SPEC
 TCL_LIB_FLAG
 TCL_LIB_FILE
-TCL_ZIP_FILE
 TCL_SRC_DIR
 TCL_BIN_DIR
 TCL_VERSION
@@ -4042,7 +4041,6 @@ printf "%s\n" "could not find ${TCL_BIN_DIR}/tclConfig.sh" >&6; }
 
 
 
-
 if test "${TCL_MAJOR_VERSION}" -lt 9 ; then
 if test "${TCL_MAJOR_VERSION}" != "${TK_MAJOR_VERSION}"; then
     as_fn_error $? "${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}.
@@ -5754,7 +5752,7 @@ printf "%s\n" "No zip found on PATH building minizip" >&6; }
 
 
 	ZIPFS_BUILD=1
-	TK_ZIP_FILE=libtcl_${TK_MAJOR_VERSION}_${TK_MINOR_VERSION}_${TK_PATCH_LEVEL}.zip
+	TK_ZIP_FILE=libtk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}${TK_PATCH_LEVEL}.zip
 else
 	ZIPFS_BUILD=0
 	TCL_ZIP_FILE=
diff --git a/win/configure.ac b/win/configure.ac
index 2180b55..0b62869 100644
--- a/win/configure.ac
+++ b/win/configure.ac
@@ -195,7 +195,7 @@ if test "$tcl_ok" = "yes" ; then
     #
     SC_ZIPFS_SUPPORT
 	ZIPFS_BUILD=1
-	TK_ZIP_FILE=libtcl_${TK_MAJOR_VERSION}_${TK_MINOR_VERSION}_${TK_PATCH_LEVEL}.zip
+	TK_ZIP_FILE=libtk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}${TK_PATCH_LEVEL}.zip
 else
 	ZIPFS_BUILD=0
 	TCL_ZIP_FILE=
diff --git a/win/makefile.vc b/win/makefile.vc
index ba19f17..912f781 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -630,6 +630,11 @@ $(TMP_DIR)\winMain.obj: $(WIN_DIR)\winMain.c
 $(TMP_DIR)\tkMain2.obj: $(GENERICDIR)\tkMain.c

 	$(cc32) $(pkgcflags) /DUNICODE /D_UNICODE -Fo$@ $?

 

+$(TMP_DIR)\tkPkgConfig.obj: $(GENERICDIR)\tkPkgConfig.c

+	$(cc32) $(pkgcflags) 		\

+		-DCFG_RUNTIME_DLLFILE="\"$(TKLIBNAME)\"" \

+		-Fo$@ $?

+

 # The following objects are part of the stub library and should not

 # be built as DLL objects but none of the symbols should be exported

 # and no reference made to a C runtime.

diff --git a/win/tcl.m4 b/win/tcl.m4
index b9a164c..76711dd 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)