[Python-checkins] cpython (3.5): Preinstalls pip into the nuget package so that pip.exe is available after

Fri Jun 24 14:38:10 EDT 2016

https://hg.python.org/cpython/rev/41c3a0ca4f6a
changeset: 102157:41c3a0ca4f6a
branch: 3.5
parent: 102155:4d92949a2080
user: Steve Dower <steve.dower at microsoft.com>
date: Fri Jun 24 11:37:50 2016 -0700
summary:
 Preinstalls pip into the nuget package so that pip.exe is available after installation.
files:
 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
--- 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 @@
 </Target>
 
 <Target Name="_Build">
+ <Exec Command="$(CleanCommand)" />
 <Exec Command="$(Environment)
-$(CleanCommand)
 $(PythonArguments)" />
+ <Exec Command="$(PipArguments)" />
 <Exec Command="$(NugetArguments)" />
 </Target>
 
-- 
Repository URL: https://hg.python.org/cpython
