diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-07-26 16:09:01 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-26 16:09:01 (GMT) |
| commit | f0851910eb8e711bf8f22165cb0df33bb27b09d6 (patch) | |
| tree | e30f22c75c07a9adc56d80bdc050403b22b9ce0c /Tools/nuget | |
| parent | e7bc7aac3d4a7d92aa5913006b0198820882ca59 (diff) | |
| download | cpython-f0851910eb8e711bf8f22165cb0df33bb27b09d6.zip cpython-f0851910eb8e711bf8f22165cb0df33bb27b09d6.tar.gz cpython-f0851910eb8e711bf8f22165cb0df33bb27b09d6.tar.bz2 | |
Fix build batch files (#2750)
* Enable building MSI, zip and nuget packages when Py_OutDir is set.
* Restore the --build option, which got reverted at some point.
* Ensure output directory is created.
* Enables BuildForDaily and DailyBuildVersion options for nuget package.
Diffstat (limited to 'Tools/nuget')
| -rw-r--r-- | Tools/nuget/build.bat | 5 | ||||
| -rw-r--r-- | Tools/nuget/make_pkg.proj | 6 | ||||
| -rw-r--r-- | Tools/nuget/pythondaily.nuspec | 18 |
3 files changed, 26 insertions, 3 deletions
diff --git a/Tools/nuget/build.bat b/Tools/nuget/build.bat index 54498ca..0b4f622 100644 --- a/Tools/nuget/build.bat +++ b/Tools/nuget/build.bat @@ -2,6 +2,7 @@ setlocal set D=%~dp0 set PCBUILD=%D%..\..\PCBuild\ +if "%Py_OutDir%"=="" set Py_OutDir=%PCBUILD% set BUILDX86= set BUILDX64= @@ -28,7 +29,7 @@ if defined PACKAGES set PACKAGES="/p:Packages=%PACKAGES%" if defined BUILDX86 ( if defined REBUILD ( call "%PCBUILD%build.bat" -e -r - ) else if not exist "%PCBUILD%win32\python.exe" call "%PCBUILD%build.bat" -e + ) else if not exist "%Py_OutDir%win32\python.exe" call "%PCBUILD%build.bat" -e if errorlevel 1 goto :eof %MSBUILD% "%D%make_pkg.proj" /p:Configuration=Release /p:Platform=x86 %OUTPUT% %PACKAGES% @@ -37,7 +38,7 @@ if defined BUILDX86 ( if defined BUILDX64 ( if defined REBUILD ( call "%PCBUILD%build.bat" -p x64 -e -r - ) else if not exist "%PCBUILD%amd64\python.exe" call "%PCBUILD%build.bat" -p x64 -e + ) else if not exist "%Py_OutDir%amd64\python.exe" call "%PCBUILD%build.bat" -p x64 -e if errorlevel 1 goto :eof %MSBUILD% "%D%make_pkg.proj" /p:Configuration=Release /p:Platform=x64 %OUTPUT% %PACKAGES% 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))"> diff --git a/Tools/nuget/pythondaily.nuspec b/Tools/nuget/pythondaily.nuspec new file mode 100644 index 0000000..2634ed1 --- /dev/null +++ b/Tools/nuget/pythondaily.nuspec @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<package > + <metadata> + <id>pythondaily</id> + <title>Python (Daily build)</title> + <version>0.0.0.0</version> + <authors>Python Software Foundation</authors> + <licenseUrl>https://docs.python.org/3/license.html</licenseUrl> + <projectUrl>https://www.python.org/</projectUrl> + <requireLicenseAcceptance>false</requireLicenseAcceptance> + <description>Installs an unsigned, untested build of Python for test purposes only.</description> + <iconUrl>https://www.python.org/static/favicon.ico</iconUrl> + <tags>python</tags> + </metadata> + <files> + <file src="**\*" target="tools" /> + </files> +</package> |