Skip to content

C
cpython
Kaydet (Commit) 32861235 authored tarafından Steve Dower's avatar Steve Dower Kaydeden (comit) GitHub
Dosyalara gözat
Seçenekler

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

üst bd583ef9
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 11 deletions
Tools/msi/make_zip.proj
Dosyayı görüntüle @ 32861235
...@@ -17,15 +17,12 @@ ...@@ -17,15 +17,12 @@
<CleanCommand>rmdir /q/s "$(IntermediateOutputPath)\zip_$(ArchName)"</CleanCommand> <CleanCommand>rmdir /q/s "$(IntermediateOutputPath)\zip_$(ArchName)"</CleanCommand>
<Arguments>"$(PythonExe)" "$(MSBuildThisFileDirectory)\make_zip.py"</Arguments> <Arguments>"$(PythonExe)" "$(MSBuildThisFileDirectory)\make_zip.py"</Arguments>
<Arguments>$(Arguments) -e -o "$(TargetPath)" -t "$(IntermediateOutputPath)\zip_$(ArchName)" -a $(ArchName)</Arguments> <Arguments>$(Arguments) -e -o "$(TargetPath)" -t "$(IntermediateOutputPath)\zip_$(ArchName)" -a $(ArchName)</Arguments>
<Environment>set DOC_FILENAME=python$(PythonVersion).chm <Environment>set DOC_FILENAME=python$(PythonVersion).chm</Environment>
set VCREDIST_PATH=$(VS140COMNTOOLS)\..\..\VC\redist\$(Platform)\Microsoft.VC140.CRT</Environment> <Environment Condition="Exists($(CRTRedist))">$(Environment)%0D%0Aset VCREDIST_PATH=$(CRTRedist)\$(Platform)</Environment>
</PropertyGroup> </PropertyGroup>
<Target Name="_Build"> <Target Name="_Build">
<Exec Command="setlocal <Exec Command="setlocal%0D%0A$(Environment)%0D%0A$(CleanCommand)%0D%0A$(Arguments)" />
$(Environment)
$(CleanCommand)
$(Arguments)" />
</Target> </Target>
<Target Name="AfterBuild" /> <Target Name="AfterBuild" />
......
Tools/nuget/make_pkg.proj
Dosyayı görüntüle @ 32861235
...@@ -34,9 +34,8 @@ ...@@ -34,9 +34,8 @@
<NugetArguments>$(NugetArguments) -Version "$(NuspecVersion)"</NugetArguments> <NugetArguments>$(NugetArguments) -Version "$(NuspecVersion)"</NugetArguments>
<NugetArguments>$(NugetArguments) -NoPackageAnalysis -NonInteractive</NugetArguments> <NugetArguments>$(NugetArguments) -NoPackageAnalysis -NonInteractive</NugetArguments>
<Environment>setlocal <Environment>set DOC_FILENAME=python$(PythonVersion).chm</Environment>
set DOC_FILENAME=python$(PythonVersion).chm <Environment Condition="Exists($(CRTRedist))">$(Environment)%0D%0Aset VCREDIST_PATH=$(CRTRedist)\$(Platform)</Environment>
set VCREDIST_PATH=$(VS140COMNTOOLS)\..\..\VC\redist\$(Platform)\Microsoft.VC140.CRT</Environment>
</PropertyGroup> </PropertyGroup>
<Target Name="_NugetMissing" BeforeTargets="_Build" Condition="!Exists($(Nuget))"> <Target Name="_NugetMissing" BeforeTargets="_Build" Condition="!Exists($(Nuget))">
...@@ -45,8 +44,7 @@ set VCREDIST_PATH=$(VS140COMNTOOLS)\..\..\VC\redist\$(Platform)\Microsoft.VC140. ...@@ -45,8 +44,7 @@ set VCREDIST_PATH=$(VS140COMNTOOLS)\..\..\VC\redist\$(Platform)\Microsoft.VC140.
<Target Name="_Build"> <Target Name="_Build">
<Exec Command="$(CleanCommand)" /> <Exec Command="$(CleanCommand)" />
<Exec Command="$(Environment) <Exec Command="setlocal%0D%0A$(Environment)%0D%0A$(PythonArguments)" />
$(PythonArguments)" />
<Exec Command="$(PipArguments)" /> <Exec Command="$(PipArguments)" />
<Exec Command="$(PackageArguments)" Condition="$(PackageArguments) != ''" /> <Exec Command="$(PackageArguments)" Condition="$(PackageArguments) != ''" />
<Exec Command="$(NugetArguments)" /> <Exec Command="$(NugetArguments)" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment