summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2015-08-19 15:39:12 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2015-08-19 15:39:12 (GMT)
commitab2a34abb7ffe959fc2a221d77943b51f82f8d65 (patch)
treeee6dd48624462d1f21accc25d289e24ebef690df
parent6707906ea5e0df1132d3cd0c77707ccc19948341 (diff)
downloadcpython-ab2a34abb7ffe959fc2a221d77943b51f82f8d65.zip
cpython-ab2a34abb7ffe959fc2a221d77943b51f82f8d65.tar.gz
cpython-ab2a34abb7ffe959fc2a221d77943b51f82f8d65.tar.bz2
Issue #24847: Removes vcruntime140.dll dependency from Tcl/Tk.
-rw-r--r--Misc/NEWS2
-rw-r--r--PCbuild/get_externals.bat6
-rw-r--r--PCbuild/readme.txt2
-rw-r--r--PCbuild/tcl.vcxproj3
-rw-r--r--PCbuild/tcltk.props4
-rw-r--r--PCbuild/tix.vcxproj6
-rw-r--r--PCbuild/tk.vcxproj4
-rw-r--r--Tools/msi/tcltk/tcltk.wixproj7
8 files changed, 14 insertions, 20 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 27a0564..b844fd9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,8 @@ Core and Builtins
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
index 3037326..f9b740f 100644
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -55,9 +55,9 @@ for %%e in (
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
index 9d5f342..68cdb0f 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -236,7 +236,7 @@ _sqlite3
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
index 8f2544a..e9287c7 100644
--- 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
index 96bd577..5e794e5 100644
--- 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
index 74a6b84..1786324 100644
--- 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
index 20749f7..589338c 100644
--- 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
index e1addd9..f66fc14 100644
--- 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>