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

steve.dower python-checkins at python.org
Wed Aug 12 03:53:41 CEST 2015


https://hg.python.org/cpython/rev/13ceedb92923
changeset:   97362:13ceedb92923
parent:      97360:419ceb531bab
parent:      97361:3cb97ffd9ddf
user:        Steve Dower <steve.dower at microsoft.com>
date:        Tue Aug 11 18:51:00 2015 -0700
summary:
  Issue #24847: Fixes tcltk installer layout of VC runtime DLL

files:
  Tools/msi/tcltk/tcltk.wixproj |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


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


More information about the Python-checkins mailing list