diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-03-16 11:03:03 -0700 |
|---|---|---|
| committer | Ned Deily <nad@python.org> | 2017-03-21 01:55:26 -0400 |
| commit | 360c49b9cf3c164fa1ee3228e1a68282d77c5e4e (patch) | |
| tree | efc439b5a46c8852486d92dce9c3d31f0f5fbf75 | |
| parent | 75345c552d0889f4f63039d6063f371846c8f41f (diff) | |
| download | cpython-git-360c49b9cf3c164fa1ee3228e1a68282d77c5e4e.tar.gz | |
Takes vcruntime140.dll from the correct source. (#684)
(cherry picked from commit 9cd5e87bac51d7b901e3c36bf22728bb1693da59)
| -rw-r--r-- | Tools/msi/make_zip.proj | 9 | ||||
| -rw-r--r-- | Tools/nuget/make_pkg.proj | 8 |
2 files changed, 6 insertions, 11 deletions
diff --git a/Tools/msi/make_zip.proj b/Tools/msi/make_zip.proj index f78e6ffa28..b3588b7a0b 100644 --- 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 d7e932cee5..464ef0456a 100644 --- 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)" /> |