merge the part of core-8-6-branch that was left out in previous merge due to wrong baseline

3 files changed, 10 insertions, 17 deletions

diff --git a/win/Makefile.in b/win/Makefile.in
index e42de9f..a60961e 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -484,12 +484,12 @@ install-binaries: binaries
 	@echo "Creating package index $(PKG_INDEX)";
 	@$(RM) $(PKG_INDEX);
 	@(\
-	echo "if {[catch {package present Tcl 8.6.0}]} return";\
+	echo "if {![package vsatisfies [package provide Tcl] 8.6.0]} return";\
 	echo "if {(\$$::tcl_platform(platform) eq \"unix\") && ([info exists ::env(DISPLAY)]";\
 	echo "	|| ([info exists ::argv] && (\"-display\" in \$$::argv)))} {";\
-	echo "    package ifneeded Tk $(VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir .. .. bin libtk$(VERSION).dll]] Tk]";\
+	echo "    package ifneeded Tk $(VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir .. .. bin libtk$(VERSION).dll]]]";\
 	echo "} else {";\
-	echo "    package ifneeded Tk $(VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir .. .. bin $(TK_DLL_FILE)]] Tk]";\
+	echo "    package ifneeded Tk $(VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir .. .. bin $(TK_DLL_FILE)]]]";\
 	echo "}";\
 	) > $(PKG_INDEX);
 	@for i in tkConfig.sh $(TK_LIB_FILE) $(TK_STUB_LIB_FILE); \
@@ -716,7 +716,8 @@ cleanhelp:
 clean: cleanhelp
 	$(RM) *.lib *.a *.exp *.dll *.res *.${OBJEXT} *~ \#* TAGS a.out
 	$(RM) $(WISH) $(TKTEST) $(CAT32)
-	$(RM) *.pch *.ilk *.pdb
+	$(RM) *.pch *.ilk *.pdb *.zip
+	$(RMDIR) *.vfs
 
 distclean: clean
 	$(RM) Makefile config.status config.cache config.log tkConfig.sh \
diff --git a/win/makefile.vc b/win/makefile.vc
index 6fcc8fb..2f30590 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -652,12 +652,12 @@ install-binaries:
 !if !$(STATIC_BUILD)

 	@echo creating package index

 	@type << > $(OUT_DIR)\pkgIndex.tcl

-if {[catch {package present Tcl 8.6.0}]} { return }

+if {![package vsatisfies [package provide Tcl] 8.6.0]} return

 if {($$::tcl_platform(platform) eq "unix") && ([info exists ::env(DISPLAY)]

 	|| ([info exists ::argv] && ("-display" in $$::argv)))} {

-    package ifneeded Tk $(TK_PATCH_LEVEL) [list load [file join $$dir .. .. bin libtk$(DOTVERSION).dll] Tk]

+    package ifneeded Tk $(TK_PATCH_LEVEL) [list load [file join $$dir .. .. bin libtk$(DOTVERSION).dll]]

 } else {

-    package ifneeded Tk $(TK_PATCH_LEVEL) [list load [file join $$dir .. .. bin $(TKLIBNAME)] Tk]

+    package ifneeded Tk $(TK_PATCH_LEVEL) [list load [file join $$dir .. .. bin $(TKLIBNAME)]]

 }

 <<

 	@$(CPY) $(OUT_DIR)\pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)\"

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