diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-03-16 18:03:03 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-16 18:03:03 (GMT) |
| commit | 9cd5e87bac51d7b901e3c36bf22728bb1693da59 (patch) | |
| tree | 85cc1db4dfc80c9af9fb8de7552165f830176b7b /Tools/nuget | |
| parent | 0dfd18a1e14e08b0d6459c2dd1898e5bb38020c5 (diff) | |
| download | cpython-9cd5e87bac51d7b901e3c36bf22728bb1693da59.zip cpython-9cd5e87bac51d7b901e3c36bf22728bb1693da59.tar.gz cpython-9cd5e87bac51d7b901e3c36bf22728bb1693da59.tar.bz2 | |
Takes vcruntime140.dll from the correct source. (#684)
Diffstat (limited to 'Tools/nuget')
| -rw-r--r-- | Tools/nuget/make_pkg.proj | 8 |
1 files changed, 3 insertions, 5 deletions
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)" /> |