diff options
Diffstat (limited to 'Tools/nuget/make_pkg.proj')
| -rw-r--r-- | Tools/nuget/make_pkg.proj | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Tools/nuget/make_pkg.proj b/Tools/nuget/make_pkg.proj index 464ef04..3750d8d 100644 --- a/Tools/nuget/make_pkg.proj +++ b/Tools/nuget/make_pkg.proj @@ -4,6 +4,7 @@ <ProjectGuid>{10487945-15D1-4092-A214-338395C4116B}</ProjectGuid> <OutputName>python</OutputName> <OutputName Condition="$(Platform) == 'x86'">$(OutputName)x86</OutputName> + <OutputName Condition="$(BuildForDaily) == 'true'">$(OutputName)daily</OutputName> <OutputSuffix></OutputSuffix> <SupportSigning>false</SupportSigning> <BuildForRelease Condition="$(BuildForRelease) == ''">true</BuildForRelease> @@ -15,6 +16,7 @@ <Nuget Condition="$(Nuget) == ''">$(ExternalsDir)\windows-installer\nuget\nuget.exe</Nuget> <NuspecVersion>$(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber)</NuspecVersion> <NuspecVersion Condition="$(ReleaseLevelName) != ''">$(NuspecVersion)-$(ReleaseLevelName)</NuspecVersion> + <NuspecVersion Condition="$(BuildForDaily) == 'true'">$(MajorVersionNumber).$(MinorVersionNumber).$(DailyBuildVersion)</NuspecVersion> <SignOutput>false</SignOutput> <TargetName>$(OutputName).$(NuspecVersion)</TargetName> <TargetExt>.nupkg</TargetExt> @@ -23,7 +25,7 @@ <CleanCommand>rmdir /q/s "$(IntermediateOutputPath)"</CleanCommand> <PythonArguments>"$(PythonExe)" "$(MSBuildThisFileDirectory)\..\msi\make_zip.py"</PythonArguments> - <PythonArguments>$(PythonArguments) -t "$(IntermediateOutputPath)" -a $(ArchName)</PythonArguments> + <PythonArguments>$(PythonArguments) -t "$(IntermediateOutputPath)" -b "$(BuildPath.TrimEnd(`\`))"</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> @@ -35,7 +37,9 @@ <NugetArguments>$(NugetArguments) -NoPackageAnalysis -NonInteractive</NugetArguments> <Environment>set DOC_FILENAME=python$(PythonVersion).chm</Environment> + <Environment>$(Environment)%0D%0Aset PYTHONPATH=$(PySourcePath)Lib</Environment> <Environment Condition="Exists($(CRTRedist))">$(Environment)%0D%0Aset VCREDIST_PATH=$(CRTRedist)\$(Platform)</Environment> + <Environment>$(Environment)%0D%0Amkdir "$(OutputPath.Trim(`\`))" >nul 2>nul</Environment> </PropertyGroup> <Target Name="_NugetMissing" BeforeTargets="_Build" Condition="!Exists($(Nuget))"> |