Swift: fix bazel packaging

redsun82 · redsun82 · commit 04f6debb880e · 2022-10-21T13:42:24.000+02:00
diff --git a/swift/BUILD.bazel b/swift/BUILD.bazel
@@ -23,19 +23,6 @@ pkg_files(
     ],
 )
 
-pkg_files(
-    name = "scripts",
-    srcs = ["tools/qltest.sh", "tools/autobuild.sh"],
-    attributes = pkg_attributes(mode = "0755"),
-    prefix = "tools",
-)
-
-pkg_files(
-    name = "tracing-config",
-    srcs = ["tools/tracing-config.lua"],
-    prefix = "tools",
-)
-
 pkg_files(
     name = "manifest",
     srcs = ["codeql-extractor.yml"],
@@ -46,8 +33,7 @@ pkg_filegroup(
     srcs = [
         ":dbscheme_files",
         ":manifest",
-        ":tracing-config",
-        ":scripts",
+        "//swift/tools",
     ],
     visibility = ["//visibility:public"],
 )
@@ -79,7 +65,7 @@ pkg_filegroup(
     ] + select({
         "@platforms//os:linux": [],
         "@platforms//os:macos": [
-            ":xcode-autobuilder"
+            ":xcode-autobuilder",
         ],
     }),
     visibility = ["//visibility:public"],
@@ -101,7 +87,7 @@ pkg_install(
 
 py_binary(
     name = "create-extractor-pack",
-    srcs = ["tools/create_extractor_pack.py"],
-    main = "tools/create_extractor_pack.py",
+    srcs = ["create_extractor_pack.py"],
+    main = "create_extractor_pack.py",
     deps = [":_create_extractor_pack"],
 )
diff --git a/swift/tools/BUILD.bazel b/swift/tools/BUILD.bazel
@@ -1,10 +1,9 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@rules_pkg//:mappings.bzl", "pkg_attributes", "pkg_files")
+load("@rules_pkg//:mappings.bzl", "pkg_attributes", "pkg_filegroup", "pkg_files")
 
 sh_binary(
     name = "qltest",
     srcs = ["qltest.sh"],
+    visibility = ["//swift/tools/test/qltest:__pkg__"],
 )
 
 sh_binary(
@@ -13,11 +12,26 @@ sh_binary(
 )
 
 pkg_files(
-    name = "tools",
+    name = "scripts",
     srcs = [
         ":autobuild",
         ":qltest",
     ],
     attributes = pkg_attributes(mode = "0755"),
     prefix = "tools",
 )
+
+pkg_files(
+    name = "tracing-config",
+    srcs = ["tracing-config.lua"],
+    prefix = "tools",
+)
+
+pkg_filegroup(
+    name = "tools",
+    srcs = [
+        ":scripts",
+        ":tracing-config",
+    ],
+    visibility = ["//swift:__pkg__"],
+)
