|
1 | 1 | load("@bazel_skylib//rules:native_binary.bzl", "native_binary") |
2 | | -load("@rules_pkg//pkg:install.bzl", "pkg_install") |
3 | | -load("@rules_pkg//pkg:mappings.bzl", "pkg_attributes", "pkg_filegroup", "pkg_files") |
4 | | -load("//:defs.bzl", "codeql_platform") |
| 2 | +load("@rules_pkg//pkg:mappings.bzl", "pkg_files") |
| 3 | +load("//misc/bazel:pkg.bzl", "codeql_pack", "codeql_pkg_files") |
5 | 4 |
|
6 | 5 | native_binary( |
7 | 6 | name = "gazelle", |
@@ -44,50 +43,27 @@ pkg_files( |
44 | 43 | ], |
45 | 44 | ) |
46 | 45 |
|
47 | | -pkg_filegroup( |
48 | | - name = "extractor-pack-generic", |
49 | | - srcs = [ |
50 | | - ":resources", |
51 | | - "//go/codeql-tools", |
52 | | - "//go/downgrades", |
53 | | - "//go/extractor:tokenizer", |
54 | | - ], |
55 | | - visibility = ["//visibility:public"], |
56 | | -) |
57 | | - |
58 | | -pkg_files( |
| 46 | +codeql_pkg_files( |
59 | 47 | name = "extractor-pack-arch", |
60 | | - srcs = [ |
| 48 | + exes = [ |
61 | 49 | "//go/extractor/cli/go-autobuilder", |
62 | 50 | "//go/extractor/cli/go-bootstrap", |
63 | 51 | "//go/extractor/cli/go-build-runner", |
64 | 52 | "//go/extractor/cli/go-extractor", |
65 | 53 | "//go/extractor/cli/go-gen-dbscheme", |
66 | 54 | "//go/extractor/cli/go-tokenizer", |
67 | 55 | ], |
68 | | - attributes = pkg_attributes(mode = "0755"), |
69 | | - prefix = "tools/" + codeql_platform, |
70 | | - visibility = ["//visibility:public"], |
| 56 | + prefix = "tools/{CODEQL_PLATFORM}", |
71 | 57 | ) |
72 | 58 |
|
73 | | -pkg_filegroup( |
74 | | - name = "extractor-pack", |
| 59 | +codeql_pack( |
| 60 | + name = "go", |
75 | 61 | srcs = [ |
76 | 62 | ":extractor-pack-arch", |
77 | | - ":extractor-pack-generic", |
| 63 | + ":resources", |
| 64 | + "//go/codeql-tools", |
| 65 | + "//go/downgrades", |
| 66 | + "//go/extractor:tokenizer", |
78 | 67 | ], |
79 | | - visibility = ["//visibility:public"], |
80 | | -) |
81 | | - |
82 | | -pkg_install( |
83 | | - name = "_extractor_pack", |
84 | | - srcs = [":extractor-pack"], |
85 | | -) |
86 | | - |
87 | | -py_binary( |
88 | | - name = "create-extractor-pack", |
89 | | - srcs = ["create_extractor_pack.py"], |
90 | | - env = {"REPO_NAME": repo_name()}, |
91 | | - main = "create_extractor_pack.py", |
92 | | - deps = ["_extractor_pack"], |
| 68 | + install_dest = "build/codeql-extractor-pack", |
93 | 69 | ) |
0 commit comments