diff --git a/Misc/NEWS b/Misc/NEWS index 27a05648cc6..b844fd9305a 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 3037326129f..f9b740fa6aa 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 9d5f342e9e7..68cdb0ffbc6 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 8f2544a74e6..e9287c7b37d 100644 --- a/PCbuild/tcl.vcxproj +++ b/PCbuild/tcl.vcxproj @@ -61,7 +61,8 @@ - symbols + ucrt + symbols,ucrt INSTALLDIR="$(OutDir.TrimEnd(`\`))" INSTALL_DIR="$(OutDir.TrimEnd(`\`))" DEBUGFLAGS="-wd4456 -wd4457 -wd4458 -wd4459 -wd4996" setlocal diff --git a/PCbuild/tcltk.props b/PCbuild/tcltk.props index 96bd5777b8e..5e794e55375 100644 --- a/PCbuild/tcltk.props +++ b/PCbuild/tcltk.props @@ -5,7 +5,7 @@ 8 6 4 - 1 + 2 $(TclMajorVersion) $(TclMinorVersion) $(TclPatchLevel) @@ -13,7 +13,7 @@ 8 4 3 - 4 + 6 $(ExternalsDir)tcl-core-$(TclMajorVersion).$(TclMinorVersion).$(TclPatchLevel).$(TclRevision)\ $(ExternalsDir)tk-$(TkMajorVersion).$(TkMinorVersion).$(TkPatchLevel).$(TkRevision)\ $(ExternalsDir)tix-$(TixMajorVersion).$(TixMinorVersion).$(TixPatchLevel).$(TixRevision)\ diff --git a/PCbuild/tix.vcxproj b/PCbuild/tix.vcxproj index 74a6b84f573..1786324c2c6 100644 --- a/PCbuild/tix.vcxproj +++ b/PCbuild/tix.vcxproj @@ -56,11 +56,9 @@ - msvcrt - symbols,msvcrt BUILDDIRTOP="$(BuildDirTop)" TCL_DIR="$(tclDir.TrimEnd(`\`))" TK_DIR="$(tkDir.TrimEnd(`\`))" INSTALL_DIR="$(OutDir.TrimEnd(`\`))" - DEBUG=1 NODEBUG=0 TCL_DBGX=g DEBUGFLAGS="-wd4456 -wd4457 -wd4458 -wd4459 -wd4996" - DEBUG=0 NODEBUG=1 + DEBUG=1 NODEBUG=0 UCRT=1 TCL_DBGX=tg TK_DBGX=tg + DEBUG=0 NODEBUG=1 UCRT=1 TCL_DBGX=t TK_DBGX=t setlocal @(ExpectedOutputs->'if not exist "%(FullPath)" goto build',' ') diff --git a/PCbuild/tk.vcxproj b/PCbuild/tk.vcxproj index 20749f719f5..589338cf5cf 100644 --- a/PCbuild/tk.vcxproj +++ b/PCbuild/tk.vcxproj @@ -60,8 +60,8 @@ - msvcrt - symbols,msvcrt + ucrt + symbols,ucrt TCLDIR="$(tclDir.TrimEnd(`\`))" INSTALLDIR="$(OutDir.TrimEnd(`\`))" DEBUGFLAGS="-wd4456 -wd4457 -wd4458 -wd4459 -wd4996" setlocal diff --git a/Tools/msi/tcltk/tcltk.wixproj b/Tools/msi/tcltk/tcltk.wixproj index e1addd9ed54..f66fc149884 100644 --- a/Tools/msi/tcltk/tcltk.wixproj +++ b/Tools/msi/tcltk/tcltk.wixproj @@ -27,13 +27,6 @@ DLLs\ tcltk_dlls - - $(VCInstallDir)redist\$(Platform)\ - $(VCInstallDir)redist\$(Platform)\ - $(VCInstallDir)redist\$(Platform)\ - DLLs\ - tcltk_dlls - $(tcltkDir)