diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-08-19 02:30:13 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-08-19 02:30:13 (GMT) |
| commit | 77861e17f10a987586d6b4f05fbd7ecc235a84bb (patch) | |
| tree | 69a1789a22e75f687a0dab46d06f6ba8b7a15372 /PCbuild | |
| parent | 631a35c71a0c1f4fb31aad04407825cee2fe8a48 (diff) | |
| parent | e7e69391e362fbb3de2a2da7beaebb4b7d6cf612 (diff) | |
| download | cpython-77861e17f10a987586d6b4f05fbd7ecc235a84bb.zip cpython-77861e17f10a987586d6b4f05fbd7ecc235a84bb.tar.gz cpython-77861e17f10a987586d6b4f05fbd7ecc235a84bb.tar.bz2 | |
Issue #24847: Fixes Tix revision number and reverts fix for the wrong revision.
Triggers clean on buildbots.
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/get_externals.bat | 2 | ||||
| -rw-r--r-- | PCbuild/tcltk.props | 2 | ||||
| -rw-r--r-- | PCbuild/tix.vcxproj | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index a015af5..f9b740f 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 6d28338..5e794e5 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 1786324..a1dad1e 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',' ') |