Issue #24847: Fixes Tix revision number and reverts fix for the wrong revision.

Triggers clean on buildbots.

diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index a015af52ee3289ee67c0fa5fac02c2141307770c..f9b740fa6aaa50387193b780e4f4200ef9150485 100644 (file)
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -57,7 +57,7 @@ for %%e in (
             openssl-1.0.2d\r
             tcl-core-8.6.4.2\r
             tk-8.6.4.2\r
-            tix-8.4.3.5\r
+            tix-8.4.3.6\r
             sqlite-3.8.11.0\r
             xz-5.0.5\r
             ) do (\r

diff --git a/PCbuild/tcltk.props b/PCbuild/tcltk.props
index 6d28338b51fb5bbd53309b40482683efa12b966b..5e794e553759d1b5190482d215c040cf6f3a747a 100644 (file)
--- a/PCbuild/tcltk.props
+++ b/PCbuild/tcltk.props
@@ -13,7 +13,7 @@
     <TixMajorVersion>8</TixMajorVersion>
     <TixMinorVersion>4</TixMinorVersion>
     <TixPatchLevel>3</TixPatchLevel>
-    <TixRevision>5</TixRevision>
+    <TixRevision>6</TixRevision>
     <tclDir>$(ExternalsDir)tcl-core-$(TclMajorVersion).$(TclMinorVersion).$(TclPatchLevel).$(TclRevision)\</tclDir>
     <tkDir>$(ExternalsDir)tk-$(TkMajorVersion).$(TkMinorVersion).$(TkPatchLevel).$(TkRevision)\</tkDir>
     <tixDir>$(ExternalsDir)tix-$(TixMajorVersion).$(TixMinorVersion).$(TixPatchLevel).$(TixRevision)\</tixDir>

diff --git a/PCbuild/tix.vcxproj b/PCbuild/tix.vcxproj
index 1786324c2c6185bf47e03ded4bf9ce2ba1c67b07..a1dad1e301e988111951c5e3e02c7a232771494d 100644 (file)
--- a/PCbuild/tix.vcxproj
+++ b/PCbuild/tix.vcxproj
@@ -57,8 +57,8 @@
   
   <PropertyGroup>
     <TixDirs>BUILDDIRTOP="$(BuildDirTop)" TCL_DIR="$(tclDir.TrimEnd(`\`))" TK_DIR="$(tkDir.TrimEnd(`\`))" INSTALL_DIR="$(OutDir.TrimEnd(`\`))"</TixDirs>
-    <DebugFlags Condition="'$(Configuration)' == 'Debug'">DEBUG=1 NODEBUG=0 UCRT=1 TCL_DBGX=tg TK_DBGX=tg</DebugFlags>
-    <DebugFlags Condition="'$(Configuration)' != 'Debug'">DEBUG=0 NODEBUG=1 UCRT=1 TCL_DBGX=t TK_DBGX=t</DebugFlags>
+    <DebugFlags Condition="'$(Configuration)' == 'Debug'">DEBUG=1 NODEBUG=0 UCRT=1 TCL_DBGX=g TK_DBGX=g</DebugFlags>
+    <DebugFlags Condition="'$(Configuration)' != 'Debug'">DEBUG=0 NODEBUG=1 UCRT=1</DebugFlags>
     <NMakeBuildCommandLine>setlocal
 @(ExpectedOutputs->'if not exist "%(FullPath)" goto build','
 ')

diff --git a/Tools/buildbot/build.bat b/Tools/buildbot/build.bat
index 5e840cc7eaca84d47c3a1e40e6fe5bb1c8bfbf07..622f876a980bce0edf9102caec0d70529f8c8583 100644 (file)
--- a/Tools/buildbot/build.bat
+++ b/Tools/buildbot/build.bat
@@ -7,7 +7,7 @@ call "%~dp0clean.bat" %*
 @rem a new version of an external library, especially Tcl/Tk):\r
 @rem 1) uncomment the following line:\r
 \r
-@rem    call "%~dp0..\..\PCbuild\get_externals.bat" --clean-only\r
+call "%~dp0..\..\PCbuild\get_externals.bat" --clean-only\r
 \r
 @rem 2) commit and push\r
 @rem 3) wait for all Windows bots to start a build with that changeset\r