[eclipse-iceoryx#439] Fix cbindgen generation for bazel 6.2

elBoberido · Oct 11, 2024 · d665630 · d665630
1 parent 43eb550
commit d665630
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -10,6 +10,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 
+package(default_visibility = ["//visibility:public"])
+
 exports_files([
     "LICENSE-APACHE",
     "LICENSE-MIT",

diff --git a/iceoryx2-ffi/ffi/BUILD.bazel b/iceoryx2-ffi/ffi/BUILD.bazel
@@ -23,12 +23,14 @@ filegroup(
 genrule(
     name = "iceoryx2-ffi-cbindgen",
     srcs = glob(["src/**/*.rs"]) + [
-        "cbindgen.toml",
+        "//:all_srcs",
+        "//:Cargo.toml",
         ":cbindgen-cli",
-        "src"
+        "Cargo.toml",
+        "cbindgen.toml",
     ],
     outs = ["include/iox2/iceoryx2.h"],
-    cmd = "$(execpath :cbindgen-cli) --config $(location cbindgen.toml) --output $(OUTS) $(location src)/..",
+    cmd = "$(execpath :cbindgen-cli) --config $(location cbindgen.toml) --output $(OUTS) $$(dirname $(location Cargo.toml))",
 )
 
 rust_shared_library(
@@ -90,10 +92,3 @@ cc_library(
 )
 
 # TODO: [349] add tests
-
-# NOTE: the following lines can be removed once 'rules_foreign_cc' is retired from building the C and C++ bindings
-
-filegroup(
-    name = "all_srcs",
-    srcs = glob(["**"]),
-)