Remove shared- prefix from Windows profiles

Author: charliermarsh

.github/workflows/windows.yml

@@ -51,8 +51,12 @@ jobs:
         vcvars:
           - 'vcvars32.bat'
           - 'vcvars64.bat'
+        # The 'shared-' prefix is no longer needed (i.e., both 'shared-pgo' and 'pgo' resolve to the
+        # same profile). However, we're double-publishing under both names during the transition
+        # period.
         profile:
           - 'shared-pgo'
+          - 'pgo'
     needs: pythonbuild
     runs-on: 'windows-2019'
     steps:

cpython-windows/build.py

@@ -605,7 +605,6 @@ def hack_project_files(
         pass
 
 
-
 PYPORT_EXPORT_SEARCH_39 = b"""
 #if defined(__CYGWIN__)
 #       define HAVE_DECLSPEC_DLL
@@ -894,12 +893,11 @@ def build_openssl_for_arch(
     # uplink.c tries to find the OPENSSL_Applink function exported from the current
     # executable. However, it is exported from _ssl[_d].pyd in shared builds. So
     # update its sounce to look for it from there.
-    if "shared" in profile:
-        static_replace_in_file(
-            source_root / "ms" / "uplink.c",
-            b"((h = GetModuleHandle(NULL)) == NULL)",
-            b'((h = GetModuleHandleA("_ssl.pyd")) == NULL) if ((h = GetModuleHandleA("_ssl_d.pyd")) == NULL) if ((h = GetModuleHandle(NULL)) == NULL)',
-        )
+    static_replace_in_file(
+        source_root / "ms" / "uplink.c",
+        b"((h = GetModuleHandle(NULL)) == NULL)",
+        b'((h = GetModuleHandleA("_ssl.pyd")) == NULL) if ((h = GetModuleHandleA("_ssl_d.pyd")) == NULL) if ((h = GetModuleHandle(NULL)) == NULL)',
+    )
 
     if arch == "x86":
         configure = "VC-WIN32"
@@ -1189,7 +1187,6 @@ def collect_python_build_artifacts(
 
         extension_projects.add(extension)
 
-
     depends_projects |= {
         "liblzma",
         "sqlite3",
@@ -1313,9 +1310,7 @@ def find_additional_dependencies(project: pathlib.Path):
         for obj in process_project(ext, dest_dir):
             entry["objs"].append("build/extensions/%s/%s" % (ext, obj))
 
-        for lib in CONVERT_TO_BUILTIN_EXTENSIONS.get(ext, {}).get(
-            "shared_depends", []
-        ):
+        for lib in CONVERT_TO_BUILTIN_EXTENSIONS.get(ext, {}).get("shared_depends", []):
             entry["links"].append(
                 {"name": lib, "path_dynamic": "install/DLLs/%s.dll" % lib}
             )
@@ -1390,7 +1385,7 @@ def build_cpython(
     libffi_archive,
     openssl_entry: str,
 ):
-    pgo = "-pgo" in profile
+    pgo = profile in ("pgo", "shared-pgo")
 
     msbuild = find_msbuild(msvc_version)
     log("found MSBuild at %s" % msbuild)
@@ -1724,7 +1719,7 @@ def build_cpython(
 
         crt_features = ["vcruntime:140"]
 
-        if "pgo" in profile:
+        if profile in ("pgo", "shared-pgo"):
             optimizations = "pgo"
         else:
             optimizations = "noopt"
@@ -1841,8 +1836,9 @@ def main():
     )
     parser.add_argument(
         "--profile",
-        choices={"shared-noopt", "shared-pgo"},
-        default="shared-noopt",
+        # 'shared-pgo' is an alias for 'pgo'; 'shared-noopt' is an alias for 'noopt'.
+        choices={"noopt", "pgo", "shared-noopt", "shared-pgo"},
+        default="noopt",
         help="How to compile Python",
     )
     parser.add_argument(

docs/building.rst

@@ -94,16 +94,16 @@ If building CPython 3.8+, there are the following additional requirements:
 
 To build a dynamically linked Python distribution for Windows x64::
 
-    $ py.exe build-windows.py --profile shared-noopt
+    $ py.exe build-windows.py --profile noopt
 
 It's also possible to build with optional PGO optimizations::
 
-   $ py.exe build-windows.py --profile shared-pgo
+   $ py.exe build-windows.py --profile pgo
 
 If building CPython 3.8+, you will need to specify the path to a
 ``sh.exe`` installed from cygwin. e.g.
 
-   $ py.exe build-windows.py --python cpython-3.8 --sh c:\cygwin\bin\sh.exe --profile shared
+   $ py.exe build-windows.py --python cpython-3.8 --sh c:\cygwin\bin\sh.exe --profile noopt
 
 To build a 32-bit x86 binary, simply use an ``x86 Native Tools
 Command Prompt`` instead of ``x64``.

src/release.rs

@@ -47,8 +47,26 @@ pub static RELEASE_TRIPLES: Lazy<BTreeMap<&'static str, TripleRelease>> = Lazy::
     );
 
     // Windows.
+    h.insert(
+        "i686-pc-windows-msvc",
+        TripleRelease {
+            suffixes: vec!["pgo"],
+            install_only_suffix: "pgo",
+            python_version_requirement: None,
+        },
+    );
+    h.insert(
+        "x86_64-pc-windows-msvc",
+        TripleRelease {
+            suffixes: vec!["pgo"],
+            install_only_suffix: "pgo",
+            python_version_requirement: None,
+        },
+    );
 
-    // The -shared part of the triple is a lie. But the code handles it fine.
+    // The 'shared-' prefix is no longer needed (i.e., both 'shared-pgo' and 'pgo' resolve to the
+    // same profile). However, we're double-publishing under both names during the transition
+    // period.
     h.insert(
         "i686-pc-windows-msvc-shared",
         TripleRelease {