Fix build batch files (#2750) · pythoncapi/cpython@f085191 · GitHub
Skip to content

Commit f085191

Browse files
zoobazooba
authored
Fix build batch files (python#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.
1 parent e7bc7aa commit f085191

6 files changed

Lines changed: 49 additions & 21 deletions

File tree

‎Tools/msi/buildrelease.bat‎

Lines changed: 4 additions & 3 deletions

‎Tools/msi/make_zip.proj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
<TargetPath>$(OutputPath)\$(TargetName)$(TargetExt)</TargetPath>
1717
<CleanCommand>rmdir /q/s "$(IntermediateOutputPath)\zip_$(ArchName)"</CleanCommand>
1818
<Arguments>"$(PythonExe)" "$(MSBuildThisFileDirectory)\make_zip.py"</Arguments>
19-
<Arguments>$(Arguments) -e -o "$(TargetPath)" -t "$(IntermediateOutputPath)\zip_$(ArchName)" -a $(ArchName)</Arguments>
19+
<Arguments>$(Arguments) -e -o "$(TargetPath)" -t "$(IntermediateOutputPath)\zip_$(ArchName)" -b "$(BuildPath.TrimEnd(`\`))"</Arguments>
2020
<Environment>set DOC_FILENAME=python$(PythonVersion).chm</Environment>
21+
<Environment>$(Environment)%0D%0Aset PYTHONPATH=$(PySourcePath)Lib</Environment>
2122
<Environment Condition="Exists($(CRTRedist))">$(Environment)%0D%0Aset VCREDIST_PATH=$(CRTRedist)\$(Platform)</Environment>
2223
</PropertyGroup>
2324

‎Tools/msi/make_zip.py‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -106,23 +106,23 @@ def include_in_tools(p):
106106
BASE_NAME = 'python{0.major}{0.minor}'.format(sys.version_info)
107107

108108
FULL_LAYOUT = [
109-
('/', 'PCBuild/$arch', 'python.exe', is_not_debug),
110-
('/', 'PCBuild/$arch', 'pythonw.exe', is_not_debug),
111-
('/', 'PCBuild/$arch', 'python{}.dll'.format(sys.version_info.major), is_not_debug),
112-
('/', 'PCBuild/$arch', '{}.dll'.format(BASE_NAME), is_not_debug),
113-
('DLLs/', 'PCBuild/$arch', '*.pyd', is_not_debug),
114-
('DLLs/', 'PCBuild/$arch', '*.dll', is_not_debug_or_python),
109+
('/', '$build', 'python.exe', is_not_debug),
110+
('/', '$build', 'pythonw.exe', is_not_debug),
111+
('/', '$build', 'python{}.dll'.format(sys.version_info.major), is_not_debug),
112+
('/', '$build', '{}.dll'.format(BASE_NAME), is_not_debug),
113+
('DLLs/', '$build', '*.pyd', is_not_debug),
114+
('DLLs/', '$build', '*.dll', is_not_debug_or_python),
115115
('include/', 'include', '*.h', None),
116116
('include/', 'PC', 'pyconfig.h', None),
117117
('Lib/', 'Lib', '**/*', include_in_lib),
118-
('libs/', 'PCBuild/$arch', '*.lib', include_in_libs),
118+
('libs/', '$build', '*.lib', include_in_libs),
119119
('Tools/', 'Tools', '**/*', include_in_tools),
120120
]
121121

122122
EMBED_LAYOUT = [
123-
('/', 'PCBuild/$arch', 'python*.exe', is_not_debug),
124-
('/', 'PCBuild/$arch', '*.pyd', is_not_debug),
125-
('/', 'PCBuild/$arch', '*.dll', is_not_debug),
123+
('/', '$build', 'python*.exe', is_not_debug),
124+
('/', '$build', '*.pyd', is_not_debug),
125+
('/', '$build', '*.dll', is_not_debug),
126126
('{}.zip'.format(BASE_NAME), 'Lib', '**/*', include_in_embeddable_lib),
127127
]
128128

@@ -187,15 +187,15 @@ def main():
187187
parser.add_argument('-o', '--out', metavar='file', help='The name of the output archive', type=Path, default=None)
188188
parser.add_argument('-t', '--temp', metavar='dir', help='A directory to temporarily extract files into', type=Path, default=None)
189189
parser.add_argument('-e', '--embed', help='Create an embedding layout', action='store_true', default=False)
190-
parser.add_argument('-a', '--arch', help='Specify the architecture to use (win32/amd64)', type=str, default="win32")
190+
parser.add_argument('-b', '--build', help='Specify the build directory', type=Path, default=None)
191191
ns = parser.parse_args()
192192

193193
source = ns.source or (Path(__file__).resolve().parent.parent.parent)
194194
out = ns.out
195-
arch = ns.arch
195+
build = ns.build or Path(sys.exec_prefix)
196196
assert isinstance(source, Path)
197197
assert not out or isinstance(out, Path)
198-
assert isinstance(arch, str)
198+
assert isinstance(build, Path)
199199

200200
if ns.temp:
201201
temp = ns.temp
@@ -218,7 +218,10 @@ def main():
218218

219219
try:
220220
for t, s, p, c in layout:
221-
fs = source / s.replace("$arch", arch)
221+
if s == '$build':
222+
fs = build
223+
else:
224+
fs = source / s
222225
files = rglob(fs, p, c)
223226
extra_files = []
224227
if s == 'Lib' and p == '**/*':

‎Tools/nuget/build.bat‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
setlocal
33
set D=%~dp0
44
set PCBUILD=%D%..\..\PCBuild\
5+
if "%Py_OutDir%"=="" set Py_OutDir=%PCBUILD%
56

67
set BUILDX86=
78
set BUILDX64=
@@ -28,7 +29,7 @@ if defined PACKAGES set PACKAGES="/p:Packages=%PACKAGES%"
2829

2930
if defined BUILDX86 (
3031
if defined REBUILD ( call "%PCBUILD%build.bat" -e -r
31-
) else if not exist "%PCBUILD%win32\python.exe" call "%PCBUILD%build.bat" -e
32+
) else if not exist "%Py_OutDir%win32\python.exe" call "%PCBUILD%build.bat" -e
3233
if errorlevel 1 goto :eof
3334

3435
%MSBUILD% "%D%make_pkg.proj" /p:Configuration=Release /p:Platform=x86 %OUTPUT% %PACKAGES%
@@ -37,7 +38,7 @@ if defined BUILDX86 (
3738

3839
if defined BUILDX64 (
3940
if defined REBUILD ( call "%PCBUILD%build.bat" -p x64 -e -r
40-
) else if not exist "%PCBUILD%amd64\python.exe" call "%PCBUILD%build.bat" -p x64 -e
41+
) else if not exist "%Py_OutDir%amd64\python.exe" call "%PCBUILD%build.bat" -p x64 -e
4142
if errorlevel 1 goto :eof
4243

4344
%MSBUILD% "%D%make_pkg.proj" /p:Configuration=Release /p:Platform=x64 %OUTPUT% %PACKAGES%

‎Tools/nuget/make_pkg.proj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<ProjectGuid>{10487945-15D1-4092-A214-338395C4116B}</ProjectGuid>
55
<OutputName>python</OutputName>
66
<OutputName Condition="$(Platform) == 'x86'">$(OutputName)x86</OutputName>
7+
<OutputName Condition="$(BuildForDaily) == 'true'">$(OutputName)daily</OutputName>
78
<OutputSuffix></OutputSuffix>
89
<SupportSigning>false</SupportSigning>
910
<BuildForRelease Condition="$(BuildForRelease) == ''">true</BuildForRelease>
@@ -15,6 +16,7 @@
1516
<Nuget Condition="$(Nuget) == ''">$(ExternalsDir)\windows-installer\nuget\nuget.exe</Nuget>
1617
<NuspecVersion>$(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber)</NuspecVersion>
1718
<NuspecVersion Condition="$(ReleaseLevelName) != ''">$(NuspecVersion)-$(ReleaseLevelName)</NuspecVersion>
19+
<NuspecVersion Condition="$(BuildForDaily) == 'true'">$(MajorVersionNumber).$(MinorVersionNumber).$(DailyBuildVersion)</NuspecVersion>
1820
<SignOutput>false</SignOutput>
1921
<TargetName>$(OutputName).$(NuspecVersion)</TargetName>
2022
<TargetExt>.nupkg</TargetExt>
@@ -23,7 +25,7 @@
2325
<CleanCommand>rmdir /q/s "$(IntermediateOutputPath)"</CleanCommand>
2426

2527
<PythonArguments>"$(PythonExe)" "$(MSBuildThisFileDirectory)\..\msi\make_zip.py"</PythonArguments>
26-
<PythonArguments>$(PythonArguments) -t "$(IntermediateOutputPath)" -a $(ArchName)</PythonArguments>
28+
<PythonArguments>$(PythonArguments) -t "$(IntermediateOutputPath)" -b "$(BuildPath.TrimEnd(`\`))"</PythonArguments>
2729

2830
<PipArguments>"$(IntermediateOutputPath)\python.exe" -B -c "import sys; sys.path.append(r'$(PySourcePath)\Lib'); import ensurepip; ensurepip._main()"</PipArguments>
2931
<PackageArguments Condition="$(Packages) != ''">"$(IntermediateOutputPath)\python.exe" -B -m pip install -U $(Packages)</PackageArguments>
@@ -35,7 +37,9 @@
3537
<NugetArguments>$(NugetArguments) -NoPackageAnalysis -NonInteractive</NugetArguments>
3638

3739
<Environment>set DOC_FILENAME=python$(PythonVersion).chm</Environment>
40+
<Environment>$(Environment)%0D%0Aset PYTHONPATH=$(PySourcePath)Lib</Environment>
3841
<Environment Condition="Exists($(CRTRedist))">$(Environment)%0D%0Aset VCREDIST_PATH=$(CRTRedist)\$(Platform)</Environment>
42+
<Environment>$(Environment)%0D%0Amkdir "$(OutputPath.Trim(`\`))" &gt;nul 2&gt;nul</Environment>
3943
</PropertyGroup>
4044

4145
<Target Name="_NugetMissing" BeforeTargets="_Build" Condition="!Exists($(Nuget))">

‎Tools/nuget/pythondaily.nuspec‎

Lines changed: 18 additions & 0 deletions

0 commit comments

Comments
 (0)