[Python-checkins] cpython (3.5): Issue #24847: Fixes Tix revision number and reverts fix for the wrong revision.

Wed Aug 19 04:31:24 CEST 2015

https://hg.python.org/cpython/rev/0e2620831f17
changeset: 97451:0e2620831f17
branch: 3.5
parent: 97448:19ac02a522ba
user: Steve Dower <steve.dower at microsoft.com>
date: Tue Aug 18 19:29:51 2015 -0700
summary:
 Issue #24847: Fixes Tix revision number and reverts fix for the wrong revision.
Triggers clean on buildbots.
files:
 PCbuild/get_externals.bat | 2 +-
 PCbuild/tcltk.props | 2 +-
 PCbuild/tix.vcxproj | 4 ++--
 Tools/buildbot/build.bat | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -57,7 +57,7 @@
 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
--- 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
--- 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
--- a/Tools/buildbot/build.bat
+++ b/Tools/buildbot/build.bat
@@ -7,7 +7,7 @@
 @rem a new version of an external library, especially Tcl/Tk):
 @rem 1) uncomment the following line:
 
- at 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
-- 
Repository URL: https://hg.python.org/cpython
