diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-03-16 17:19:18 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-16 17:19:18 (GMT) |
| commit | 328612353266d86c248950a910efa869c8c9c087 (patch) | |
| tree | b62fcf92f18b05cff568bc16c5b887a81f8e1d8f /Tools | |
| parent | bd583ef9857d99f9145ad0bb2c4424cc0baa63fc (diff) | |
| download | cpython-328612353266d86c248950a910efa869c8c9c087.zip cpython-328612353266d86c248950a910efa869c8c9c087.tar.gz cpython-328612353266d86c248950a910efa869c8c9c087.tar.bz2 | |
Takes vcruntime140.dll from the correct source. (#679)
Diffstat (limited to 'Tools')
| -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 f78e6ff..b3588b7 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 d7e932c..464ef04 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)" /> |