diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-08-12 01:49:13 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-08-12 01:49:13 (GMT) |
| commit | 9b8a1fa0235cd48bb8acf446db70b26cca9f21a2 (patch) | |
| tree | fcf96b2ce1c46b5eee3e8d8afa9afd47788c1780 | |
| parent | cae101f5ecd8fee38a37ce8fa46c141cd8a522ef (diff) | |
| download | cpython-9b8a1fa0235cd48bb8acf446db70b26cca9f21a2.zip cpython-9b8a1fa0235cd48bb8acf446db70b26cca9f21a2.tar.gz cpython-9b8a1fa0235cd48bb8acf446db70b26cca9f21a2.tar.bz2 | |
Issue #24847: Fixes tcltk installer layout of VC runtime DLL
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Tools/msi/tcltk/tcltk.wixproj | 6 |
2 files changed, 5 insertions, 3 deletions
@@ -13,6 +13,8 @@ Core and Builtins 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 index e1addd9..d576a41 100644 --- 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> |