Merge pull request #470 from elBoberido/iox2-349-bazel-6.2-fix-and-iceoryx-update

elBoberido · web-flow · commit b930be65b3b0 · 2024-10-16T14:27:29.000+02:00
[#349] Bazel 6.2 fix and iceoryx update
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -12,6 +12,8 @@
 
 package(default_visibility = ["//visibility:public"])
 
+load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
+
 exports_files([
     "LICENSE-APACHE",
     "LICENSE-MIT",
@@ -37,9 +39,9 @@ config_setting(
     flag_values = {"@bazel_tools//tools/cpp:compiler": "msvc-cl"},
 )
 
-alias(
+string_flag(
     name = "feature_dev_permissions",
-    actual = "//iceoryx2-cal:feature_dev_permissions",
+    build_setting_default = "auto",
     visibility = ["//visibility:public"],
 )
 
diff --git a/Cargo.Bazel.lock b/Cargo.Bazel.lock
@@ -1,5 +1,5 @@
 {
-  "checksum": "f4b0efe0add514e7053794a25f1bdfb4b5425e10bb77c6212ba5157d14fca9d3",
+  "checksum": "d7b1759c5d28cbeb3fff8b9da5ca81261aa8c593891b9eff7d3c554d07b4c8dd",
   "crates": {
     "addr2line 0.24.2": {
       "name": "addr2line",
diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
@@ -133,22 +133,22 @@ bazel_skylib_workspace()
 
 
 # Load iceoryx rules
-ICEORYX_VERSION = "2.95.2"
+ICEORYX_VERSION = "2.95.3"
 
 maybe(
     name = "iceoryx",
     repo_rule = http_archive,
-    sha256 = "585d92dac3d9fefd3f6e0cd2275667fb0cd31dddcd07183accdbcd3ae2a000bd",
+    sha256 = "14b854906b58a48140a5d074167d5f3a5af2d578574940501a330954af79b9d4",
     strip_prefix = "iceoryx-{}".format(ICEORYX_VERSION),
     url = "https://github.com/eclipse-iceoryx/iceoryx/archive/v{}.tar.gz".format(ICEORYX_VERSION),
 )
 
-# Load dependency googletest
+# Load iceoryx dependencies
 load("@iceoryx//bazel:load_repositories.bzl", "load_repositories")
 
 load_repositories()
 
-# Load dependency cpptoml
+# Setup iceoryx dependencies
 load("@iceoryx//bazel:setup_repositories.bzl", "setup_repositories")
 
 setup_repositories()
diff --git a/doc/bazel/README.md b/doc/bazel/README.md
@@ -8,18 +8,39 @@ To use iceoryx2 as an external dependency, ensure the following setup is present
 in your `WORKSPACE` file:
 
 ```bazel
-ICEORYX2_VERSION = "branch-tag-or-commit-hash"
+# Load iceoryx2 rules
+ICEORYX2_VERSION = "0248ea57d0c405383ab099e14293ed8be2d23dac"
 
 http_archive(
     name = "iceoryx2",
-    sha256 = "add-the-correct-sha256-sum",
+    sha256 = "8844b229d2ba23597dfe17df7a3baabd086a62944534aa804d482a6e46bdf5b8",
     strip_prefix = "iceoryx2-{}".format(ICEORYX2_VERSION),
     urls = [
         "https://github.com/eclipse-iceoryx/iceoryx2/archive/{}.tar.gz".format(ICEORYX2_VERSION),
     ],
 )
 
 
+# Load iceoryx rules
+ICEORYX_VERSION = "2.95.3"
+
+maybe(
+    name = "iceoryx",
+    repo_rule = http_archive,
+    sha256 = "14b854906b58a48140a5d074167d5f3a5af2d578574940501a330954af79b9d4",
+    strip_prefix = "iceoryx-{}".format(ICEORYX_VERSION),
+    url = "https://github.com/eclipse-iceoryx/iceoryx/archive/v{}.tar.gz".format(ICEORYX_VERSION),
+)
+
+load("@iceoryx//bazel:load_repositories.bzl", "load_repositories")
+
+load_repositories()
+
+load("@iceoryx//bazel:setup_repositories.bzl", "setup_repositories")
+
+setup_repositories()
+
+
 # Load Rust rules
 # Use v0.26 to support bazel v6.2
 maybe(
@@ -107,6 +128,25 @@ maybe(
 load("@crate_index//:defs.bzl", "crate_repositories")
 
 crate_repositories()
+
+
+# Load skylib rules
+BAZEL_SKYLIB_VERSION = "1.7.1"
+
+# Load skylib for custom build config
+maybe(
+    name = "bazel_skylib",
+    repo_rule = http_archive,
+    sha256 = "bc283cdfcd526a52c3201279cda4bc298652efa898b10b4db0837dc51652756f",
+    urls = [
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/{version}/bazel-skylib-{version}.tar.gz".format(version = BAZEL_SKYLIB_VERSION),
+        "https://github.com/bazelbuild/bazel-skylib/releases/download/{version}/bazel-skylib-{version}.tar.gz".format(version = BAZEL_SKYLIB_VERSION),
+    ],
+)
+
+load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
+
+bazel_skylib_workspace()
 ```
 
 ### Syncing Dependencies
diff --git a/examples/rust/domains/BUILD.bazel b/examples/rust/domains/BUILD.bazel
@@ -34,7 +34,7 @@ rust_binary(
         "//iceoryx2:iceoryx2",
         "//iceoryx2-bb/log:iceoryx2-bb-log",
         "//iceoryx2-bb/system-types:iceoryx2-bb-system-types",
-        "@//examples/rust:examples-common",
+        "//examples/rust:examples-common",
         "@crate_index//:clap",
     ],
 )
@@ -48,7 +48,7 @@ rust_binary(
         "//iceoryx2:iceoryx2",
         "//iceoryx2-bb/log:iceoryx2-bb-log",
         "//iceoryx2-bb/system-types:iceoryx2-bb-system-types",
-        "@//examples/rust:examples-common",
+        "//examples/rust:examples-common",
         "@crate_index//:clap",
     ],
 )
diff --git a/examples/rust/publish_subscribe/BUILD.bazel b/examples/rust/publish_subscribe/BUILD.bazel
@@ -19,7 +19,7 @@ rust_binary(
     ],
     deps = [
         "//iceoryx2:iceoryx2",
-        "@//examples/rust:examples-common",
+        "//examples/rust:examples-common",
     ],
 )
 
@@ -30,6 +30,6 @@ rust_binary(
     ],
     deps = [
         "//iceoryx2:iceoryx2",
-        "@//examples/rust:examples-common",
+        "//examples/rust:examples-common",
     ],
 )
diff --git a/examples/rust/publish_subscribe_dynamic_data/BUILD.bazel b/examples/rust/publish_subscribe_dynamic_data/BUILD.bazel
@@ -19,7 +19,7 @@ rust_binary(
     ],
     deps = [
         "//iceoryx2:iceoryx2",
-        "@//examples/rust:examples-common",
+        "//examples/rust:examples-common",
     ],
 )
 
@@ -30,6 +30,6 @@ rust_binary(
     ],
     deps = [
         "//iceoryx2:iceoryx2",
-        "@//examples/rust:examples-common",
+        "//examples/rust:examples-common",
     ],
 )
diff --git a/examples/rust/publish_subscribe_with_user_header/BUILD.bazel b/examples/rust/publish_subscribe_with_user_header/BUILD.bazel
@@ -19,7 +19,7 @@ rust_binary(
     ],
     deps = [
         "//iceoryx2:iceoryx2",
-        "@//examples/rust:examples-common",
+        "//examples/rust:examples-common",
     ],
 )
 
@@ -30,6 +30,6 @@ rust_binary(
     ],
     deps = [
         "//iceoryx2:iceoryx2",
-        "@//examples/rust:examples-common",
+        "//examples/rust:examples-common",
     ],
 )
diff --git a/iceoryx2-cal/BUILD.bazel b/iceoryx2-cal/BUILD.bazel
@@ -13,31 +13,24 @@
 package(default_visibility = ["//visibility:public"])
 
 load("@bazel_skylib//lib:selects.bzl", "selects")
-load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
 load("@rules_rust//rust:defs.bzl", "rust_library")
 
 filegroup(
     name = "all_srcs",
     srcs = glob(["**"]),
 )
 
-string_flag(
-    name = "feature_dev_permissions",
-    build_setting_default = "auto",
-    visibility = ["//visibility:public"],
-)
-
 config_setting(
     name = "dev_permissions_auto",
     flag_values = {
-        ":feature_dev_permissions": "auto",
+        "//:feature_dev_permissions": "auto",
     },
 )
 
 config_setting(
     name = "dev_permissions_enabled",
     flag_values = {
-        ":feature_dev_permissions": "on",
+        "//:feature_dev_permissions": "on",
     },
 )
 
diff --git a/iceoryx2-ffi/cxx/CMakeLists.txt b/iceoryx2-ffi/cxx/CMakeLists.txt
@@ -12,7 +12,7 @@
 
 cmake_minimum_required(VERSION 3.22)
 
-set(ICEORYX_HOOFS_VERSION 2.95.2)
+set(ICEORYX_HOOFS_VERSION 2.95.3)
 include(${CMAKE_CURRENT_LIST_DIR}/cmake/fetch-iceoryx-hoofs.cmake)
 
 project(iceoryx2-cxx VERSION ${IOX2_VERSION_STRING} LANGUAGES CXX)
diff --git a/internal/scripts/ci_build_and_install_iceoryx_hoofs.ps1 b/internal/scripts/ci_build_and_install_iceoryx_hoofs.ps1
@@ -21,7 +21,7 @@ $ErrorActionPreference = "Stop"
 
 $NUM_JOBS = (Get-WmiObject Win32_processor).NumberOfLogicalProcessors
 
-git clone --depth 1 --branch v2.95.2 https://github.com/eclipse-iceoryx/iceoryx.git target/iceoryx/src
+git clone --depth 1 --branch v2.95.3 https://github.com/eclipse-iceoryx/iceoryx.git target/iceoryx/src
 
 switch ($mode) {
     "release" {
diff --git a/internal/scripts/ci_build_and_install_iceoryx_hoofs.sh b/internal/scripts/ci_build_and_install_iceoryx_hoofs.sh
@@ -27,7 +27,7 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then
     NUM_JOBS=$(sysctl -n hw.ncpu)
 fi
 
-git clone --depth 1 --branch v2.95.2 https://github.com/eclipse-iceoryx/iceoryx.git target/iceoryx/src
+git clone --depth 1 --branch v2.95.3 https://github.com/eclipse-iceoryx/iceoryx.git target/iceoryx/src
 
 cmake -S target/iceoryx/src/iceoryx_platform -B target/iceoryx/build/platform -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=target/iceoryx/install
 cmake --build target/iceoryx/build/platform -j$NUM_JOBS
diff --git a/package.xml b/package.xml
@@ -8,10 +8,8 @@
     <license>Apache 2.0</license>
     <url type="bugtracker">https://github.com/eclipse-iceoryx/iceoryx2/issues</url>
     <url type="repository">https://github.com/eclipse-iceoryx/iceoryx2</url>
-
     <buildtool_depend>cmake</buildtool_depend>
-    <depend version_gte="2.95.2">iceoryx_hoofs</depend>
-
+    <depend version_gte="2.95.3">iceoryx_hoofs</depend>
     <export>
         <build_type>cmake</build_type>
     </export>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "checksum": "f4b0efe0add514e7053794a25f1bdfb4b5425e10bb77c6212ba5157d14fca9d3",`
	`2`	`+ "checksum": "d7b1759c5d28cbeb3fff8b9da5ca81261aa8c593891b9eff7d3c554d07b4c8dd",`
`3`	`3`	`"crates": {`
`4`	`4`	`"addr2line 0.24.2": {`
`5`	`5`	`"name": "addr2line",`