Refactor library symlinking and update template

Author: laramiel

bazel/repo_rules/local_python_runtime.bzl

@@ -60,59 +60,66 @@ define_local_runtime_toolchain_impl(
     major = "{major}",
     minor = "{minor}",
     micro = "{micro}",
+    abi_flags = "{abi_flags}",
+    os = "{os}",
+    implementation_name = "{implementation_name}",
     interpreter_path = "{interpreter_path}",
     interface_library = {interface_library},
     libraries = {libraries},
-    implementation_name = "{implementation_name}",
-    os = "{os}",
-    abi_flags = "{abi_flags}",
+    abi3_interface_library = {abi3_interface_library},
+    abi3_libraries = {abi3_libraries},
 )
 """
 
 def _expand_incompatible_template():
     return _TOOLCHAIN_IMPL_TEMPLATE.format(
-        interpreter_path = "/incompatible",
-        implementation_name = "incompatible",
-        interface_library = "None",
-        libraries = "[]",
         major = "0",
         minor = "0",
         micro = "0",
-        os = "@platforms//:incompatible",
         abi_flags = "",
+        os = "@platforms//:incompatible",
+        implementation_name = "incompatible",
+        interpreter_path = "/incompatible",
+        interface_library = "None",
+        libraries = "[]",
+        abi3_interface_library = "None",
+        abi3_libraries = "[]",
     )
 
-def _symlink_first_library(rctx, logger, libraries, shlib_suffix):
+def _symlink_libraries(rctx, logger, subdir, libraries, shlib_suffix):
     """Symlinks the shared libraries into the lib/ directory.
 
     Args:
         rctx: A repository_ctx object
         logger: A repo_utils.logger object
-        libraries: A list of static library paths to potentially symlink.
+        subdir: The subdirectory to symlink to. e.g. "lib"
+        libraries: paths to libraries to attempt to symlink.
+        shlib_suffix: Optional. Ensure that the generated symlinks end with this suffix.
     Returns:
         A single library path linked by the action.
 
-    The specific files are symlinked instead of the whole directory because
+    Individual files are symlinked instead of the whole directory because
     shared_lib_dirs contains multiple search paths for the shared libraries,
     and the python files may be missing from any of those directories, and
     any of those directories may include non-python runtime libraries,
     as would be the case if LIBDIR were, for example, /usr/lib.
     """
-    for target in libraries:
-        origin = rctx.path(target)
+    result = []
+    for source in libraries:
+        origin = rctx.path(source)
         if not origin.exists:
             # The reported names don't always exist; it depends on the particulars
             # of the runtime installation.
             continue
-        if shlib_suffix and not target.endswith(shlib_suffix):
-            linked = "lib/{}{}".format(origin.basename, shlib_suffix)
+        if shlib_suffix and not origin.basename.endswith(shlib_suffix):
+            target = "{}/{}{}".format(subdir, origin.basename, shlib_suffix)
         else:
-            linked = "lib/{}".format(origin.basename)
-        logger.debug(lambda: "Symlinking {} to {}".format(origin, linked))
+            target = "{}/{}".format(subdir, origin.basename)
+        logger.debug(lambda: "Symlinking {} to {}".format(origin, target))
         repo_utils.watch(rctx, origin)
-        rctx.symlink(origin, linked)
-        return linked
-    return None
+        rctx.symlink(origin, target)
+        result.append(target)
+    return result
 
 def _local_python_repo_impl(rctx):
     """Implementation of the local_python_repo repository rule."""
@@ -190,28 +197,45 @@ def _local_python_repo_impl(rctx):
     rctx.symlink(include_path, "include")
 
     rctx.report_progress("Symlinking external Python shared libraries")
-    interface_library = _symlink_first_library(rctx, logger, info["interface_libraries"], None)
-    shared_library = _symlink_first_library(rctx, logger, info["dynamic_libraries"], info["shlib_suffix"])
-    static_library = _symlink_first_library(rctx, logger, info["static_libraries"], None)
-
-    libraries = []
-    if shared_library:
-        libraries.append(shared_library)
-    elif static_library:
-        libraries.append(static_library)
+
+    interface_library = None
+    libraries = _symlink_libraries(rctx, logger, "lib", info["dynamic_libraries"], info["shlib_suffix"])
+    if libraries:
+        symlinked = _symlink_libraries(rctx, logger, "lib", info["interface_libraries"], None)
+        if symlinked:
+            interface_library = symlinked[0]
+    else:
+        libraries = _symlink_libraries(rctx, logger, "lib", info["static_libraries"], None)
+        if not libraries:
+            logger.info("No python libraries found.")
+
+    abi3_interface_library = None
+    abi3_libraries = _symlink_libraries(rctx, logger, "lib", info["abi_dynamic_libraries"], info["shlib_suffix"])
+    if abi3_libraries:
+        symlinked = _symlink_libraries(rctx, logger, "lib", info["abi_interface_libraries"], None)
+        if symlinked:
+            abi3_interface_library = symlinked[0]
     else:
-        logger.warn("No external python libraries found.")
+        logger.info("No abi3 python libraries found.")
+
+    # On Windows, we need to link to the additional DLLs.
+    if info["additional_dlls"]:
+        _symlink_libraries(rctx, logger, "dlls", info["additional_dlls"], None)
+
+    os_name = repo_utils.get_platforms_os_name(rctx)
 
     build_bazel = _TOOLCHAIN_IMPL_TEMPLATE.format(
         major = info["major"],
         minor = info["minor"],
         micro = info["micro"],
+        abi_flags = info["abi_flags"],
+        os = "@platforms//os:{}".format(os_name),
+        implementation_name = info["implementation_name"],
         interpreter_path = repo_utils.norm_path(interpreter_path),
         interface_library = repr(interface_library),
         libraries = repr(libraries),
-        implementation_name = info["implementation_name"],
-        os = "@platforms//os:{}".format(repo_utils.get_platforms_os_name(rctx)),
-        abi_flags = info["abi_flags"],
+        abi3_interface_library = repr(abi3_interface_library),
+        abi3_libraries = repr(abi3_libraries),
     )
     logger.debug(lambda: "BUILD.bazel\n{}".format(build_bazel))