Skip to content

Commit 60cb8e7

Browse files
committed
Ruby: Move to new packaging rules.
1 parent 1158e92 commit 60cb8e7

File tree

2 files changed

+19
-23
lines changed

2 files changed

+19
-23
lines changed

ruby/BUILD.bazel

+15-19
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup", "pkg_files")
2-
load("@semmle_code//:dist.bzl", "dist", "pack_zip")
3-
load("//:defs.bzl", "codeql_platform")
1+
load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup")
2+
load("//misc/bazel:pkg.bzl", "codeql_pack", "codeql_pkg_files")
43

54
package(default_visibility = ["//visibility:public"])
65

@@ -14,7 +13,7 @@ alias(
1413
actual = "//ruby/ql/lib:dbscheme-stats",
1514
)
1615

17-
pkg_files(
16+
codeql_pkg_files(
1817
name = "dbscheme-group",
1918
srcs = [
2019
":dbscheme",
@@ -31,30 +30,27 @@ pkg_filegroup(
3130
],
3231
)
3332

34-
pkg_files(
33+
codeql_pkg_files(
3534
name = "codeql-extractor-yml",
3635
srcs = ["codeql-extractor.yml"],
3736
strip_prefix = None,
3837
)
3938

40-
dist(
41-
name = "extractor-generic",
39+
codeql_pkg_files(
40+
name = "extractor-arch",
41+
exes = [
42+
"//ruby/extractor",
43+
],
44+
prefix = "tools/{CODEQL_PLATFORM}",
45+
)
46+
47+
codeql_pack(
48+
name = "ruby",
4249
srcs = [
4350
":codeql-extractor-yml",
4451
":dbscheme-group",
52+
":extractor-arch",
4553
"//ruby/downgrades",
4654
"//ruby/tools",
4755
],
48-
prefix = "ruby",
49-
visibility = ["//visibility:public"],
50-
)
51-
52-
pack_zip(
53-
name = "extractor-arch",
54-
srcs = [
55-
"//ruby/extractor",
56-
],
57-
package_file_name = "extractor-" + codeql_platform + ".zip",
58-
prefix = "ruby/tools/" + codeql_platform,
59-
visibility = ["//visibility:public"],
6056
)

ruby/tools/BUILD.bazel

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
load("@semmle_code//:dist.bzl", "pack_zip")
1+
load("//misc/bazel:pkg.bzl", "codeql_pkg_files")
22

3-
pack_zip(
3+
codeql_pkg_files(
44
name = "tools",
5-
srcs = glob(["**/*"]),
65
excludes = [
76
"BUILD.bazel",
87
],
8+
exes = glob(["**/*"]),
99
prefix = "tools",
10-
visibility = ["//visibility:public"],
10+
visibility = ["//ruby:__pkg__"],
1111
)

0 commit comments

Comments
 (0)