From: Steve Dower <steve.dower@microsoft.com>
Date: Fri, 24 Jun 2016 18:37:50 +0000 (-0700)
Subject: Preinstalls pip into the nuget package so that pip.exe is available after installation.
X-Git-Tag: v3.6.0a3~84^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f9fbfcdd420a3277dcebbf61cd830b7626539a5;p=thirdparty%2FPython%2Fcpython.git

Preinstalls pip into the nuget package so that pip.exe is available after installation.
---

diff --git a/Tools/nuget/make_pkg.proj b/Tools/nuget/make_pkg.proj
index 812349a43fef..15e6d8f38915 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>