diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-06-24 18:38:00 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-06-24 18:38:00 (GMT) |
| commit | 19b2a53a82c8f4d179efdc39fb39f766191cac2b (patch) | |
| tree | cf27ca8451d6d200c05c43c91b23b56c34e2ebe7 /Tools | |
| parent | 227cec790b7c9962f4eb613850079f29c6b8ff55 (diff) | |
| parent | 3f9fbfcdd420a3277dcebbf61cd830b7626539a5 (diff) | |
| download | cpython-19b2a53a82c8f4d179efdc39fb39f766191cac2b.zip cpython-19b2a53a82c8f4d179efdc39fb39f766191cac2b.tar.gz cpython-19b2a53a82c8f4d179efdc39fb39f766191cac2b.tar.bz2 | |
Merge from 3.5
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/nuget/make_pkg.proj | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Tools/nuget/make_pkg.proj b/Tools/nuget/make_pkg.proj index 812349a..15e6d8f 100644 --- a/Tools/nuget/make_pkg.proj +++ b/Tools/nuget/make_pkg.proj @@ -24,6 +24,8 @@ <PythonArguments>"$(PythonExe)" "$(MSBuildThisFileDirectory)\..\msi\make_zip.py"</PythonArguments> <PythonArguments>$(PythonArguments) -t "$(IntermediateOutputPath)" -a $(ArchName)</PythonArguments> + <PipArguments>"$(IntermediateOutputPath)\python.exe" -B -c "import sys; sys.path.append('$(PySourcePath)\Lib'); import ensurepip; ensurepip._main()"</PipArguments> + <NugetArguments>"$(Nuget)" pack "$(MSBuildThisFileDirectory)\$(OutputName).nuspec"</NugetArguments> <NugetArguments>$(NugetArguments) -BasePath "$(IntermediateOutputPath)"</NugetArguments> <NugetArguments>$(NugetArguments) -OutputDirectory "$(OutputPath)\en-us"</NugetArguments> @@ -40,9 +42,10 @@ set VCREDIST_PATH=$(VS140COMNTOOLS)\..\..\VC\redist\$(Platform)\Microsoft.VC140. </Target> <Target Name="_Build"> + <Exec Command="$(CleanCommand)" /> <Exec Command="$(Environment) -$(CleanCommand) $(PythonArguments)" /> + <Exec Command="$(PipArguments)" /> <Exec Command="$(NugetArguments)" /> </Target> |