Commit e7e6939
committed
Issue python#24847: Fixes Tix revision number and reverts fix for the wrong revision.
Triggers clean on buildbots.1 parent 9f0cbbc commit e7e6939
4 files changed
Lines changed: 5 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -57,7 +57,7 @@ for %%e in ( | |||
| 57 | 57 | openssl-1.0.2d | |
| 58 | 58 | tcl-core-8.6.4.2 | |
| 59 | 59 | tk-8.6.4.2 | |
| 60 | - tix-8.4.3.5 | ||
| 60 | + tix-8.4.3.6 | ||
| 61 | 61 | sqlite-3.8.11.0 | |
| 62 | 62 | xz-5.0.5 | |
| 63 | 63 | ) do ( | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -13,7 +13,7 @@ | |||
| 13 | 13 | <TixMajorVersion>8</TixMajorVersion> | |
| 14 | 14 | <TixMinorVersion>4</TixMinorVersion> | |
| 15 | 15 | <TixPatchLevel>3</TixPatchLevel> | |
| 16 | - <TixRevision>5</TixRevision> | ||
| 16 | + <TixRevision>6</TixRevision> | ||
| 17 | 17 | <tclDir>$(ExternalsDir)tcl-core-$(TclMajorVersion).$(TclMinorVersion).$(TclPatchLevel).$(TclRevision)\</tclDir> | |
| 18 | 18 | <tkDir>$(ExternalsDir)tk-$(TkMajorVersion).$(TkMinorVersion).$(TkPatchLevel).$(TkRevision)\</tkDir> | |
| 19 | 19 | <tixDir>$(ExternalsDir)tix-$(TixMajorVersion).$(TixMinorVersion).$(TixPatchLevel).$(TixRevision)\</tixDir> | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -57,8 +57,8 @@ | |||
| 57 | 57 | ||
| 58 | 58 | <PropertyGroup> | |
| 59 | 59 | <TixDirs>BUILDDIRTOP="$(BuildDirTop)" TCL_DIR="$(tclDir.TrimEnd(`\`))" TK_DIR="$(tkDir.TrimEnd(`\`))" INSTALL_DIR="$(OutDir.TrimEnd(`\`))"</TixDirs> | |
| 60 | - <DebugFlags Condition="'$(Configuration)' == 'Debug'">DEBUG=1 NODEBUG=0 UCRT=1 TCL_DBGX=tg TK_DBGX=tg</DebugFlags> | ||
| 61 | - <DebugFlags Condition="'$(Configuration)' != 'Debug'">DEBUG=0 NODEBUG=1 UCRT=1 TCL_DBGX=t TK_DBGX=t</DebugFlags> | ||
| 60 | + <DebugFlags Condition="'$(Configuration)' == 'Debug'">DEBUG=1 NODEBUG=0 UCRT=1 TCL_DBGX=g TK_DBGX=g</DebugFlags> | ||
| 61 | + <DebugFlags Condition="'$(Configuration)' != 'Debug'">DEBUG=0 NODEBUG=1 UCRT=1</DebugFlags> | ||
| 62 | 62 | <NMakeBuildCommandLine>setlocal | |
| 63 | 63 | @(ExpectedOutputs->'if not exist "%(FullPath)" goto build',' | |
| 64 | 64 | ') | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -7,7 +7,7 @@ call "%~dp0clean.bat" %* | |||
| 7 | 7 | @rem a new version of an external library, especially Tcl/Tk): | |
| 8 | 8 | @rem 1) uncomment the following line: | |
| 9 | 9 | ||
| 10 | - @rem call "%~dp0..\..\PCbuild\get_externals.bat" --clean-only | ||
| 10 | + call "%~dp0..\..\PCbuild\get_externals.bat" --clean-only | ||
| 11 | 11 | ||
| 12 | 12 | @rem 2) commit and push | |
| 13 | 13 | @rem 3) wait for all Windows bots to start a build with that changeset | |
0 commit comments