Takes vcruntime140.dll from the correct source. (#679)

diff --git a/Tools/msi/make_zip.proj b/Tools/msi/make_zip.proj
index f78e6ffa28fb72dce40348b18996e39e0f50ded3..b3588b7a0bae9023b0b2cc69d9b9ae25b073b00c 100644 (file)
--- a/Tools/msi/make_zip.proj
+++ b/Tools/msi/make_zip.proj
@@ -17,15 +17,12 @@
         <CleanCommand>rmdir /q/s "$(IntermediateOutputPath)\zip_$(ArchName)"</CleanCommand>
         <Arguments>"$(PythonExe)" "$(MSBuildThisFileDirectory)\make_zip.py"</Arguments>
         <Arguments>$(Arguments) -e -o "$(TargetPath)" -t "$(IntermediateOutputPath)\zip_$(ArchName)" -a $(ArchName)</Arguments>
-        <Environment>set DOC_FILENAME=python$(PythonVersion).chm
-set VCREDIST_PATH=$(VS140COMNTOOLS)\..\..\VC\redist\$(Platform)\Microsoft.VC140.CRT</Environment>
+        <Environment>set DOC_FILENAME=python$(PythonVersion).chm</Environment>
+        <Environment Condition="Exists($(CRTRedist))">$(Environment)%0D%0Aset VCREDIST_PATH=$(CRTRedist)\$(Platform)</Environment>
     </PropertyGroup>
 
     <Target Name="_Build">
-        <Exec Command="setlocal
-$(Environment)
-$(CleanCommand)
-$(Arguments)" />
+        <Exec Command="setlocal%0D%0A$(Environment)%0D%0A$(CleanCommand)%0D%0A$(Arguments)" />
     </Target>
 
     <Target Name="AfterBuild" />

diff --git a/Tools/nuget/make_pkg.proj b/Tools/nuget/make_pkg.proj
index d7e932cee54d3c11c0904d02e07cc647114bc6f0..464ef0456af47a790a605ffe5767194cea466222 100644 (file)
--- a/Tools/nuget/make_pkg.proj
+++ b/Tools/nuget/make_pkg.proj
@@ -34,9 +34,8 @@
         <NugetArguments>$(NugetArguments) -Version "$(NuspecVersion)"</NugetArguments>
         <NugetArguments>$(NugetArguments) -NoPackageAnalysis -NonInteractive</NugetArguments>
         
-        <Environment>setlocal
-set DOC_FILENAME=python$(PythonVersion).chm
-set VCREDIST_PATH=$(VS140COMNTOOLS)\..\..\VC\redist\$(Platform)\Microsoft.VC140.CRT</Environment>
+        <Environment>set DOC_FILENAME=python$(PythonVersion).chm</Environment>
+        <Environment Condition="Exists($(CRTRedist))">$(Environment)%0D%0Aset VCREDIST_PATH=$(CRTRedist)\$(Platform)</Environment>
     </PropertyGroup>
 
     <Target Name="_NugetMissing" BeforeTargets="_Build" Condition="!Exists($(Nuget))">
@@ -45,8 +44,7 @@ set VCREDIST_PATH=$(VS140COMNTOOLS)\..\..\VC\redist\$(Platform)\Microsoft.VC140.
 
     <Target Name="_Build">
         <Exec Command="$(CleanCommand)" />
-        <Exec Command="$(Environment)
-$(PythonArguments)" />
+        <Exec Command="setlocal%0D%0A$(Environment)%0D%0A$(PythonArguments)" />
         <Exec Command="$(PipArguments)" />
         <Exec Command="$(PackageArguments)" Condition="$(PackageArguments) != ''" />
         <Exec Command="$(NugetArguments)" />