Skip to content

Commit de148f2

Browse files
zoobazooba
authored
bpo-33125: Add support for building and releasing Windows ARM64 packages (GH-16828)
Note that the support is not actually enabled yet, and so we won't be publishing these packages. However, for those who want to build it themselves (even by reusing the Azure Pipelines definition), it's now relatively easy to enable.
1 parent abce2d9 commit de148f2

29 files changed

+286
-74
lines changed

‎.azure-pipelines/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ jobs:
145145
buildOpt: '-p x64'
146146
testRunTitle: '$(Build.SourceBranchName)-win64'
147147
testRunPlatform: win64
148-
maxParallel: 2
148+
maxParallel: 4
149149

150150
steps:
151151
- template: ./windows-steps.yml

‎.azure-pipelines/pr.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,10 @@ jobs:
145145
buildOpt: '-p x64'
146146
testRunTitle: '$(System.PullRequest.TargetBranch)-win64'
147147
testRunPlatform: win64
148-
maxParallel: 2
148+
winarm64:
149+
arch: arm64
150+
buildOpt: '-p arm64'
151+
maxParallel: 4
149152

150153
steps:
151154
- template: ./windows-steps.yml

‎.azure-pipelines/windows-release/build-steps.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ steps:
4343

4444
- powershell: |
4545
$env:SigningCertificate = $null
46-
.\python.bat PC\layout -vv -t "$(Build.BinariesDirectory)\catalog" --catalog "${env:CAT}.cdf" --preset-default
46+
python PC\layout -vv -b "$(Build.BinariesDirectory)\bin" -t "$(Build.BinariesDirectory)\catalog" --catalog "${env:CAT}.cdf" --preset-default --arch $(Arch)
4747
makecat "${env:CAT}.cdf"
4848
del "${env:CAT}.cdf"
4949
if (-not (Test-Path "${env:CAT}.cat")) {
@@ -52,6 +52,7 @@ steps:
5252
displayName: 'Generate catalog'
5353
env:
5454
CAT: $(Build.BinariesDirectory)\bin\$(Arch)\python
55+
PYTHON_HEXVERSION: $(VersionHex)
5556

5657
- task: PublishPipelineArtifact@0
5758
displayName: 'Publish binaries'

‎.azure-pipelines/windows-release/layout-command.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
steps:
2+
- task: DownloadPipelineArtifact@1
3+
displayName: 'Download artifact: bin_$(HostArch)'
4+
condition: and(succeeded(), variables['HostArch'])
5+
inputs:
6+
artifactName: bin_$(HostArch)
7+
targetPath: $(Build.BinariesDirectory)\bin_$(HostArch)
8+
29
- powershell: >
310
Write-Host (
411
'##vso[task.setvariable variable=LayoutCmd]&
5-
"{0}\bin\python.exe"
12+
"$(Python)"
613
"{1}\PC\layout"
714
-vv
815
--source "{1}"
916
--build "{0}\bin"
17+
--arch "$(Name)"
1018
--temp "{0}\layout-temp"
1119
--include-cat "{0}\bin\python.cat"
1220
--doc-build "{0}\doc"'

‎.azure-pipelines/windows-release/msi-steps.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ steps:
5454
- powershell: |
5555
copy $(Build.BinariesDirectory)\amd64\Activate.ps1 Lib\venv\scripts\common\Activate.ps1 -Force
5656
displayName: 'Copy signed files into sources'
57+
condition: and(succeeded(), variables['SigningCertificate'])
5758
5859
- script: |
5960
call Tools\msi\get_externals.bat

‎.azure-pipelines/windows-release/stage-build.yml‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,16 @@ jobs:
1616
env:
1717
BUILDDIR: $(Build.BinariesDirectory)\Doc
1818

19-
#- powershell: iwr "https://www.python.org/ftp/python/3.7.3/python373.chm" -OutFile "$(Build.BinariesDirectory)\python390a0.chm"
20-
# displayName: 'Cheat at building CHM docs'
21-
2219
- script: Doc\make.bat htmlhelp
2320
displayName: 'Build CHM docs'
2421
env:
2522
BUILDDIR: $(Build.BinariesDirectory)\Doc
2623

24+
#- powershell: |
25+
# mkdir -Force "$(Build.BinariesDirectory)\Doc\htmlhelp"
26+
# iwr "https://www.python.org/ftp/python/3.8.0/python380.chm" -OutFile "$(Build.BinariesDirectory)\Doc\htmlhelp\python390a0.chm"
27+
# displayName: 'Cheat at building CHM docs'
28+
2729
- task: CopyFiles@2
2830
displayName: 'Assemble artifact: Doc'
2931
inputs:
@@ -65,6 +67,16 @@ jobs:
6567
Arch: amd64
6668
Platform: x64
6769
Configuration: Debug
70+
arm64:
71+
Name: arm64
72+
Arch: arm64
73+
Platform: ARM64
74+
Configuration: Release
75+
arm64_d:
76+
Name: arm64_d
77+
Arch: arm64
78+
Platform: ARM64
79+
Configuration: Debug
6880

6981
steps:
7082
- template: ./build-steps.yml

‎.azure-pipelines/windows-release/stage-layout-embed.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ jobs:
1919
Name: amd64
2020
Python: $(Build.BinariesDirectory)\bin\python.exe
2121
PYTHONHOME: $(Build.SourcesDirectory)
22+
arm64:
23+
Name: arm64
24+
HostArch: amd64
25+
Python: $(Build.BinariesDirectory)\bin_amd64\python.exe
26+
PYTHONHOME: $(Build.SourcesDirectory)
2227

2328
steps:
2429
- template: ./checkout.yml

‎.azure-pipelines/windows-release/stage-layout-full.yml‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,18 @@ jobs:
1313
matrix:
1414
win32:
1515
Name: win32
16-
Python: $(Build.BinariesDirectory)\bin_$(Name)\python.exe
16+
Python: $(Build.BinariesDirectory)\bin\python.exe
1717
PYTHONHOME: $(Build.SourcesDirectory)
18+
TclLibrary: $(Build.BinariesDirectory)\tcltk_lib\tcl8
1819
amd64:
1920
Name: amd64
20-
Python: $(Build.BinariesDirectory)\bin_$(Name)\python.exe
21+
Python: $(Build.BinariesDirectory)\bin\python.exe
22+
PYTHONHOME: $(Build.SourcesDirectory)
23+
TclLibrary: $(Build.BinariesDirectory)\tcltk_lib\tcl8
24+
arm64:
25+
Name: arm64
26+
HostArch: amd64
27+
Python: $(Build.BinariesDirectory)\bin_amd64\python.exe
2128
PYTHONHOME: $(Build.SourcesDirectory)
2229

2330
steps:
@@ -43,21 +50,23 @@ jobs:
4350

4451
- task: DownloadPipelineArtifact@1
4552
displayName: 'Download artifact: tcltk_lib_$(Name)'
53+
condition: and(succeeded(), variables['TclLibrary'])
4654
inputs:
4755
artifactName: tcltk_lib_$(Name)
4856
targetPath: $(Build.BinariesDirectory)\tcltk_lib
4957

5058
- powershell: |
51-
copy $(Build.BinariesDirectory)\bin\Activate.ps1 Lib\venv\scripts\common\Activate.ps1 -Force
59+
copy "$(Build.BinariesDirectory)\bin\Activate.ps1" Lib\venv\scripts\common\Activate.ps1 -Force
5260
displayName: 'Copy signed files into sources'
61+
condition: and(succeeded(), variables['SigningCertificate'])
5362
5463
- template: ./layout-command.yml
5564

5665
- powershell: |
5766
$(LayoutCmd) --copy "$(Build.ArtifactStagingDirectory)\layout" --preset-default
5867
displayName: 'Generate full layout'
5968
env:
60-
TCL_LIBRARY: $(Build.BinariesDirectory)\tcltk_lib\tcl8
69+
TCL_LIBRARY: $(TclLibrary)
6170
6271
- task: PublishPipelineArtifact@0
6372
displayName: 'Publish Artifact: layout_full_$(Name)'

‎.azure-pipelines/windows-release/stage-layout-msix.yml‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,18 @@ jobs:
1212
matrix:
1313
#win32:
1414
# Name: win32
15-
# Python: $(Build.BinariesDirectory)\bin_$(Name)\python.exe
15+
# Python: $(Build.BinariesDirectory)\bin\python.exe
1616
# PYTHONHOME: $(Build.SourcesDirectory)
17+
# TclLibrary: $(Build.BinariesDirectory)\tcltk_lib\tcl8
1718
amd64:
1819
Name: amd64
19-
Python: $(Build.BinariesDirectory)\bin_$(Name)\python.exe
20+
Python: $(Build.BinariesDirectory)\bin\python.exe
21+
PYTHONHOME: $(Build.SourcesDirectory)
22+
TclLibrary: $(Build.BinariesDirectory)\tcltk_lib\tcl8
23+
arm64:
24+
Name: arm64
25+
HostArch: amd64
26+
Python: $(Build.BinariesDirectory)\bin_amd64\python.exe
2027
PYTHONHOME: $(Build.SourcesDirectory)
2128

2229
steps:
@@ -36,13 +43,15 @@ jobs:
3643

3744
- task: DownloadPipelineArtifact@1
3845
displayName: 'Download artifact: tcltk_lib_$(Name)'
46+
condition: and(succeeded(), variables['TclLibrary'])
3947
inputs:
4048
artifactName: tcltk_lib_$(Name)
4149
targetPath: $(Build.BinariesDirectory)\tcltk_lib
4250

4351
- powershell: |
44-
copy $(Build.BinariesDirectory)\bin\Activate.ps1 Lib\venv\scripts\common\Activate.ps1 -Force
52+
copy "$(Build.BinariesDirectory)\bin\Activate.ps1" Lib\venv\scripts\common\Activate.ps1 -Force
4553
displayName: 'Copy signed files into sources'
54+
condition: and(succeeded(), variables['SigningCertificate'])
4655
4756
- template: ./layout-command.yml
4857

@@ -51,7 +60,7 @@ jobs:
5160
$(LayoutCmd) --copy "$(Build.ArtifactStagingDirectory)\appx-store" --preset-appx --precompile
5261
displayName: 'Generate store APPX layout'
5362
env:
54-
TCL_LIBRARY: $(Build.BinariesDirectory)\tcltk_lib\tcl8
63+
TCL_LIBRARY: $(TclLibrary)
5564
5665
- task: PublishPipelineArtifact@0
5766
displayName: 'Publish Artifact: layout_appxstore_$(Name)'
@@ -79,7 +88,7 @@ jobs:
7988
$(LayoutCmd) --copy "$(Build.ArtifactStagingDirectory)\appx" --preset-appx --precompile --include-symbols --include-tests
8089
displayName: 'Generate sideloading APPX layout'
8190
env:
82-
TCL_LIBRARY: $(Build.BinariesDirectory)\tcltk_lib\tcl8
91+
TCL_LIBRARY: $(TclLibrary)
8392
8493
- task: PublishPipelineArtifact@0
8594
displayName: 'Publish Artifact: layout_appx_$(Name)'

‎.azure-pipelines/windows-release/stage-layout-nuget.yml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,16 @@ jobs:
1313
matrix:
1414
win32:
1515
Name: win32
16-
Python: $(Build.BinariesDirectory)\bin_$(Name)\python.exe
16+
Python: $(Build.BinariesDirectory)\bin\python.exe
1717
PYTHONHOME: $(Build.SourcesDirectory)
1818
amd64:
1919
Name: amd64
20-
Python: $(Build.BinariesDirectory)\bin_$(Name)\python.exe
20+
Python: $(Build.BinariesDirectory)\bin\python.exe
21+
PYTHONHOME: $(Build.SourcesDirectory)
22+
arm64:
23+
Name: arm64
24+
HostArch: amd64
25+
Python: $(Build.BinariesDirectory)\bin_amd64\python.exe
2126
PYTHONHOME: $(Build.SourcesDirectory)
2227

2328
steps:
@@ -32,14 +37,13 @@ jobs:
3237
- powershell: |
3338
copy $(Build.BinariesDirectory)\bin\Activate.ps1 Lib\venv\scripts\common\Activate.ps1 -Force
3439
displayName: 'Copy signed files into sources'
40+
condition: and(succeeded(), variables['SigningCertificate'])
3541
3642
- template: ./layout-command.yml
3743

3844
- powershell: |
3945
$(LayoutCmd) --copy "$(Build.ArtifactStagingDirectory)\nuget" --preset-nuget
4046
displayName: 'Generate nuget layout'
41-
env:
42-
TCL_LIBRARY: $(Build.BinariesDirectory)\bin_$(Name)\tcl\tcl8
4347
4448
- task: PublishPipelineArtifact@0
4549
displayName: 'Publish Artifact: layout_nuget_$(Name)'

0 commit comments

Comments
 (0)