From a75f5fac155532724ccd16922ef0952280f03d28 Mon Sep 17 00:00:00 2001
From: Paolo Tranquilli <redsun82@gihub.com>
Date: Fri, 13 Dec 2024 17:01:22 +0100
Subject: [PATCH 1/2] Swift: remove linux from standard pack

This still defines a pack with linux included for development.
`//swift:install` will still also include linux.
---
 misc/bazel/utils.bzl | 18 ++++++++++
 swift/BUILD.bazel    | 82 +++++++++++++++++++++++++++++---------------
 2 files changed, 72 insertions(+), 28 deletions(-)
 create mode 100644 misc/bazel/utils.bzl

diff --git a/misc/bazel/utils.bzl b/misc/bazel/utils.bzl
new file mode 100644
index 000000000000..d5f8781f0019
--- /dev/null
+++ b/misc/bazel/utils.bzl
@@ -0,0 +1,18 @@
+def select_os(linux = None, macos = None, windows = None, posix = None, otherwise = []):
+    selection = {}
+    if posix != None:
+        if linux != None or macos != None:
+            fail("select_os: cannot specify both posix and linux or macos")
+        selection["@platforms//os:linux"] = posix
+        selection["@platforms//os:macos"] = posix
+    if linux != None:
+        selection["@platforms//os:linux"] = linux
+    if macos != None:
+        selection["@platforms//os:macos"] = macos
+    if windows != None:
+        selection["@platforms//os:windows"] = windows
+    if len(selection) < 3:
+        selection["//conditions:default"] = otherwise
+    elif otherwise != []:
+        fail("select_os: cannot specify all three OSes and an otherwise")
+    return select(selection)
diff --git a/swift/BUILD.bazel b/swift/BUILD.bazel
index dc85033f76fd..0eddd98ef98f 100644
--- a/swift/BUILD.bazel
+++ b/swift/BUILD.bazel
@@ -5,6 +5,7 @@ load(
     "codeql_pkg_files",
     "codeql_pkg_runfiles",
 )
+load("//misc/bazel:utils.bzl", "select_os")
 
 filegroup(
     name = "schema",
@@ -30,35 +31,31 @@ codeql_pkg_files(
 )
 
 codeql_pkg_runfiles(
-    name = "autobuilder",
+    name = "autobuilder-files",
     exes = ["//swift/swift-autobuilder"],
 )
 
 pkg_filegroup(
-    name = "tools-arch",
-    srcs = select({
-        "@platforms//os:macos": [
-            ":autobuilder",
-            "//swift/extractor:pkg",
-        ],
-        "@platforms//os:linux": [
-            ":autobuilder-incompatible-os",
-            "//swift/extractor:pkg",
+    name = "autobuilder",
+    srcs = select_os(
+        macos = [
+            ":autobuilder-files",
         ],
-        "@platforms//os:windows": [
+        otherwise = [
             ":autobuilder-incompatible-os",
         ],
-    }),
-    prefix = "{CODEQL_PLATFORM}",
+    ),
+    prefix = "tools/{CODEQL_PLATFORM}",
 )
 
 pkg_filegroup(
-    name = "tools",
-    srcs = [
-        ":tools-arch",
-        "//swift/tools",
-    ],
-    prefix = "tools",
+    name = "extractor",
+    srcs = select_os(
+        posix = [
+            "//swift/extractor:pkg",
+        ],
+    ),
+    prefix = "tools/{CODEQL_PLATFORM}",
 )
 
 codeql_pkg_files(
@@ -70,22 +67,51 @@ codeql_pkg_files(
     ],
 )
 
-codeql_pack(
-    name = "swift",
+pkg_filegroup(
+    name = "common",
     srcs = [
+        ":autobuilder",
         ":root-files",
-        ":tools",
         "//swift/downgrades",
     ],
-    zips = select({
-        "@platforms//os:windows": {},
-        "//conditions:default": {
-            "//swift/third_party/resources:dir": "resource-dir/{CODEQL_PLATFORM}",
-        },
-    }),
 )
 
+zip_map = {
+    "//swift/third_party/resources:dir": "resource-dir/{CODEQL_PLATFORM}",
+}
+
+[
+    codeql_pack(
+        name = "swift-linux-included" if linux_included else "swift",
+        srcs = [
+            ":common",
+        ] + select_os(
+            linux = [":extractor"] if linux_included else [],
+            macos = [":extractor"],
+            windows = [],
+        ),
+        installer_alias = "install-linux" if linux_included else "install-other",
+        zips = select_os(
+            linux = zip_map if linux_included else {},
+            macos = zip_map,
+            windows = {},
+        ),
+    )
+    for linux_included in [
+        True,
+        False,
+    ]
+]
+
 alias(
     name = "create-extractor-pack",
     actual = ":swift-installer",
 )
+
+alias(
+    name = "install",
+    actual = select_os(
+        linux = ":install-linux",
+        otherwise = ":install-other",
+    ),
+)

From a8238b18965587f8d034dcffa06bc4c25cb3d628 Mon Sep 17 00:00:00 2001
From: Paolo Tranquilli <redsun82@github.com>
Date: Fri, 13 Dec 2024 17:39:16 +0100
Subject: [PATCH 2/2] Swift: fix pack

---
 swift/BUILD.bazel | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/swift/BUILD.bazel b/swift/BUILD.bazel
index 0eddd98ef98f..45b0f6687cbd 100644
--- a/swift/BUILD.bazel
+++ b/swift/BUILD.bazel
@@ -48,6 +48,12 @@ pkg_filegroup(
     prefix = "tools/{CODEQL_PLATFORM}",
 )
 
+pkg_filegroup(
+    name = "tools",
+    srcs = ["//swift/tools"],
+    prefix = "tools",
+)
+
 pkg_filegroup(
     name = "extractor",
     srcs = select_os(
@@ -67,15 +73,6 @@ codeql_pkg_files(
     ],
 )
 
-pkg_filegroup(
-    name = "common",
-    srcs = [
-        ":autobuilder",
-        ":root-files",
-        "//swift/downgrades",
-    ],
-)
-
 zip_map = {
     "//swift/third_party/resources:dir": "resource-dir/{CODEQL_PLATFORM}",
 }
@@ -84,13 +81,17 @@ zip_map = {
     codeql_pack(
         name = "swift-linux-included" if linux_included else "swift",
         srcs = [
-            ":common",
+            ":autobuilder",
+            ":root-files",
+            ":tools",
+            "//swift/downgrades",
         ] + select_os(
             linux = [":extractor"] if linux_included else [],
             macos = [":extractor"],
             windows = [],
         ),
         installer_alias = "install-linux" if linux_included else "install-other",
+        pack_prefix = "swift",
         zips = select_os(
             linux = zip_map if linux_included else {},
             macos = zip_map,
@@ -105,7 +106,7 @@ zip_map = {
 
 alias(
     name = "create-extractor-pack",
-    actual = ":swift-installer",
+    actual = ":install",
 )
 
 alias(