Merge 8.6

tcltk · Nov 2, 2024 · c2277b5 · c2277b5
2 parents f00ce52 + 51b104d
commit c2277b5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/tests/oo.test b/tests/oo.test
@@ -443,18 +443,25 @@ test oo-1.24 {basic test of OO functionality: deep nested ownership} -setup {
     oo::class create abc {
 	superclass parent
 	self method make {} {oo::copy [self] xyz}
-	destructor {incr ::count}
     }
     apply {n {
-	set ::count 0
 	# Make a lot of "nested" objects
 	set base abc
+	lappend lst $base [info object namespace $base]
 	for {set i 1; set obj $base} {$i < $n} {incr i} {
 	     set obj [$obj make]
+	     lappend lst $obj [info object namespace $obj]
 	}
 	# Kill them all in one go; should not crash!
 	$base destroy
-	return [expr {$n - $::count}]
+	# How many classes still there (cnt must remain 0)
+	set cnt 0
+	foreach {obj ns} $lst {
+	    if {[namespace which -command $obj] ne "" || [namespace exists $ns]} {
+		incr cnt
+	    }
+	}
+	return $cnt
     }} 10000
 } -cleanup {
     parent destroy

diff --git a/win/makefile.vc b/win/makefile.vc
@@ -1070,16 +1070,8 @@ install-libraries: tclConfig tcl-nmake install-msgs install-tzdata
 	@echo Installing library files to $(SCRIPT_INSTALL_DIR)
 	@if not exist "$(SCRIPT_INSTALL_DIR)" \
 	    $(MKDIR) "$(SCRIPT_INSTALL_DIR)"
-	@$(CPY) "$(ROOT)\library\history.tcl"     "$(SCRIPT_INSTALL_DIR)\"
-	@$(CPY) "$(ROOT)\library\init.tcl"        "$(SCRIPT_INSTALL_DIR)\"
-	@$(CPY) "$(ROOT)\library\clock.tcl"       "$(SCRIPT_INSTALL_DIR)\"
-	@$(CPY) "$(ROOT)\library\tm.tcl"          "$(SCRIPT_INSTALL_DIR)\"
-	@$(CPY) "$(ROOT)\library\parray.tcl"      "$(SCRIPT_INSTALL_DIR)\"
-	@$(CPY) "$(ROOT)\library\safe.tcl"        "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(ROOT)\library\*.tcl"           "$(SCRIPT_INSTALL_DIR)\"
 	@$(CPY) "$(ROOT)\library\tclIndex"        "$(SCRIPT_INSTALL_DIR)\"
-	@$(CPY) "$(ROOT)\library\package.tcl"     "$(SCRIPT_INSTALL_DIR)\"
-	@$(CPY) "$(ROOT)\library\word.tcl"        "$(SCRIPT_INSTALL_DIR)\"
-	@$(CPY) "$(ROOT)\library\auto.tcl"        "$(SCRIPT_INSTALL_DIR)\"
 !endif
 	@$(CPY) "$(OUT_DIR)\tclConfig.sh"         "$(LIB_INSTALL_DIR)\"
 	@$(CPY) "$(WIN_DIR)\tclooConfig.sh"        "$(LIB_INSTALL_DIR)\"