[Python-checkins] cpython (3.5): Issue #24847: Fixes tcltk installer layout of VC runtime DLL

Wed Aug 12 03:53:41 CEST 2015

https://hg.python.org/cpython/rev/3cb97ffd9ddf
changeset: 97361:3cb97ffd9ddf
branch: 3.5
parent: 97358:7cfe20a6395d
user: Steve Dower <steve.dower at microsoft.com>
date: Tue Aug 11 18:49:13 2015 -0700
summary:
 Issue #24847: Fixes tcltk installer layout of VC runtime DLL
files:
 Misc/NEWS | 2 ++
 Tools/msi/tcltk/tcltk.wixproj | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,8 @@
 Library
 -------
 
+- Issue #24847: Fixes tcltk installer layout of VC runtime DLL
+
 - Issue #24839: platform._syscmd_ver raises DeprecationWarning
 
 What's New in Python 3.5.0 release candidate 1?
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
@@ -28,9 +28,9 @@
 <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>
+ <SourceBase>$(VCInstallDir)redist\$(Platform)\Microsoft.VC$(PlatformToolset.Substring(1)).CRT\</SourceBase>
+ <Source>$(VCInstallDir)redist\$(Platform)\Microsoft.VC$(PlatformToolset.Substring(1)).CRT\</Source>
+ <TargetBase>$(VCInstallDir)redist\$(Platform)\Microsoft.VC$(PlatformToolset.Substring(1)).CRT\</TargetBase>
 <Target_>DLLs\</Target_>
 <Group>tcltk_dlls</Group>
 </InstallFiles>
-- 
Repository URL: https://hg.python.org/cpython
