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
2424common --registry=https://bcr.bazel.build
2525
2626common --@rules_dotnet//dotnet/settings:strict_deps=false
27+ common --experimental_isolated_extension_usages
2728
2829try-import %workspace%/local.bazelrc
Original file line number Diff line number Diff line change @@ -8,3 +8,4 @@ common --registry=https://bcr.bazel.build
88# its implementation packages without providing any code itself.
99# We either can depend on internal implementation details, or turn of strict deps.
1010common --@rules_dotnet//dotnet/settings:strict_deps=false
11+ common --experimental_isolated_extension_usages
Original file line number Diff line number Diff line change 11module (
2- name = "codeql " ,
2+ name = "ql " ,
33 version = "0.0" ,
4+ repo_name = "codeql" ,
45)
56
67# 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")
3031
3132bazel_dep (name = "buildifier_prebuilt" , version = "6.4.0" , dev_dependency = True )
3233
33- crate = use_extension (
34+ # crate_py but shortened due to Windows file path considerations
35+ cp = use_extension (
3436 "@rules_rust//crate_universe:extension.bzl" ,
3537 "crate" ,
38+ isolate = True ,
3639)
37- crate .from_cargo (
40+ cp .from_cargo (
3841 name = "py_deps" ,
3942 cargo_lockfile = "//python/extractor/tsg-python:Cargo.lock" ,
4043 manifests = [
4144 "//python/extractor/tsg-python:Cargo.toml" ,
4245 "//python/extractor/tsg-python/tsp:Cargo.toml" ,
4346 ],
4447)
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" ,
4758 cargo_lockfile = "//ruby/extractor:Cargo.lock" ,
4859 manifests = [
4960 "//ruby/extractor:Cargo.toml" ,
5061 "//ruby/extractor/codeql-extractor-fake-crate:Cargo.toml" ,
5162 ],
5263)
53- use_repo (crate , "py_deps" , "ruby_deps " )
64+ use_repo (r , "rd " )
5465
5566dotnet = use_extension ("@rules_dotnet//dotnet:extensions.bzl" , "dotnet" )
5667dotnet .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) {
7575 return ret;
7676 }();
7777 // this works from both `codeql` and the internal repository
78- for (auto prefix : {" _main" , " codeql ~" }) {
78+ for (auto prefix : {" _main" , " ql ~" }) {
7979 auto ret = runfiles->Rlocation (prefix + " /misc/bazel/internal/zipmerge/test-files/" s + name);
8080 if (fs::exists (ret)) {
8181 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" )
22load ("//misc/bazel:rust.bzl" , "codeql_rust_binary" )
33
44codeql_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" )
22load ("@rules_rust//rust:defs.bzl" , "rust_library" )
33
44package (default_visibility = ["//visibility:public" ])
You can’t perform that action at this time.
0 commit comments