From f0851910eb8e711bf8f22165cb0df33bb27b09d6 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Wed, 26 Jul 2017 09:09:01 -0700 Subject: [PATCH] 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. --- Tools/msi/buildrelease.bat | 7 ++++--- Tools/msi/make_zip.proj | 3 ++- Tools/msi/make_zip.py | 31 +++++++++++++++++-------------- Tools/nuget/build.bat | 5 +++-- Tools/nuget/make_pkg.proj | 6 +++++- Tools/nuget/pythondaily.nuspec | 18 ++++++++++++++++++ 6 files changed, 49 insertions(+), 21 deletions(-) create mode 100644 Tools/nuget/pythondaily.nuspec diff --git a/Tools/msi/buildrelease.bat b/Tools/msi/buildrelease.bat index 7f9a81b33d4..5dc1b57b668 100644 --- a/Tools/msi/buildrelease.bat +++ b/Tools/msi/buildrelease.bat @@ -29,6 +29,7 @@ set DOWNLOAD_URL=https://www.python.org/ftp/python/{version}/{arch}{releasename} set D=%~dp0 set PCBUILD=%D%..\..\PCBuild\ +if "%Py_OutDir%"=="" set Py_OutDir=%PCBUILD% set EXTERNALS=%D%..\..\externals\windows-installer\ set BUILDX86= @@ -110,12 +111,12 @@ exit /B 0 if "%1" EQU "x86" ( set PGO= - set BUILD=%PCBUILD%win32\ + set BUILD=%Py_OutDir%win32\ set BUILD_PLAT=Win32 set OUTDIR_PLAT=win32 set OBJDIR_PLAT=x86 ) else ( - set BUILD=%PCBUILD%amd64\ + set BUILD=%Py_OutDir%amd64\ set PGO=%~2 set BUILD_PLAT=x64 set OUTDIR_PLAT=amd64 @@ -167,7 +168,7 @@ if not "%SKIPBUILD%" EQU "1" ( if "%OUTDIR_PLAT%" EQU "win32" ( %MSBUILD% "%D%launcher\launcher.wixproj" /p:Platform=x86 %CERTOPTS% /p:ReleaseUri=%RELEASE_URI% if errorlevel 1 exit /B -) else if not exist "%PCBUILD%win32\en-us\launcher.msi" ( +) else if not exist "%Py_OutDir%win32\en-us\launcher.msi" ( %MSBUILD% "%D%launcher\launcher.wixproj" /p:Platform=x86 %CERTOPTS% /p:ReleaseUri=%RELEASE_URI% if errorlevel 1 exit /B ) diff --git a/Tools/msi/make_zip.proj b/Tools/msi/make_zip.proj index b3588b7a0ba..21411173421 100644 --- a/Tools/msi/make_zip.proj +++ b/Tools/msi/make_zip.proj @@ -16,8 +16,9 @@ $(OutputPath)\$(TargetName)$(TargetExt) rmdir /q/s "$(IntermediateOutputPath)\zip_$(ArchName)" "$(PythonExe)" "$(MSBuildThisFileDirectory)\make_zip.py" - $(Arguments) -e -o "$(TargetPath)" -t "$(IntermediateOutputPath)\zip_$(ArchName)" -a $(ArchName) + $(Arguments) -e -o "$(TargetPath)" -t "$(IntermediateOutputPath)\zip_$(ArchName)" -b "$(BuildPath.TrimEnd(`\`))" set DOC_FILENAME=python$(PythonVersion).chm + $(Environment)%0D%0Aset PYTHONPATH=$(PySourcePath)Lib $(Environment)%0D%0Aset VCREDIST_PATH=$(CRTRedist)\$(Platform) diff --git a/Tools/msi/make_zip.py b/Tools/msi/make_zip.py index 0034f6b9b4d..8e35bdc5679 100644 --- a/Tools/msi/make_zip.py +++ b/Tools/msi/make_zip.py @@ -106,23 +106,23 @@ def include_in_tools(p): BASE_NAME = 'python{0.major}{0.minor}'.format(sys.version_info) FULL_LAYOUT = [ - ('/', 'PCBuild/$arch', 'python.exe', is_not_debug), - ('/', 'PCBuild/$arch', 'pythonw.exe', is_not_debug), - ('/', 'PCBuild/$arch', 'python{}.dll'.format(sys.version_info.major), is_not_debug), - ('/', 'PCBuild/$arch', '{}.dll'.format(BASE_NAME), is_not_debug), - ('DLLs/', 'PCBuild/$arch', '*.pyd', is_not_debug), - ('DLLs/', 'PCBuild/$arch', '*.dll', is_not_debug_or_python), + ('/', '$build', 'python.exe', is_not_debug), + ('/', '$build', 'pythonw.exe', is_not_debug), + ('/', '$build', 'python{}.dll'.format(sys.version_info.major), is_not_debug), + ('/', '$build', '{}.dll'.format(BASE_NAME), is_not_debug), + ('DLLs/', '$build', '*.pyd', is_not_debug), + ('DLLs/', '$build', '*.dll', is_not_debug_or_python), ('include/', 'include', '*.h', None), ('include/', 'PC', 'pyconfig.h', None), ('Lib/', 'Lib', '**/*', include_in_lib), - ('libs/', 'PCBuild/$arch', '*.lib', include_in_libs), + ('libs/', '$build', '*.lib', include_in_libs), ('Tools/', 'Tools', '**/*', include_in_tools), ] EMBED_LAYOUT = [ - ('/', 'PCBuild/$arch', 'python*.exe', is_not_debug), - ('/', 'PCBuild/$arch', '*.pyd', is_not_debug), - ('/', 'PCBuild/$arch', '*.dll', is_not_debug), + ('/', '$build', 'python*.exe', is_not_debug), + ('/', '$build', '*.pyd', is_not_debug), + ('/', '$build', '*.dll', is_not_debug), ('{}.zip'.format(BASE_NAME), 'Lib', '**/*', include_in_embeddable_lib), ] @@ -187,15 +187,15 @@ def main(): parser.add_argument('-o', '--out', metavar='file', help='The name of the output archive', type=Path, default=None) parser.add_argument('-t', '--temp', metavar='dir', help='A directory to temporarily extract files into', type=Path, default=None) parser.add_argument('-e', '--embed', help='Create an embedding layout', action='store_true', default=False) - parser.add_argument('-a', '--arch', help='Specify the architecture to use (win32/amd64)', type=str, default="win32") + parser.add_argument('-b', '--build', help='Specify the build directory', type=Path, default=None) ns = parser.parse_args() source = ns.source or (Path(__file__).resolve().parent.parent.parent) out = ns.out - arch = ns.arch + build = ns.build or Path(sys.exec_prefix) assert isinstance(source, Path) assert not out or isinstance(out, Path) - assert isinstance(arch, str) + assert isinstance(build, Path) if ns.temp: temp = ns.temp @@ -218,7 +218,10 @@ def main(): try: for t, s, p, c in layout: - fs = source / s.replace("$arch", arch) + if s == '$build': + fs = build + else: + fs = source / s files = rglob(fs, p, c) extra_files = [] if s == 'Lib' and p == '**/*': diff --git a/Tools/nuget/build.bat b/Tools/nuget/build.bat index 54498ca28a2..0b4f622e078 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 464ef0456af..3750d8dcc86 100644 --- a/Tools/nuget/make_pkg.proj +++ b/Tools/nuget/make_pkg.proj @@ -4,6 +4,7 @@ {10487945-15D1-4092-A214-338395C4116B} python $(OutputName)x86 + $(OutputName)daily false true @@ -15,6 +16,7 @@ $(ExternalsDir)\windows-installer\nuget\nuget.exe $(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber) $(NuspecVersion)-$(ReleaseLevelName) + $(MajorVersionNumber).$(MinorVersionNumber).$(DailyBuildVersion) false $(OutputName).$(NuspecVersion) .nupkg @@ -23,7 +25,7 @@ rmdir /q/s "$(IntermediateOutputPath)" "$(PythonExe)" "$(MSBuildThisFileDirectory)\..\msi\make_zip.py" - $(PythonArguments) -t "$(IntermediateOutputPath)" -a $(ArchName) + $(PythonArguments) -t "$(IntermediateOutputPath)" -b "$(BuildPath.TrimEnd(`\`))" "$(IntermediateOutputPath)\python.exe" -B -c "import sys; sys.path.append(r'$(PySourcePath)\Lib'); import ensurepip; ensurepip._main()" "$(IntermediateOutputPath)\python.exe" -B -m pip install -U $(Packages) @@ -35,7 +37,9 @@ $(NugetArguments) -NoPackageAnalysis -NonInteractive set DOC_FILENAME=python$(PythonVersion).chm + $(Environment)%0D%0Aset PYTHONPATH=$(PySourcePath)Lib $(Environment)%0D%0Aset VCREDIST_PATH=$(CRTRedist)\$(Platform) + $(Environment)%0D%0Amkdir "$(OutputPath.Trim(`\`))" >nul 2>nul diff --git a/Tools/nuget/pythondaily.nuspec b/Tools/nuget/pythondaily.nuspec new file mode 100644 index 00000000000..2634ed14a88 --- /dev/null +++ b/Tools/nuget/pythondaily.nuspec @@ -0,0 +1,18 @@ + + + + pythondaily + Python (Daily build) + 0.0.0.0 + Python Software Foundation + https://docs.python.org/3/license.html + https://www.python.org/ + false + Installs an unsigned, untested build of Python for test purposes only. + https://www.python.org/static/favicon.ico + python + + + + +