fixup! gh-124111: Update Windows to use Tcl/Tk 9.0.3

zware · zware · commit 308c16419652 · 2026-05-13T14:07:58.000-05:00
Attempted MSI fixups.
diff --git a/Tools/msi/tcltk/tcltk_files.wxs b/Tools/msi/tcltk/tcltk_files.wxs
@@ -10,11 +10,11 @@
             <Component Id="_tkinter.lib" Directory="libs" Guid="*">
                 <File Name="_tkinter.lib" KeyPath="yes" />
             </Component>
-            <Component Id="tcl86t.dll" Directory="DLLs" Guid="*">
-                <File Name="tcl86t.dll" KeyPath="yes" />
+            <Component Id="tcl90.dll" Directory="DLLs" Guid="*">
+                <File Name="tcl90.dll" KeyPath="yes" />
             </Component>
-            <Component Id="tk86t.dll" Directory="DLLs" Guid="*">
-                <File Name="tk86t.dll" KeyPath="yes" />
+            <Component Id="tcl9tk90.dll" Directory="DLLs" Guid="*">
+                <File Name="tcl9tk90.dll" KeyPath="yes" />
             </Component>
             <Component Id="zlib1.dll" Directory="DLLs" Guid="*">
                 <File Name="zlib1.dll" KeyPath="yes" />
diff --git a/Tools/msi/testrelease.bat b/Tools/msi/testrelease.bat
@@ -88,9 +88,7 @@ exit /B 0
 )
 @if not errorlevel 1 (
     @echo Testing Tcl/tk
-    @set TCL_LIBRARY=%~2\Python\tcl\tcl8.6
     "%~2\Python\python.exe" -m test -uall -v test_ttk_guionly test_tk test_idle > "%~2\tcltk.txt" 2>&1
-    @set TCL_LIBRARY=
 )
 
 @set EXITCODE=%ERRORLEVEL%

Original file line number	Diff line number	Diff line change
`@@ -88,9 +88,7 @@ exit /B 0`
`88`	`88`	`)`
`89`	`89`	`@if not errorlevel 1 (`
`90`	`90`	`@echo Testing Tcl/tk`
`91`		`- @set TCL_LIBRARY=%~2\Python\tcl\tcl8.6`
`92`	`91`	`"%~2\Python\python.exe" -m test -uall -v test_ttk_guionly test_tk test_idle > "%~2\tcltk.txt" 2>&1`
`93`		`- @set TCL_LIBRARY=`
`94`	`92`	`)`
`95`	`93`
`96`	`94`	`@set EXITCODE=%ERRORLEVEL%`