bpo-47086: Remove .chm from Windows installer and add HTML docs (GH-32038)

5 files changed, 18 insertions, 10 deletions

diff --git a/.azure-pipelines/windows-release.yml b/.azure-pipelines/windows-release.yml
index 096ecadc79e..581f48ba228 100644
--- a/.azure-pipelines/windows-release.yml
+++ b/.azure-pipelines/windows-release.yml
@@ -43,13 +43,17 @@ parameters:
 # Eventually when we stop releasing anything that old, we can drop this
 # argument (and make it implicitly always 'true')
 - name: ARM64TclTk
-  displayName: "Use Tcl/Tk for ARM64"
+  displayName: "Use Tcl/Tk for ARM64 (3.11 and later)"
   type: boolean
   default: true
 - name: DoPGO
   displayName: "Run PGO"
   type: boolean
   default: true
+- name: DoCHM
+  displayName: "Produce compiled help document (pre-3.11)"
+  type: boolean
+  default: false
 - name: DoLayout
   displayName: "Produce full layout artifact"
   type: boolean
@@ -86,6 +90,7 @@ variables:
   ${{ if ne(parameters.SigningCertificate, 'Unsigned') }}:
     SigningCertificate: ${{ parameters.SigningCertificate }}
   SigningDescription: ${{ parameters.SigningDescription }}
+  DoCHM: ${{ parameters.DoCHM }}
   DoLayout: ${{ parameters.DoLayout }}
   DoMSIX: ${{ parameters.DoMSIX }}
   DoNuget: ${{ parameters.DoNuget }}
diff --git a/.azure-pipelines/windows-release/gpg-sign.yml b/.azure-pipelines/windows-release/gpg-sign.yml
index 0855af8d703..04206d23e49 100644
--- a/.azure-pipelines/windows-release/gpg-sign.yml
+++ b/.azure-pipelines/windows-release/gpg-sign.yml
@@ -3,12 +3,14 @@ parameters:
   GPGPassphrase: $(GPGPassphrase)
   Files: '*'
   WorkingDirectory: $(Build.BinariesDirectory)
+  Condition: succeeded()
 
 steps:
 - task: DownloadSecureFile@1
   name: gpgkey
   inputs:
     secureFile: ${{ parameters.GPGKeyFile }}
+  condition: ${{ parameters.Condition }}
   displayName: 'Download GPG key'
 
 - powershell: |
@@ -18,6 +20,7 @@ steps:
         gpg/gpg2.exe -ba --batch --passphrase ${{ parameters.GPGPassphrase }} $_
         "Made signature for $_"
     }
+  condition: ${{ parameters.Condition }}
   displayName: 'Generate GPG signatures'
   workingDirectory: ${{ parameters.WorkingDirectory }}
 
diff --git a/.azure-pipelines/windows-release/msi-steps.yml b/.azure-pipelines/windows-release/msi-steps.yml
index c3c2c43032c..79fc6f5ed29 100644
--- a/.azure-pipelines/windows-release/msi-steps.yml
+++ b/.azure-pipelines/windows-release/msi-steps.yml
@@ -21,8 +21,6 @@ steps:
     inputs:
       sourceFolder: $(Build.BinariesDirectory)\doc
       targetFolder: $(Build.SourcesDirectory)\Doc\build
-      contents: |
-        htmlhelp\*.chm
 
   - task: DownloadPipelineArtifact@1
     displayName: 'Download artifact: bin_win32'
diff --git a/.azure-pipelines/windows-release/stage-build.yml b/.azure-pipelines/windows-release/stage-build.yml
index 2745d79dd06..26f43177504 100644
--- a/.azure-pipelines/windows-release/stage-build.yml
+++ b/.azure-pipelines/windows-release/stage-build.yml
@@ -5,7 +5,6 @@ jobs:
 - job: Build_Docs
   displayName: Docs build
   pool:
-    #name: 'Windows Release'
     vmImage: windows-2022
 
   workspace:
@@ -21,14 +20,10 @@ jobs:
 
   - script: Doc\make.bat htmlhelp
     displayName: 'Build CHM docs'
+    condition: and(succeeded(), eq(variables['DoCHM'], 'true'))
     env:
       BUILDDIR: $(Build.BinariesDirectory)\Doc
 
-  #- powershell: |
-  #    mkdir -Force "$(Build.BinariesDirectory)\Doc\htmlhelp"
-  #    iwr "https://www.python.org/ftp/python/3.8.0/python380.chm" -OutFile "$(Build.BinariesDirectory)\Doc\htmlhelp\python390a0.chm"
-  #  displayName: 'Cheat at building CHM docs'
-
   - task: CopyFiles@2
     displayName: 'Assemble artifact: Doc'
     inputs:
@@ -44,6 +39,7 @@ jobs:
       targetPath: $(Build.ArtifactStagingDirectory)\Doc
       artifactName: doc
 
+
 - job: Build_Python
   displayName: Python build
 
diff --git a/.azure-pipelines/windows-release/stage-publish-pythonorg.yml b/.azure-pipelines/windows-release/stage-publish-pythonorg.yml
index 953f728ade3..ee50e4e8aa0 100644
--- a/.azure-pipelines/windows-release/stage-publish-pythonorg.yml
+++ b/.azure-pipelines/windows-release/stage-publish-pythonorg.yml
@@ -87,7 +87,13 @@ jobs:
   - template: ./gpg-sign.yml
     parameters:
       GPGKeyFile: 'python-signing.key'
-      Files: 'doc\htmlhelp\*.chm, msi\*\*, embed\*.zip'
+      Files: 'msi\*\*, embed\*.zip'
+
+  - template: ./gpg-sign.yml
+    parameters:
+      GPGKeyFile: 'python-signing.key'
+      Files: 'doc\htmlhelp\*.chm'
+      Condition: and(succeeded(), eq(variables['DoCHM'], 'true'))
 
   - powershell: >
       $(Build.SourcesDirectory)\Tools\msi\uploadrelease.ps1