Swift+Bazel: apply review comments

Author: redsun82

WORKSPACE.bazel

@@ -3,10 +3,10 @@
 
 workspace(name = "ql")
 
-load("@ql//misc/bazel:workspace.bzl", "ql_workspace")
+load("//misc/bazel:workspace.bzl", "ql_workspace")
 
 ql_workspace()
 
-load("@ql//misc/bazel:workspace_deps.bzl", "ql_workspace_deps")
+load("//misc/bazel:workspace_deps.bzl", "ql_workspace_deps")
 
 ql_workspace_deps()

cpp/BUILD.bazel

@@ -4,14 +4,14 @@ load("@rules_pkg//:mappings.bzl", "pkg_filegroup")
 
 alias(
     name = "dbscheme",
-    actual = "@ql//cpp/ql/lib:dbscheme",
+    actual = "//cpp/ql/lib:dbscheme",
 )
 
 pkg_filegroup(
     name = "db-files",
     srcs = [
         ":dbscheme",
-        "@ql//cpp/downgrades",
-        "@ql//cpp/ql/lib:dbscheme-stats",
+        "//cpp/downgrades",
+        "//cpp/ql/lib:dbscheme-stats",
     ],
 )

misc/bazel/BUILD.toolchain.tpl

@@ -1,22 +1,7 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 
-def _ql_utils_impl(repository_ctx):
-    root = repository_ctx.path(Label("//:WORKSPACE.bazel")).realpath.dirname
-    repository_ctx.file("BUILD.bazel")
-    repository_ctx.template(
-        "source_dir.bzl",
-        Label("@ql//misc/bazel:source_dir.bzl.tpl"),
-        substitutions = {"{root}": str(root)},
-    )
-
-_ql_utils = repository_rule(
-    implementation = _ql_utils_impl,
-)
-
 def ql_workspace():
-    _ql_utils(name = "ql_utils")
-
     maybe(
         repo_rule = http_archive,
         name = "rules_pkg",

misc/bazel/source_dir.bzl.tpl

@@ -1,7 +1,6 @@
 load("@rules_pkg//:mappings.bzl", "pkg_attributes", "pkg_filegroup", "pkg_files")
 load("@rules_pkg//:install.bzl", "pkg_install")
-load("@ql//:defs.bzl", "codeql_platform")
-load("@ql_utils//:source_dir.bzl", "current_source_dir")
+load("//:defs.bzl", "codeql_platform")
 
 pkg_files(
     name = "dbscheme",
@@ -56,10 +55,13 @@ pkg_filegroup(
 )
 
 pkg_install(
-    name = "create-extractor-pack",
+    name = "_create_extractor_pack",
     srcs = ["//swift:extractor-pack"],
-    args = [
-        "--destdir",
-        current_source_dir() + "/extractor-pack",
-    ],
+)
+
+py_binary(
+    name = "create-extractor-pack",
+    srcs = ["tools/create_extractor_pack.py"],
+    main = "tools/create_extractor_pack.py",
+    deps = [":_create_extractor_pack"],
 )

misc/bazel/test.bzl

@@ -6,4 +6,4 @@ The Swift codeql package is an experimental and unsupported work in progress.
 
 Run `bazel run //swift:create-extractor-pack`, which will install `swift/extractor-pack`.
 Using `--search-path=swift/extractor-pack` will then pick up the Swift extractor. You can also use
-`--search-path=swift`, as the extractor pack is mentioned in `swift/.codeqlmanifest`.
+`--search-path=swift`, as the extractor pack is mentioned in `swift/.codeqlmanifest.json`.

misc/bazel/test.template.py

@@ -1,5 +1,10 @@
 cc_binary(
     name = "extractor",
     srcs = ["main.cpp"],
+    target_compatible_with = select({
+        "@platforms//os:linux": [],
+        "@platforms//os:macos": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
     visibility = ["//swift:__pkg__"],
 )