File tree Expand file tree Collapse file tree 6 files changed +22
-9
lines changed
misc/bazel/internal/zipmerge Expand file tree Collapse file tree 6 files changed +22
-9
lines changed Original file line number Diff line number Diff line change @@ -24,5 +24,6 @@ common --registry=file:///%workspace%/misc/bazel/registry
24
24
common --registry=https://bcr.bazel.build
25
25
26
26
common --@rules_dotnet//dotnet/settings:strict_deps=false
27
+ common --experimental_isolated_extension_usages
27
28
28
29
try-import %workspace%/local.bazelrc
Original file line number Diff line number Diff line change @@ -8,3 +8,4 @@ common --registry=https://bcr.bazel.build
8
8
# its implementation packages without providing any code itself.
9
9
# We either can depend on internal implementation details, or turn of strict deps.
10
10
common --@rules_dotnet//dotnet/settings:strict_deps=false
11
+ common --experimental_isolated_extension_usages
Original file line number Diff line number Diff line change 1
1
module (
2
- name = "codeql " ,
2
+ name = "ql " ,
3
3
version = "0.0" ,
4
+ repo_name = "codeql" ,
4
5
)
5
6
6
7
# this points to our internal repository when `codeql` is checked out as a submodule thereof
@@ -30,27 +31,37 @@ bazel_dep(name = "rules_rust", version = "0.49.1")
30
31
31
32
bazel_dep (name = "buildifier_prebuilt" , version = "6.4.0" , dev_dependency = True )
32
33
33
- crate = use_extension (
34
+ # crate_py but shortened due to Windows file path considerations
35
+ cp = use_extension (
34
36
"@rules_rust//crate_universe:extension.bzl" ,
35
37
"crate" ,
38
+ isolate = True ,
36
39
)
37
- crate .from_cargo (
40
+ cp .from_cargo (
38
41
name = "py_deps" ,
39
42
cargo_lockfile = "//python/extractor/tsg-python:Cargo.lock" ,
40
43
manifests = [
41
44
"//python/extractor/tsg-python:Cargo.toml" ,
42
45
"//python/extractor/tsg-python/tsp:Cargo.toml" ,
43
46
],
44
47
)
45
- crate .from_cargo (
46
- name = "ruby_deps" ,
48
+ use_repo (cp , "py_deps" )
49
+
50
+ # crate_ruby, but shortened due to windows file paths
51
+ r = use_extension (
52
+ "@rules_rust//crate_universe:extension.bzl" ,
53
+ "crate" ,
54
+ isolate = True ,
55
+ )
56
+ r .from_cargo (
57
+ name = "rd" ,
47
58
cargo_lockfile = "//ruby/extractor:Cargo.lock" ,
48
59
manifests = [
49
60
"//ruby/extractor:Cargo.toml" ,
50
61
"//ruby/extractor/codeql-extractor-fake-crate:Cargo.toml" ,
51
62
],
52
63
)
53
- use_repo (crate , "py_deps" , "ruby_deps " )
64
+ use_repo (r , "rd " )
54
65
55
66
dotnet = use_extension ("@rules_dotnet//dotnet:extensions.bzl" , "dotnet" )
56
67
dotnet .toolchain (dotnet_version = "8.0.101" )
Original file line number Diff line number Diff line change @@ -75,7 +75,7 @@ std::string get_file(const char* name) {
75
75
return ret;
76
76
}();
77
77
// this works from both `codeql` and the internal repository
78
- for (auto prefix : {" _main" , " codeql ~" }) {
78
+ for (auto prefix : {" _main" , " ql ~" }) {
79
79
auto ret = runfiles->Rlocation (prefix + " /misc/bazel/internal/zipmerge/test-files/" s + name);
80
80
if (fs::exists (ret)) {
81
81
return ret;
Original file line number Diff line number Diff line change 1
- load ("@ruby_deps //:defs.bzl" , "aliases" , "all_crate_deps" )
1
+ load ("@rd //:defs.bzl" , "aliases" , "all_crate_deps" )
2
2
load ("//misc/bazel:rust.bzl" , "codeql_rust_binary" )
3
3
4
4
codeql_rust_binary (
Original file line number Diff line number Diff line change 1
- load ("@ruby_deps //:defs.bzl" , "aliases" , "all_crate_deps" )
1
+ load ("@rd //:defs.bzl" , "aliases" , "all_crate_deps" )
2
2
load ("@rules_rust//rust:defs.bzl" , "rust_library" )
3
3
4
4
package (default_visibility = ["//visibility:public" ])
You can’t perform that action at this time.
0 commit comments