windows: support building CPython 3.10

Author: indygreg

.github/workflows/windows.yml

@@ -41,6 +41,7 @@ jobs:
         py:
           - 'cpython-3.8'
           - 'cpython-3.9'
+          - 'cpython-3.10'
         vcvars:
           - 'vcvars32.bat'
           - 'vcvars64.bat'
@@ -94,6 +95,12 @@ jobs:
           path: dist/*
 
   install-only:
+    strategy:
+      fail-fast: false
+      matrix:
+        version:
+          - '3.9'
+          - '3.10'
     needs:
       - build
     runs-on: 'ubuntu-20.04'
@@ -110,7 +117,7 @@ jobs:
       - name: Download Python
         uses: actions/download-artifact@v2
         with:
-          name: cpython-3.9-vcvars64.bat
+          name: 'cpython-${{ matrix.version }}-vcvars64.bat'
 
       - name: Repack Distribution
         run: |
@@ -119,5 +126,5 @@ jobs:
       - name: Upload Distribution
         uses: actions/upload-artifact@v2
         with:
-          name: cpython-install-only
+          name: 'cpython-install-only-${{ matrix.version }}'
           path: cpython-*.tar.gz

cpython-windows/build.py

@@ -887,6 +887,17 @@ def hack_project_files(
         br'<ClInclude Include="$(lzmaDir)windows\vs2017\config.h" />',
     )
 
+    # Our logic for rewriting extension projects gets confused by _sqlite.vcxproj not
+    # having a `<PreprocessorDefinitions>` line in 3.10+. So adjust that.
+    try:
+        static_replace_in_file(
+            pcbuild_path / "_sqlite3.vcxproj",
+            br"<AdditionalIncludeDirectories>$(sqlite3Dir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>",
+            b"<AdditionalIncludeDirectories>$(sqlite3Dir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r\n      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>",
+        )
+    except NoSearchStringError:
+        pass
+
     # Our custom OpenSSL build has applink.c in a different location
     # from the binary OpenSSL distribution. Update it.
     ssl_proj = pcbuild_path / "_ssl.vcxproj"
@@ -1710,6 +1721,7 @@ def collect_python_build_artifacts(
         "_testinternalcapi",
         "_testmultiphase",
         "xxlimited",
+        "xxlimited_35",
     }
 
     other_projects = {"pythoncore"}
@@ -2398,7 +2410,7 @@ def main():
     parser = argparse.ArgumentParser()
     parser.add_argument(
         "--python",
-        choices={"cpython-3.8", "cpython-3.9"},
+        choices={"cpython-3.8", "cpython-3.9", "cpython-3.10"},
         default="cpython-3.9",
         help="Python distribution to build",
     )

src/main.rs

@@ -99,8 +99,10 @@ const PE_ALLOWED_LIBRARIES: &[&str] = &[
     "libffi-7.dll",
     "libssl-1_1.dll",
     "libssl-1_1-x64.dll",
+    "python3.dll",
     "python38.dll",
     "python39.dll",
+    "python310.dll",
     "sqlite3.dll",
     "tcl86t.dll",
     "tk86t.dll",