@@ -17,33 +17,31 @@ module(
1717)
1818
1919# Bazel global rules
20- bazel_dep (name = "rules_python" , version = "1.7.0 " )
21- bazel_dep (name = "bazel_skylib" , version = "1.8.2 " )
22- bazel_dep (name = "rules_rust" , version = "0.67 .0" )
23- bazel_dep (name = "rules_cc" , version = "0.2.14 " )
24- bazel_dep (name = "aspect_rules_lint" , version = "1.10.2 " )
25- bazel_dep (name = "buildifier_prebuilt" , version = "8.2 .1" )
20+ bazel_dep (name = "rules_python" , version = "1.4.1 " )
21+ bazel_dep (name = "bazel_skylib" , version = "1.7.1 " )
22+ bazel_dep (name = "rules_rust" , version = "0.61 .0" )
23+ bazel_dep (name = "rules_cc" , version = "0.1.1 " )
24+ bazel_dep (name = "aspect_rules_lint" , version = "1.0.3 " )
25+ bazel_dep (name = "buildifier_prebuilt" , version = "7.3 .1" )
2626bazel_dep (name = "platforms" , version = "1.0.0" )
2727
2828# S-CORE process rules
2929bazel_dep (name = "score_bazel_platforms" , version = "0.0.2" )
30- bazel_dep (name = "score_docs_as_code" , version = "2.0.2 " )
31- bazel_dep (name = "score_tooling" , version = "1.0.3 " )
30+ bazel_dep (name = "score_docs_as_code" , version = "1.4.0 " )
31+ bazel_dep (name = "score_tooling" , version = "1.0.2 " )
3232
33- bazel_dep (name = "score_process" , version = "1.3 .1" , dev_dependency = True )
34- bazel_dep (name = "score_platform" , version = "0.4.2 " , dev_dependency = True ) # This is main score repo
35- bazel_dep (name = "score_virtualization" , version = "1.0 " , dev_dependency = True )
33+ bazel_dep (name = "score_process" , version = "1.2 .1" , dev_dependency = True )
34+ bazel_dep (name = "score_platform" , version = "0.3.0 " , dev_dependency = True ) # This is main score repo
35+ bazel_dep (name = "score_virtualization" , version = "0.0.1 " , dev_dependency = True )
3636
3737# Toolchains and extensions
38- bazel_dep (name = "score_toolchains_gcc" , version = "0.5 " , dev_dependency = True )
39- bazel_dep (name = "score_toolchains_qnx" , version = "0.0.3 " , dev_dependency = True )
38+ bazel_dep (name = "score_toolchains_gcc" , version = "0.4 " , dev_dependency = True )
39+ bazel_dep (name = "score_toolchains_qnx" , version = "0.0.2 " , dev_dependency = True )
4040bazel_dep (name = "rust_qnx8_toolchain" , version = "1.2.0" , dev_dependency = True )
4141bazel_dep (name = "score_toolchains_rust" , version = "0.1.1" , dev_dependency = True )
4242
43- # Others
44- bazel_dep (name = "custom_qemu" , version = "1.0.0" , dev_dependency = True )
45-
46- bazel_dep (name = "googletest" , version = "1.17.0" )
43+ # S-CORE crates
44+ bazel_dep (name = "score_crates" )
4745
4846# Overrides
4947git_override (
@@ -54,10 +52,18 @@ git_override(
5452
5553git_override (
5654 module_name = "score_virtualization" ,
57- commit = "1d9e73212cc291c37a1b7c1427e0f34368ef25e0 " ,
55+ commit = "99d3f153c43796b67a63e82aad1ede6a881aa6af " ,
5856 remote = "https://github.com/qorix-group/score_virtualization.git" ,
5957)
6058
59+ git_override (
60+ module_name = "score_crates" ,
61+ # TODO: 'commit' and 'remote' must be updated once required changes are merged.
62+ # https://github.com/eclipse-score/score-crates/pull/16
63+ commit = "f0bf4bdf98d8a8ad548256ab24dc08f9ba8f04aa" ,
64+ remote = "https://github.com/qorix-group/score-crates.git" ,
65+ )
66+
6167archive_override (
6268 module_name = "rust_qnx8_toolchain" ,
6369 strip_prefix = "qnx8" ,
@@ -66,15 +72,6 @@ archive_override(
6672 ],
6773)
6874
69- archive_override (
70- module_name = "custom_qemu" ,
71- integrity = "sha256-3V2d+p7nP0tsbrVWOPYUSJogLNal43CIAHEto6Vjdfg=" ,
72- strip_prefix = "third_party" , # matches top-level dir in the tar
73- urls = [
74- "https://github.com/qorix-group/custom-qemu/releases/download/1.0.0/custom_qemu.tar.gz" ,
75- ],
76- )
77-
7875# Extensions
7976
8077gcc = use_extension ("@score_toolchains_gcc//extentions:gcc.bzl" , "gcc" , dev_dependency = True )
@@ -118,27 +115,3 @@ register_toolchains(
118115 "@toolchains_qnx_ifs//:ifs_aarch64" ,
119116 dev_dependency = True ,
120117)
121-
122- # Module deps
123-
124- # Crate configs
125- crate = use_extension ("@rules_rust//crate_universe:extensions.bzl" , "crate" )
126- crate .from_cargo (
127- name = "score_baselibs_rust_crates" ,
128- cargo_lockfile = "//:Cargo.lock" ,
129- manifests = [
130- "//:Cargo.toml" ,
131- "//:src/mw/_placeholder/Cargo.toml" ,
132- "//:examples/mw/_placeholder_example/Cargo.toml" ,
133- "//:tests/mw/_placeholder/Cargo.toml" ,
134- ],
135-
136- # This shall not be here but rules_rust 0.61.0 or even 0.67.0 does not correct finds out that when we use out platform it shall append
137- # aarch64-unknown-nto-qnx710 or best aarch64-unknown-nto-qnx800 which is not fully supported in any rust_rules version for now (even if rustc 1.86.0 already supports it)
138- supported_platform_triples = [
139- "aarch64-unknown-nto-qnx710" , # This enables also QNX8 because OS and CPU for platform matches....
140- "x86_64-unknown-linux-gnu" ,
141- "x86_64-unknown-none" ,
142- ],
143- )
144- use_repo (crate , "score_baselibs_rust_crates" )
0 commit comments