Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 90f5bca

Browse files
larryhastingslarryhastings
committed
Merged in stevedower/cpython350 (pull request #6)
Issue #24847: Removes vcruntime140.dll dependency from Tcl/Tk.
2 parents 8bf6b06 + b98046b commit 90f5bca

8 files changed

Lines changed: 14 additions & 20 deletions

File tree

‎Misc/NEWS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ Core and Builtins
1616
Library
1717
-------
1818

19+
- Issue #24847: Removes vcruntime140.dll dependency from Tcl/Tk.
20+
1921
- Issue #24839: platform._syscmd_ver raises DeprecationWarning
2022

2123
What's New in Python 3.5.0 release candidate 1?

‎PCbuild/get_externals.bat‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ for %%e in (
5555
bzip2-1.0.6
5656
nasm-2.11.06
5757
openssl-1.0.2d
58-
tcl-core-8.6.4.1
59-
tk-8.6.4.1
60-
tix-8.4.3.4
58+
tcl-core-8.6.4.2
59+
tk-8.6.4.2
60+
tix-8.4.3.6
6161
sqlite-3.8.11.0
6262
xz-5.0.5
6363
) do (

‎PCbuild/readme.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ _sqlite3
236236
Homepage:
237237
http://www.sqlite.org/
238238
_tkinter
239-
Wraps version 8.6.1 of the Tk windowing system.
239+
Wraps version 8.6.4 of the Tk windowing system.
240240
Homepage:
241241
http://www.tcl.tk/
242242

‎PCbuild/tcl.vcxproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@
6161
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
6262

6363
<PropertyGroup>
64-
<TclOpts Condition="$(Configuration) == 'Debug'">symbols</TclOpts>
64+
<TclOpts>ucrt</TclOpts>
65+
<TclOpts Condition="$(Configuration) == 'Debug'">symbols,ucrt</TclOpts>
6566
<TclDirs>INSTALLDIR="$(OutDir.TrimEnd(`\`))" INSTALL_DIR="$(OutDir.TrimEnd(`\`))"</TclDirs>
6667
<DebugFlags Condition="'$(Configuration)' == 'Debug'">DEBUGFLAGS="-wd4456 -wd4457 -wd4458 -wd4459 -wd4996"</DebugFlags>
6768
<NMakeBuildCommandLine>setlocal

‎PCbuild/tcltk.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
<TclMajorVersion>8</TclMajorVersion>
66
<TclMinorVersion>6</TclMinorVersion>
77
<TclPatchLevel>4</TclPatchLevel>
8-
<TclRevision>1</TclRevision>
8+
<TclRevision>2</TclRevision>
99
<TkMajorVersion>$(TclMajorVersion)</TkMajorVersion>
1010
<TkMinorVersion>$(TclMinorVersion)</TkMinorVersion>
1111
<TkPatchLevel>$(TclPatchLevel)</TkPatchLevel>
1212
<TkRevision>$(TclRevision)</TkRevision>
1313
<TixMajorVersion>8</TixMajorVersion>
1414
<TixMinorVersion>4</TixMinorVersion>
1515
<TixPatchLevel>3</TixPatchLevel>
16-
<TixRevision>4</TixRevision>
16+
<TixRevision>6</TixRevision>
1717
<tclDir>$(ExternalsDir)tcl-core-$(TclMajorVersion).$(TclMinorVersion).$(TclPatchLevel).$(TclRevision)\</tclDir>
1818
<tkDir>$(ExternalsDir)tk-$(TkMajorVersion).$(TkMinorVersion).$(TkPatchLevel).$(TkRevision)\</tkDir>
1919
<tixDir>$(ExternalsDir)tix-$(TixMajorVersion).$(TixMinorVersion).$(TixPatchLevel).$(TixRevision)\</tixDir>

‎PCbuild/tix.vcxproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,9 @@
5656
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5757

5858
<PropertyGroup>
59-
<TkOpts>msvcrt</TkOpts>
60-
<TkOpts Condition="$(Configuration) == 'Debug'">symbols,msvcrt</TkOpts>
6159
<TixDirs>BUILDDIRTOP="$(BuildDirTop)" TCL_DIR="$(tclDir.TrimEnd(`\`))" TK_DIR="$(tkDir.TrimEnd(`\`))" INSTALL_DIR="$(OutDir.TrimEnd(`\`))"</TixDirs>
62-
<DebugFlags Condition="'$(Configuration)' == 'Debug'">DEBUG=1 NODEBUG=0 TCL_DBGX=g DEBUGFLAGS="-wd4456 -wd4457 -wd4458 -wd4459 -wd4996"</DebugFlags>
63-
<DebugFlags Condition="'$(Configuration)' != 'Debug'">DEBUG=0 NODEBUG=1</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>
6462
<NMakeBuildCommandLine>setlocal
6563
@(ExpectedOutputs->'if not exist "%(FullPath)" goto build','
6664
')

‎PCbuild/tk.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@
6060
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
6161

6262
<PropertyGroup>
63-
<TkOpts>msvcrt</TkOpts>
64-
<TkOpts Condition="$(Configuration) == 'Debug'">symbols,msvcrt</TkOpts>
63+
<TkOpts>ucrt</TkOpts>
64+
<TkOpts Condition="$(Configuration) == 'Debug'">symbols,ucrt</TkOpts>
6565
<TkDirs>TCLDIR="$(tclDir.TrimEnd(`\`))" INSTALLDIR="$(OutDir.TrimEnd(`\`))"</TkDirs>
6666
<DebugFlags Condition="'$(Configuration)' == 'Debug'">DEBUGFLAGS="-wd4456 -wd4457 -wd4458 -wd4459 -wd4996"</DebugFlags>
6767
<NMakeBuildCommandLine>setlocal

‎Tools/msi/tcltk/tcltk.wixproj‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,6 @@
2727
<Target_>DLLs\</Target_>
2828
<Group>tcltk_dlls</Group>
2929
</InstallFiles>
30-
<InstallFiles Include="$(VCInstallDir)redist\$(Platform)\Microsoft.VC$(PlatformToolset.Substring(1)).CRT\vcruntime$(PlatformToolset.Substring(1)).dll">
31-
<SourceBase>$(VCInstallDir)redist\$(Platform)\</SourceBase>
32-
<Source>$(VCInstallDir)redist\$(Platform)\</Source>
33-
<TargetBase>$(VCInstallDir)redist\$(Platform)\</TargetBase>
34-
<Target_>DLLs\</Target_>
35-
<Group>tcltk_dlls</Group>
36-
</InstallFiles>
3730

3831
<InstallFiles Include="$(tcltkDir)lib\**\*">
3932
<SourceBase>$(tcltkDir)</SourceBase>

0 commit comments

Comments
 (0)