diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-06-27 09:34:18 -0700 |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-06-27 09:34:18 -0700 |
| commit | 33128c815e8e7e35ab913e9eb176cf14842ea962 (patch) | |
| tree | d6487c3944489dfb2b6bef51db0aac74f1fb76f6 /Tools/nuget | |
| parent | 6803f35acce4490de75a3a234000568904ea87f8 (diff) | |
| download | cpython-git-33128c815e8e7e35ab913e9eb176cf14842ea962.tar.gz | |
Include libs folder in nuget package and allow preinstalling packages
Diffstat (limited to 'Tools/nuget')
| -rw-r--r-- | Tools/nuget/make_pkg.proj | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Tools/nuget/make_pkg.proj b/Tools/nuget/make_pkg.proj index bd3fad8a37..542bf0742d 100644 --- a/Tools/nuget/make_pkg.proj +++ b/Tools/nuget/make_pkg.proj @@ -17,7 +17,7 @@ <SignOutput>false</SignOutput> <TargetName>$(OutputName).$(NuspecVersion)</TargetName> <TargetExt>.nupkg</TargetExt> - <TargetPath>$(OutputPath)\en-us\$(TargetName)$(TargetExt)</TargetPath> + <TargetPath>$(OutputPath)\$(TargetName)$(TargetExt)</TargetPath> <IntermediateOutputPath>$(IntermediateOutputPath)\nuget_$(ArchName)</IntermediateOutputPath> <CleanCommand>rmdir /q/s "$(IntermediateOutputPath)"</CleanCommand> @@ -26,10 +26,11 @@ <PythonArguments>$(PythonArguments) -t "$(IntermediateOutputPath)" -a $(ArchName)</PythonArguments> <PipArguments>"$(IntermediateOutputPath)\python.exe" -B -c "import sys; sys.path.append(r'$(PySourcePath)\Lib'); import ensurepip; ensurepip._main()"</PipArguments> + <PackageArguments Condition="$(Packages) != ''">"$(IntermediateOutputPath)\python.exe" -B -m pip install -U $(Packages)</PackageArguments> <NugetArguments>"$(Nuget)" pack "$(MSBuildThisFileDirectory)\$(OutputName).nuspec"</NugetArguments> <NugetArguments>$(NugetArguments) -BasePath "$(IntermediateOutputPath)"</NugetArguments> - <NugetArguments>$(NugetArguments) -OutputDirectory "$(OutputPath)\en-us"</NugetArguments> + <NugetArguments>$(NugetArguments) -OutputDirectory "$(OutputPath.Trim(`\`))"</NugetArguments> <NugetArguments>$(NugetArguments) -Version "$(NuspecVersion)"</NugetArguments> <NugetArguments>$(NugetArguments) -NoPackageAnalysis -NonInteractive</NugetArguments> @@ -47,6 +48,7 @@ set VCREDIST_PATH=$(VS140COMNTOOLS)\..\..\VC\redist\$(Platform)\Microsoft.VC140. <Exec Command="$(Environment) $(PythonArguments)" /> <Exec Command="$(PipArguments)" /> + <Exec Command="$(PackageArguments)" Condition="$(PackageArguments) != ''" /> <Exec Command="$(NugetArguments)" /> </Target> |