From 0550c46766de05bc689cda3ad0bf50e5c49b3fb6 Mon Sep 17 00:00:00 2001
From: Taus <tausbn@github.com>
Date: Thu, 7 Mar 2024 13:41:35 +0000
Subject: [PATCH] Python: Fix Bazel build

---
 python/BUILD.bazel                      | 33 ++++++++++++++++++++++++-
 python/extractor/BUILD.bazel            |  4 +--
 python/extractor/tsg-python/BUILD.bazel |  2 +-
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/python/BUILD.bazel b/python/BUILD.bazel
index e6d1387e4c2..481dbbd0dd8 100644
--- a/python/BUILD.bazel
+++ b/python/BUILD.bazel
@@ -1,4 +1,6 @@
-load("@rules_pkg//:mappings.bzl", "pkg_filegroup", "pkg_files")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup", "pkg_files")
+load("@semmle_code//:dist.bzl", "dist", "pack_zip")
+load("//:defs.bzl", "codeql_platform")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -28,3 +30,32 @@ pkg_filegroup(
         "//python/downgrades",
     ],
 )
+
+pkg_files(
+    name = "codeql-extractor-yml",
+    srcs = ["codeql-extractor.yml"],
+    strip_prefix = None,
+)
+
+dist(
+    name = "extractor-generic",
+    srcs = [
+        ":codeql-extractor-yml",
+        ":dbscheme-group",
+        "//python/downgrades",
+        "//python/extractor",
+        "//python/tools",
+    ],
+    prefix = "python",
+    visibility = ["//visibility:public"],
+)
+
+pack_zip(
+    name = "extractor-arch",
+    srcs = [
+        "//python/extractor/tsg-python",
+    ],
+    package_file_name = "extractor-" + codeql_platform + ".zip",
+    prefix = "python/tools/" + codeql_platform,
+    visibility = ["//visibility:public"],
+)
diff --git a/python/extractor/BUILD.bazel b/python/extractor/BUILD.bazel
index 4e93f539bde..3b5a5b3a617 100644
--- a/python/extractor/BUILD.bazel
+++ b/python/extractor/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//:dist.bzl", "pack_zip")
+load("@semmle_code//:dist.bzl", "pack_zip")
 
 py_binary(
     name = "make-zips-py",
@@ -33,7 +33,7 @@ genrule(
 )
 
 pack_zip(
-    name = "extractor-python",
+    name = "extractor",
     srcs = [
         "LICENSE-PSF.md",  # because we distribute imp.py
         "convert_setup.py",
diff --git a/python/extractor/tsg-python/BUILD.bazel b/python/extractor/tsg-python/BUILD.bazel
index 6835f8e6689..55dbdd97855 100644
--- a/python/extractor/tsg-python/BUILD.bazel
+++ b/python/extractor/tsg-python/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@tsg_python_crate_index//:defs.bzl", "aliases", "all_crate_deps")
-load("//:common.bzl", "codeql_rust_binary")
+load("@semmle_code//:common.bzl", "codeql_rust_binary")
 
 codeql_rust_binary(
     name = "tsg-python",