Skip to content

Commit 8038186

Browse files
committed
[#1202] Fix bazel build
1 parent 8d62080 commit 8038186

17 files changed

Lines changed: 70 additions & 21 deletions

File tree

BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,7 @@ filegroup(
339339
"//component-tests/rust:all_srcs",
340340
"//iceoryx2:all_srcs",
341341
"//iceoryx2-bb/conformance-test-macros:all_srcs",
342+
"//iceoryx2-bb/concurrency:all_srcs",
342343
"//iceoryx2-bb/container:all_srcs",
343344
"//iceoryx2-bb/derive-macros:all_srcs",
344345
"//iceoryx2-bb/elementary:all_srcs",

WORKSPACE.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ maybe(
100100
"//:iceoryx2/Cargo.toml",
101101
"//:iceoryx2/conformance-tests/Cargo.toml",
102102
"//:iceoryx2-bb/conformance-test-macros/Cargo.toml",
103+
"//:iceoryx2-bb/concurrency/Cargo.toml",
103104
"//:iceoryx2-bb/container/Cargo.toml",
104105
"//:iceoryx2-bb/derive-macros/Cargo.toml",
105106
"//:iceoryx2-bb/elementary/Cargo.toml",
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# Copyright (c) 2025 Contributors to the Eclipse Foundation
2+
#
3+
# See the NOTICE file(s) distributed with this work for additional
4+
# information regarding copyright ownership.
5+
#
6+
# This program and the accompanying materials are made available under the
7+
# terms of the Apache Software License 2.0 which is available at
8+
# https://www.apache.org/licenses/LICENSE-2.0, or the MIT license
9+
# which is available at https://opensource.org/licenses/MIT.
10+
#
11+
# SPDX-License-Identifier: Apache-2.0 OR MIT
12+
13+
package(default_visibility = ["//visibility:public"])
14+
15+
load("@rules_rust//rust:defs.bzl", "rust_library", "rust_test_suite")
16+
17+
filegroup(
18+
name = "all_srcs",
19+
srcs = glob(["**"]),
20+
)
21+
22+
rust_library(
23+
name = "iceoryx2-bb-concurrency",
24+
srcs = glob(["src/**/*.rs"]),
25+
deps = [
26+
"//iceoryx2-bb/elementary-traits:iceoryx2-bb-elementary-traits",
27+
"//iceoryx2-pal/concurrency-sync:iceoryx2-pal-concurrency-sync",
28+
],
29+
proc_macro_deps = [
30+
"@crate_index//:paste",
31+
],
32+
)
33+
34+
rust_test_suite(
35+
name = "iceoryx2-bb-concurrency-tests",
36+
srcs = glob(["tests/**/*.rs"]),
37+
deps = [
38+
":iceoryx2-bb-concurrency",
39+
"//iceoryx2-bb/elementary-traits:iceoryx2-bb-elementary-traits",
40+
"//iceoryx2-bb/posix:iceoryx2-bb-posix",
41+
"//iceoryx2-bb/testing:iceoryx2-bb-testing",
42+
"//iceoryx2-pal/concurrency-sync:iceoryx2-pal-concurrency-sync",
43+
"//iceoryx2-pal/testing:iceoryx2-pal-testing",
44+
],
45+
proc_macro_deps = [
46+
"@crate_index//:generic-tests",
47+
],
48+
)

iceoryx2-bb/container/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ rust_library(
2626
"//iceoryx2-bb/elementary:iceoryx2-bb-elementary",
2727
"//iceoryx2-bb/elementary-traits:iceoryx2-bb-elementary-traits",
2828
"//iceoryx2-bb/log:iceoryx2-bb-log",
29-
"//iceoryx2-pal/concurrency-sync:iceoryx2-pal-concurrency-sync",
29+
"//iceoryx2-bb/concurrency:iceoryx2-bb-concurrency",
3030
"@crate_index//:serde",
3131
],
3232
proc_macro_deps = [

iceoryx2-bb/elementary-traits/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,5 @@ rust_library(
2323
name = "iceoryx2-bb-elementary-traits",
2424
srcs = glob(["src/**/*.rs"]),
2525
deps = [
26-
"//iceoryx2-pal/concurrency-sync:iceoryx2-pal-concurrency-sync",
2726
],
2827
)

iceoryx2-bb/elementary/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ rust_library(
2424
srcs = glob(["src/**/*.rs"]),
2525
deps = [
2626
"//iceoryx2-bb/elementary-traits:iceoryx2-bb-elementary-traits",
27-
"//iceoryx2-pal/concurrency-sync:iceoryx2-pal-concurrency-sync",
27+
"//iceoryx2-bb/concurrency:iceoryx2-bb-concurrency",
2828
],
2929
)
3030

iceoryx2-bb/linux/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ rust_library(
2929
"//iceoryx2-bb/system-types:iceoryx2-bb-system-types",
3030
"//iceoryx2-pal/os-api:iceoryx2-pal-os-api",
3131
"//iceoryx2-pal/posix:iceoryx2-pal-posix",
32-
"//iceoryx2-pal/concurrency-sync:iceoryx2-pal-concurrency-sync",
32+
"//iceoryx2-bb/concurrency:iceoryx2-bb-concurrency",
3333
"@crate_index//:enum-iterator",
3434
],
3535
)
@@ -43,7 +43,7 @@ rust_test_suite(
4343
"//iceoryx2-bb/posix:iceoryx2-bb-posix",
4444
"//iceoryx2-bb/testing:iceoryx2-bb-testing",
4545
"//iceoryx2-pal/testing:iceoryx2-pal-testing",
46-
"//iceoryx2-pal/concurrency-sync:iceoryx2-pal-concurrency-sync",
46+
"//iceoryx2-bb/concurrency:iceoryx2-bb-concurrency",
4747
],
4848
tags = ["exclusive"],
4949
)

iceoryx2-bb/lock-free/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ rust_library(
2626
"//iceoryx2-bb/elementary:iceoryx2-bb-elementary",
2727
"//iceoryx2-bb/elementary-traits:iceoryx2-bb-elementary-traits",
2828
"//iceoryx2-bb/log:iceoryx2-bb-log",
29-
"//iceoryx2-pal/concurrency-sync:iceoryx2-pal-concurrency-sync",
29+
"//iceoryx2-bb/concurrency:iceoryx2-bb-concurrency",
3030
],
3131
)
3232

iceoryx2-bb/log/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ rust_library(
5555
"//conditions:default": [],
5656
}),
5757
deps = [
58-
"//iceoryx2-pal/concurrency-sync:iceoryx2-pal-concurrency-sync",
58+
"//iceoryx2-bb/concurrency:iceoryx2-bb-concurrency",
5959
] + select({
6060
"//:cfg_feature_logger_log": [
6161
"@crate_index//:log",

iceoryx2-bb/memory/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ rust_library(
2828
"//iceoryx2-bb/lock-free:iceoryx2-bb-lock-free",
2929
"//iceoryx2-bb/log:iceoryx2-bb-log",
3030
"//iceoryx2-bb/posix:iceoryx2-bb-posix",
31-
"//iceoryx2-pal/concurrency-sync:iceoryx2-pal-concurrency-sync",
31+
"//iceoryx2-bb/concurrency:iceoryx2-bb-concurrency",
3232
],
3333
)
3434

0 commit comments

Comments
 (0)