From: Steve Dower <steve.dower@microsoft.com>
Date: Wed, 19 Aug 2015 02:29:51 +0000 (-0700)
Subject: Issue #24847: Fixes Tix revision number and reverts fix for the wrong revision.
X-Git-Tag: v3.6.0a1~1755^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e7e69391e362fbb3de2a2da7beaebb4b7d6cf612;p=python

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 a015af52ee..f9b740fa6a 100644
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -57,7 +57,7 @@ for %%e in (
             openssl-1.0.2d
             tcl-core-8.6.4.2
             tk-8.6.4.2
-            tix-8.4.3.5
+            tix-8.4.3.6
             sqlite-3.8.11.0
             xz-5.0.5
             ) do (
diff --git a/PCbuild/tcltk.props b/PCbuild/tcltk.props
index 6d28338b51..5e794e5537 100644
--- 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 1786324c2c..a1dad1e301 100644
--- 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 5e840cc7ea..622f876a98 100644
--- 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):
 @rem 1) uncomment the following line:
 
-@rem    call "%~dp0..\..\PCbuild\get_externals.bat" --clean-only
+call "%~dp0..\..\PCbuild\get_externals.bat" --clean-only
 
 @rem 2) commit and push
 @rem 3) wait for all Windows bots to start a build with that changeset