diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-03-16 17:45:41 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-16 17:45:41 (GMT) |
| commit | 00cbb8a0fa49b23ba15001d5a754717d07f824f9 (patch) | |
| tree | 8526434bebffdc19fe5b0428e1fe71558d74802d | |
| parent | 9a29d7577a6da0ab0f4411567204f1a93a2452b6 (diff) | |
| download | cpython-00cbb8a0fa49b23ba15001d5a754717d07f824f9.zip cpython-00cbb8a0fa49b23ba15001d5a754717d07f824f9.tar.gz cpython-00cbb8a0fa49b23ba15001d5a754717d07f824f9.tar.bz2 | |
Takes vcruntime140.dll from the correct source. (#683)
| -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 1af6dd2..1ff5fc5 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)" -b "$(BuildPath.TrimEnd('\'))"</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 81b84f9..21acc2a 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)" /> |