[Python-checkins] cpython (3.5): Issue #24847: Removes vcruntime140.dll dependency from Tcl/Tk.

Tue Aug 25 23:25:08 CEST 2015

https://hg.python.org/cpython/rev/dc9bdddca59b
changeset: 97492:dc9bdddca59b
branch: 3.5
parent: 97475:5a9ac801f9b4
user: Steve Dower <steve.dower at microsoft.com>
date: Wed Aug 19 08:39:12 2015 -0700
summary:
 Issue #24847: Removes vcruntime140.dll dependency from Tcl/Tk.
files:
 Misc/NEWS | 2 ++
 PCbuild/get_externals.bat | 6 +++---
 PCbuild/readme.txt | 2 +-
 PCbuild/tcl.vcxproj | 3 ++-
 PCbuild/tcltk.props | 4 ++--
 PCbuild/tix.vcxproj | 6 ++----
 PCbuild/tk.vcxproj | 4 ++--
 Tools/msi/tcltk/tcltk.wixproj | 7 -------
 8 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,8 @@
 Library
 -------
 
+- Issue #24847: Removes vcruntime140.dll dependency from Tcl/Tk.
+
 - Issue #24839: platform._syscmd_ver raises DeprecationWarning
 
 What's New in Python 3.5.0 release candidate 1?
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -55,9 +55,9 @@
 bzip2-1.0.6
 nasm-2.11.06
 openssl-1.0.2d
- tcl-core-8.6.4.1
- tk-8.6.4.1
- tix-8.4.3.4
+ tcl-core-8.6.4.2
+ tk-8.6.4.2
+ tix-8.4.3.6
 sqlite-3.8.11.0
 xz-5.0.5
 ) do (
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -236,7 +236,7 @@
 Homepage:
 http://www.sqlite.org/
 _tkinter
- Wraps version 8.6.1 of the Tk windowing system.
+ Wraps version 8.6.4 of the Tk windowing system.
 Homepage:
 http://www.tcl.tk/
 
diff --git a/PCbuild/tcl.vcxproj b/PCbuild/tcl.vcxproj
--- a/PCbuild/tcl.vcxproj
+++ b/PCbuild/tcl.vcxproj
@@ -61,7 +61,8 @@
 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 
 <PropertyGroup>
- <TclOpts Condition="$(Configuration) == 'Debug'">symbols</TclOpts>
+ <TclOpts>ucrt</TclOpts>
+ <TclOpts Condition="$(Configuration) == 'Debug'">symbols,ucrt</TclOpts>
 <TclDirs>INSTALLDIR="$(OutDir.TrimEnd(`\`))" INSTALL_DIR="$(OutDir.TrimEnd(`\`))"</TclDirs>
 <DebugFlags Condition="'$(Configuration)' == 'Debug'">DEBUGFLAGS="-wd4456 -wd4457 -wd4458 -wd4459 -wd4996"</DebugFlags>
 <NMakeBuildCommandLine>setlocal
diff --git a/PCbuild/tcltk.props b/PCbuild/tcltk.props
--- a/PCbuild/tcltk.props
+++ b/PCbuild/tcltk.props
@@ -5,7 +5,7 @@
 <TclMajorVersion>8</TclMajorVersion>
 <TclMinorVersion>6</TclMinorVersion>
 <TclPatchLevel>4</TclPatchLevel>
- <TclRevision>1</TclRevision>
+ <TclRevision>2</TclRevision>
 <TkMajorVersion>$(TclMajorVersion)</TkMajorVersion>
 <TkMinorVersion>$(TclMinorVersion)</TkMinorVersion>
 <TkPatchLevel>$(TclPatchLevel)</TkPatchLevel>
@@ -13,7 +13,7 @@
 <TixMajorVersion>8</TixMajorVersion>
 <TixMinorVersion>4</TixMinorVersion>
 <TixPatchLevel>3</TixPatchLevel>
- <TixRevision>4</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
@@ -56,11 +56,9 @@
 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 
 <PropertyGroup>
- <TkOpts>msvcrt</TkOpts>
- <TkOpts Condition="$(Configuration) == 'Debug'">symbols,msvcrt</TkOpts>
 <TixDirs>BUILDDIRTOP="$(BuildDirTop)" TCL_DIR="$(tclDir.TrimEnd(`\`))" TK_DIR="$(tkDir.TrimEnd(`\`))" INSTALL_DIR="$(OutDir.TrimEnd(`\`))"</TixDirs>
- <DebugFlags Condition="'$(Configuration)' == 'Debug'">DEBUG=1 NODEBUG=0 TCL_DBGX=g DEBUGFLAGS="-wd4456 -wd4457 -wd4458 -wd4459 -wd4996"</DebugFlags>
- <DebugFlags Condition="'$(Configuration)' != 'Debug'">DEBUG=0 NODEBUG=1</DebugFlags>
+ <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>
 <NMakeBuildCommandLine>setlocal
 @(ExpectedOutputs->'if not exist "%(FullPath)" goto build','
 ')
diff --git a/PCbuild/tk.vcxproj b/PCbuild/tk.vcxproj
--- a/PCbuild/tk.vcxproj
+++ b/PCbuild/tk.vcxproj
@@ -60,8 +60,8 @@
 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 
 <PropertyGroup>
- <TkOpts>msvcrt</TkOpts>
- <TkOpts Condition="$(Configuration) == 'Debug'">symbols,msvcrt</TkOpts>
+ <TkOpts>ucrt</TkOpts>
+ <TkOpts Condition="$(Configuration) == 'Debug'">symbols,ucrt</TkOpts>
 <TkDirs>TCLDIR="$(tclDir.TrimEnd(`\`))" INSTALLDIR="$(OutDir.TrimEnd(`\`))"</TkDirs>
 <DebugFlags Condition="'$(Configuration)' == 'Debug'">DEBUGFLAGS="-wd4456 -wd4457 -wd4458 -wd4459 -wd4996"</DebugFlags>
 <NMakeBuildCommandLine>setlocal
diff --git a/Tools/msi/tcltk/tcltk.wixproj b/Tools/msi/tcltk/tcltk.wixproj
--- a/Tools/msi/tcltk/tcltk.wixproj
+++ b/Tools/msi/tcltk/tcltk.wixproj
@@ -27,13 +27,6 @@
 <Target_>DLLs\</Target_>
 <Group>tcltk_dlls</Group>
 </InstallFiles>
- <InstallFiles Include="$(VCInstallDir)redist\$(Platform)\Microsoft.VC$(PlatformToolset.Substring(1)).CRT\vcruntime$(PlatformToolset.Substring(1)).dll">
- <SourceBase>$(VCInstallDir)redist\$(Platform)\</SourceBase>
- <Source>$(VCInstallDir)redist\$(Platform)\</Source>
- <TargetBase>$(VCInstallDir)redist\$(Platform)\</TargetBase>
- <Target_>DLLs\</Target_>
- <Group>tcltk_dlls</Group>
- </InstallFiles>
 
 <InstallFiles Include="$(tcltkDir)lib\**\*">
 <SourceBase>$(tcltkDir)</SourceBase>
-- 
Repository URL: https://hg.python.org/cpython
