diff --git a/modules/iceoryx/2.95.4/MODULE.bazel b/modules/iceoryx/2.95.4/MODULE.bazel new file mode 100644 index 00000000000..7f4fa828705 --- /dev/null +++ b/modules/iceoryx/2.95.4/MODULE.bazel @@ -0,0 +1,12 @@ +module( + name = "iceoryx", + version = "2.95.4", +) + +bazel_dep(name = "bazel_skylib", version = "1.7.1") +bazel_dep(name = "cpptoml", version = "0.1.1") +bazel_dep(name = "platforms", version = "0.0.11") +bazel_dep(name = "rules_cc", version = "0.1.1") +bazel_dep(name = "buildifier_prebuilt", version = "7.1.2") +bazel_dep(name = "googletest", version = "1.15.2") +bazel_dep(name = "ncurses", version = "6.4.20221231.bcr.4") diff --git a/modules/iceoryx/2.95.4/patches/2371+2437+2439.diff b/modules/iceoryx/2.95.4/patches/2371+2437+2439.diff new file mode 100644 index 00000000000..3f9ea2625cc --- /dev/null +++ b/modules/iceoryx/2.95.4/patches/2371+2437+2439.diff @@ -0,0 +1,29 @@ +diff --git a/MODULE.bazel b/MODULE.bazel +index 5bbfafe7d..7f4fa8287 100644 +--- a/MODULE.bazel ++++ b/MODULE.bazel +@@ -1,18 +1,12 @@ + module( +- name = "org_eclipse_iceoryx", ++ name = "iceoryx", + version = "2.95.4", + ) + + bazel_dep(name = "bazel_skylib", version = "1.7.1") + bazel_dep(name = "cpptoml", version = "0.1.1") +-bazel_dep(name = "platforms", version = "0.0.10") +-bazel_dep(name = "rules_cc", version = "0.0.9") +- +-bazel_dep( +- name = "buildifier_prebuilt", +- version = "7.1.2", +- dev_dependency = True, +-) +-bazel_dep(name = "googletest", version = "1.15.2", dev_dependency = True) +- +-bazel_dep(name = "ncurses", version = "6.4.20221231") ++bazel_dep(name = "platforms", version = "0.0.11") ++bazel_dep(name = "rules_cc", version = "0.1.1") ++bazel_dep(name = "buildifier_prebuilt", version = "7.1.2") ++bazel_dep(name = "googletest", version = "1.15.2") ++bazel_dep(name = "ncurses", version = "6.4.20221231.bcr.4") diff --git a/modules/iceoryx/2.95.4/patches/2433.diff b/modules/iceoryx/2.95.4/patches/2433.diff new file mode 100644 index 00000000000..88227100d96 --- /dev/null +++ b/modules/iceoryx/2.95.4/patches/2433.diff @@ -0,0 +1,398 @@ +diff --git a/iceoryx_binding_c/test/BUILD.bazel b/iceoryx_binding_c/test/BUILD.bazel +index 4ee5525c4a..771323f8da 100644 +--- a/iceoryx_binding_c/test/BUILD.bazel ++++ b/iceoryx_binding_c/test/BUILD.bazel +@@ -14,21 +14,31 @@ + # + # SPDX-License-Identifier: Apache-2.0 + +-load("@rules_cc//cc:defs.bzl", "cc_test") ++load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test") ++ ++cc_library( ++ name = "test", ++ testonly = True, ++ hdrs = ["test.hpp"], ++ includes = ["."], ++ deps = ["@googletest//:gtest"], ++) ++ ++cc_library( ++ name = "mocks", ++ testonly = True, ++ hdrs = ["mocks/wait_set_mock.hpp"], ++ includes = ["mocks"], ++ deps = [ ++ "//iceoryx_binding_c", ++ "//iceoryx_posh", ++ ], ++) + + cc_test( + name = "binding_c_moduletests", +- srcs = glob([ +- "moduletests/*.cpp", +- "moduletests/*.hpp", +- "mocks/*.hpp", +- "*.hpp", +- ]), +- includes = [ +- ".", +- "mocks", +- "moduletests", +- ], ++ srcs = glob(["moduletests/*"]), ++ includes = ["moduletests"], + linkopts = select({ + "//iceoryx_platform:linux": ["-ldl"], + "//iceoryx_platform:mac": ["-ldl"], +@@ -38,8 +48,9 @@ cc_test( + "//conditions:default": ["-ldl"], + }), + tags = ["exclusive"], +- visibility = ["//visibility:private"], + deps = [ ++ ":mocks", ++ ":test", + "//iceoryx_binding_c", + "//iceoryx_hoofs:iceoryx_hoofs_testing", + "//iceoryx_posh", +@@ -50,17 +61,7 @@ cc_test( + + cc_test( + name = "binding_c_integrationtests", +- srcs = glob([ +- "integrationtests/*.cpp", +- "integrationtests/*.hpp", +- "mocks/*.hpp", +- "*.hpp", +- ]), +- includes = [ +- ".", +- "integrationtests", +- "mocks", +- ], ++ srcs = ["integrationtests/main_test_binding_c_integration.cpp"], + linkopts = select({ + "//iceoryx_platform:linux": ["-ldl"], + "//iceoryx_platform:mac": ["-ldl"], +@@ -70,8 +71,8 @@ cc_test( + "//conditions:default": ["-ldl"], + }), + tags = ["exclusive"], +- visibility = ["//visibility:private"], + deps = [ ++ ":test", + "//iceoryx_binding_c", + "//iceoryx_hoofs:iceoryx_hoofs_testing", + "//iceoryx_posh", +diff --git a/iceoryx_hoofs/BUILD.bazel b/iceoryx_hoofs/BUILD.bazel +index 0c3c0708c0..1729d650f2 100644 +--- a/iceoryx_hoofs/BUILD.bazel ++++ b/iceoryx_hoofs/BUILD.bazel +@@ -31,30 +31,14 @@ configure_file( + + cc_library( + name = "iceoryx_hoofs", +- srcs = glob([ +- "cli/source/*.cpp", +- "concurrent/buffer/source/*.cpp", +- "concurrent/sync/source/*.cpp", +- "design/source/*.cpp", +- "filesystem/source/*.cpp", +- "memory/source/*.cpp", +- "posix/auth/source/*.cpp", +- "posix/design/source/*.cpp", +- "posix/filesystem/source/*.cpp", +- "posix/ipc/source/*.cpp", +- "posix/sync/source/*.cpp", +- "posix/time/source/*.cpp", +- "posix/utility/source/*.cpp", +- "posix/vocabulary/source/*.cpp", +- "primitives/source/*.cpp", +- "reporting/source/*.cpp", +- "time/source/*.cpp", +- "utility/source/*.cpp", +- "vocabulary/source/**/*.cpp", +- ]), +- hdrs = glob(["buffer/**"]) + glob(["cli/**"]) + glob(["concurrent/**"]) + glob(["container/**"]) + glob(["design/**"]) + glob(["filesystem/**"]) + glob(["functional/**"]) + glob(["legacy/**"]) + glob(["memory/**"]) + glob(["posix/**"]) + glob(["primitives/**"]) + glob(["reporting/**"]) + glob(["time/**"]) + glob(["utility/**"]) + glob(["vocabulary/**"]) + [ +- ":iceoryx_hoofs_deployment_hpp", +- ], ++ srcs = glob( ++ [ ++ "**/*.cpp", ++ "**/*.inl", ++ ], ++ exclude = ["testing/**/*"], ++ ), ++ hdrs = glob(["**/*.hpp"]) + [":iceoryx_hoofs_deployment_hpp"], + includes = [ + "buffer/include/", + "cli/include/", +diff --git a/iceoryx_hoofs/test/BUILD.bazel b/iceoryx_hoofs/test/BUILD.bazel +index d73e5831b8..59fcb23496 100644 +--- a/iceoryx_hoofs/test/BUILD.bazel ++++ b/iceoryx_hoofs/test/BUILD.bazel +@@ -14,19 +14,19 @@ + # + # SPDX-License-Identifier: Apache-2.0 + +-load("@rules_cc//cc:defs.bzl", "cc_test") ++load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test") ++ ++cc_library( ++ name = "test", ++ testonly = True, ++ hdrs = ["test.hpp"], ++ includes = ["."], ++ deps = ["@googletest//:gtest"], ++) + + cc_test( + name = "hoofs_moduletests", +- srcs = glob([ +- "moduletests/*.cpp", +- "moduletests/*.hpp", +- "*.hpp", +- ]), +- includes = [ +- ".", +- "moduletests", +- ], ++ srcs = glob(["moduletests/**/*"]), + linkopts = select({ + "//iceoryx_platform:linux": ["-ldl"], + "//iceoryx_platform:mac": [], +@@ -39,21 +39,15 @@ cc_test( + "exclusive", + "requires-fakeroot", + ], +- visibility = ["//visibility:private"], +- deps = ["//iceoryx_hoofs:iceoryx_hoofs_testing"], ++ deps = [ ++ ":test", ++ "//iceoryx_hoofs:iceoryx_hoofs_testing", ++ ], + ) + + cc_test( + name = "hoofs_integrationtests", +- srcs = glob([ +- "integrationtests/*.cpp", +- "integrationtests/*.hpp", +- "*.hpp", +- ]), +- includes = [ +- ".", +- "integrationtests", +- ], ++ srcs = ["integrationtests/main_test_hoofs_integration.cpp"], + linkopts = select({ + "//iceoryx_platform:linux": ["-ldl"], + "//iceoryx_platform:mac": [], +@@ -63,6 +57,8 @@ cc_test( + "//conditions:default": ["-ldl"], + }), + tags = ["exclusive"], +- visibility = ["//visibility:private"], +- deps = ["//iceoryx_hoofs:iceoryx_hoofs_testing"], ++ deps = [ ++ ":test", ++ "//iceoryx_hoofs:iceoryx_hoofs_testing", ++ ], + ) +diff --git a/iceoryx_hoofs/test/stresstests/BUILD.bazel b/iceoryx_hoofs/test/stresstests/BUILD.bazel +index 3fe7007327..8940916a19 100644 +--- a/iceoryx_hoofs/test/stresstests/BUILD.bazel ++++ b/iceoryx_hoofs/test/stresstests/BUILD.bazel +@@ -40,20 +40,12 @@ cc_test( + "//conditions:default": ["-ldl"], + }), + tags = ["exclusive"], +- visibility = ["//visibility:private"], + deps = ["//iceoryx_hoofs:iceoryx_hoofs_testing"], + ) + + cc_test( + name = "hoofs_stresstests", +- srcs = glob([ +- "*.cpp", +- "*.hpp", +- ]), +- includes = [ +- ".", +- "stresstests", +- ], ++ srcs = glob(["*.cpp"]), + linkopts = select({ + "//iceoryx_platform:linux": ["-ldl"], + "//iceoryx_platform:mac": [], +@@ -63,6 +55,5 @@ cc_test( + "//conditions:default": ["-ldl"], + }), + tags = ["exclusive"], +- visibility = ["//visibility:private"], + deps = ["//iceoryx_hoofs:iceoryx_hoofs_testing"], + ) +diff --git a/iceoryx_platform/test/BUILD.bazel b/iceoryx_platform/test/BUILD.bazel +index 2de5902c4b..65b3ad3086 100644 +--- a/iceoryx_platform/test/BUILD.bazel ++++ b/iceoryx_platform/test/BUILD.bazel +@@ -14,20 +14,19 @@ + # + # SPDX-License-Identifier: Apache-2.0 + +-load("@rules_cc//cc:defs.bzl", "cc_test") ++load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test") ++ ++cc_library( ++ name = "test", ++ testonly = True, ++ hdrs = ["test.hpp"], ++ includes = ["."], ++ deps = ["@googletest//:gtest"], ++) + + cc_test( + name = "platform_moduletests", +- srcs = glob([ +- "moduletests/*.cpp", +- "moduletests/*.hpp", +- "*.hpp", +- ]), +- data = glob(["input/**"]), +- includes = [ +- ".", +- "moduletests", +- ], ++ srcs = glob(["moduletests/*.cpp"]), + linkopts = select({ + "//iceoryx_platform:linux": ["-ldl"], + "//iceoryx_platform:mac": [], +@@ -37,37 +36,25 @@ cc_test( + "//conditions:default": ["-ldl"], + }), + tags = ["exclusive"], +- visibility = ["//visibility:private"], + deps = [ ++ ":test", + "//iceoryx_platform", +- "@googletest//:gtest", + ], + ) + + cc_test( + name = "platform_integrationtests", +- srcs = glob([ +- "integrationtests/*.cpp", +- "integrationtests/*.hpp", +- "*.hpp", +- ]), +- data = glob(["input/**"]), +- includes = [ +- ".", +- "integrationtests", +- ], ++ srcs = ["integrationtests/main_test_platform_integration.cpp"], + linkopts = select({ + "//iceoryx_platform:linux": ["-ldl"], +- "//iceoryx_platform:mac": [], + "//iceoryx_platform:qnx": [], + "//iceoryx_platform:unix": [], + "//iceoryx_platform:win": [], + "//conditions:default": ["-ldl"], + }), + tags = ["exclusive"], +- visibility = ["//visibility:private"], + deps = [ ++ ":test", + "//iceoryx_platform", +- "@googletest//:gtest", + ], + ) +diff --git a/iceoryx_posh/BUILD.bazel b/iceoryx_posh/BUILD.bazel +index 93e144d8c6..4305fef4da 100644 +--- a/iceoryx_posh/BUILD.bazel ++++ b/iceoryx_posh/BUILD.bazel +@@ -117,9 +117,7 @@ cc_library( + name = "iceoryx_posh", + srcs = glob( + [ +- "source/log/**", + "source/capro/**", +- "source/error_handling/**", + "source/mepoo/**", + "source/popo/**", + "source/version/**", +diff --git a/iceoryx_posh/test/BUILD.bazel b/iceoryx_posh/test/BUILD.bazel +index 1cf21cba51..e6111ef3c8 100644 +--- a/iceoryx_posh/test/BUILD.bazel ++++ b/iceoryx_posh/test/BUILD.bazel +@@ -14,7 +14,15 @@ + # + # SPDX-License-Identifier: Apache-2.0 + +-load("@rules_cc//cc:defs.bzl", "cc_test") ++load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test") ++ ++cc_library( ++ name = "test", ++ testonly = True, ++ hdrs = ["test.hpp"], ++ includes = ["."], ++ deps = ["@googletest//:gtest"], ++) + + cc_test( + name = "posh_moduletests", +@@ -25,13 +33,6 @@ cc_test( + "stubs/*.hpp", + "*.hpp", + ]), +- data = glob(["input/**"]), +- includes = [ +- ".", +- "mocks", +- "moduletests", +- "stubs", +- ], + linkopts = select({ + "//iceoryx_platform:linux": ["-ldl"], + "//iceoryx_platform:mac": [], +@@ -41,8 +42,8 @@ cc_test( + "//conditions:default": ["-ldl"], + }), + tags = ["exclusive"], +- visibility = ["//visibility:private"], + deps = [ ++ ":test", + "//iceoryx_hoofs:iceoryx_hoofs_testing", + "//iceoryx_posh", + "//iceoryx_posh:iceoryx_posh_config", +@@ -55,15 +56,7 @@ cc_test( + cc_test( + name = "posh_integrationtests", + timeout = "long", +- srcs = glob([ +- "integrationtests/*.cpp", +- "integrationtests/*.hpp", +- "*.hpp", +- ]), +- includes = [ +- ".", +- "integrationtests", +- ], ++ srcs = glob(["integrationtests/*"]), + linkopts = select({ + "//iceoryx_platform:linux": ["-ldl"], + "//iceoryx_platform:mac": [], +@@ -73,8 +66,8 @@ cc_test( + "//conditions:default": ["-ldl"], + }), + tags = ["exclusive"], +- visibility = ["//visibility:private"], + deps = [ ++ ":test", + "//iceoryx_hoofs:iceoryx_hoofs_testing", + "//iceoryx_posh", + "//iceoryx_posh:iceoryx_posh_gateway", diff --git a/modules/iceoryx/2.95.4/patches/2436.diff b/modules/iceoryx/2.95.4/patches/2436.diff new file mode 100644 index 00000000000..b3396ec9f2d --- /dev/null +++ b/modules/iceoryx/2.95.4/patches/2436.diff @@ -0,0 +1,95 @@ +diff --git a/.bazelrc b/.bazelrc +index 08fd10222d..ff0756cf69 100644 +--- a/.bazelrc ++++ b/.bazelrc +@@ -45,6 +45,6 @@ build --noenable_bzlmod + # feature flags + # + +-# value [auto, on, off] +-# 'auto' is platform dependent ('on' on Linux and QNX, 'off' on other OS) and the default value if the flag is not set +-#build --//:feature_acl=off ++# value [True, False]. Default: False. ++# Here we turn on the setting for Linux in this repo. Downstream consumers are unaffected. ++build:linux --//:feature_acl=True +diff --git a/BUILD.bazel b/BUILD.bazel +index 3955fa5006..1b61d1b014 100644 +--- a/BUILD.bazel ++++ b/BUILD.bazel +@@ -14,17 +14,16 @@ + # + # SPDX-License-Identifier: Apache-2.0 + +-load("@bazel_skylib//rules:common_settings.bzl", "string_flag") ++load("@bazel_skylib//rules:common_settings.bzl", "bool_flag") + load("@buildifier_prebuilt//:rules.bzl", "buildifier") + + exports_files(["LICENSE"]) + + exports_files(["VERSION"]) + +-# values: auto, on, off +-string_flag( ++bool_flag( + name = "feature_acl", +- build_setting_default = "auto", ++ build_setting_default = False, + visibility = ["//visibility:public"], + ) + +diff --git a/iceoryx_platform/BUILD.bazel b/iceoryx_platform/BUILD.bazel +index d7e66aff92..3d9bffa388 100644 +--- a/iceoryx_platform/BUILD.bazel ++++ b/iceoryx_platform/BUILD.bazel +@@ -14,7 +14,6 @@ + # + # SPDX-License-Identifier: Apache-2.0 + +-load("@bazel_skylib//lib:selects.bzl", "selects") + load("@rules_cc//cc:defs.bzl", "cc_library") + load("//bazel:configure_file.bzl", "configure_file") + load("//bazel:configure_version.bzl", "configure_version") +@@ -67,42 +66,8 @@ configure_version( + ) + + config_setting( +- name = "acl_auto", +- flag_values = { +- "//:feature_acl": "auto", +- }, +-) +- +-config_setting( +- name = "acl_enabled", +- flag_values = { +- "//:feature_acl": "on", +- }, +-) +- +-selects.config_setting_group( +- name = "acl_linux_enabled", +- match_all = [ +- ":linux", +- ":acl_auto", +- ], +-) +- +-selects.config_setting_group( +- name = "acl_qnx_enabled", +- match_all = [ +- ":qnx", +- ":acl_auto", +- ], +-) +- +-selects.config_setting_group( + name = "cfg_feature_acl", +- match_any = [ +- ":acl_enabled", +- ":acl_linux_enabled", +- ":acl_qnx_enabled", +- ], ++ flag_values = {"//:feature_acl": "True"}, + ) + + configure_file( diff --git a/modules/iceoryx/2.95.4/presubmit.yml b/modules/iceoryx/2.95.4/presubmit.yml new file mode 100644 index 00000000000..f2c2784e723 --- /dev/null +++ b/modules/iceoryx/2.95.4/presubmit.yml @@ -0,0 +1,23 @@ +matrix: + platform: + - debian11 + - macos + - macos_arm64 + - ubuntu2004 + - ubuntu2204 + - ubuntu2404 + bazel: [7.x, 8.x, rolling] +tasks: + verify_targets: + name: Verify build targets + platform: ${{ platform }} + bazel: ${{ bazel }} + build_flags: [--enable_bzlmod, --cxxopt=-std=c++17] + build_targets: ["@iceoryx//..."] + test_flags: [--enable_bzlmod, --cxxopt=-std=c++17] + test_targets: + - "@iceoryx//..." + # "While setting the acquired shared memory to zero a fatal SIGBUS signal appeared caused by memset" + - -@iceoryx//iceoryx_posh/test:posh_integrationtests + # SpscSofiStress.SimultaneouslyPushAndPopOnEmptySoFi (1651 < 2000) + - -@iceoryx//iceoryx_hoofs/test/stresstests:test_stress_spsc_sofi diff --git a/modules/iceoryx/2.95.4/source.json b/modules/iceoryx/2.95.4/source.json new file mode 100644 index 00000000000..f405399fd70 --- /dev/null +++ b/modules/iceoryx/2.95.4/source.json @@ -0,0 +1,11 @@ +{ + "integrity": "sha256-gsT+dQfRYJ4SdaBKP+gniuIGIKow4e7eY/lqnCMwirY=", + "strip_prefix": "iceoryx-2.95.4", + "url": "https://github.com/eclipse-iceoryx/iceoryx/archive/refs/tags/v2.95.4.tar.gz", + "patch_strip": 1, + "patches": { + "2371+2437+2439.diff": "sha256-N3KGiKt1qDBoapNQpKl06upm8cHVSNnoIf39llJ2+CU=", + "2433.diff": "sha256-O3eH2LehukqHQ97l4+TPn+zy/zEZiLy5b4RJK2zLICY=", + "2436.diff": "sha256-RIjwyPnQ/X9gVDrROjVu8FrpQy+5yixpsPcS8hnqxIY=" + } +} diff --git a/modules/iceoryx/metadata.json b/modules/iceoryx/metadata.json index 6575431bdba..256785df45e 100644 --- a/modules/iceoryx/metadata.json +++ b/modules/iceoryx/metadata.json @@ -5,6 +5,11 @@ "email": "daisuke.nishimatsu1021@gmail.com", "github": "wep21", "name": "Daisuke Nishimatsu" + }, + { + "email": "bcr@laure.nz", + "github": "lalten", + "name": "Laurenz Altenmueller" } ], "repository": [ @@ -12,7 +17,8 @@ ], "versions": [ "2.95.3", - "2.95.3.bcr.1" + "2.95.3.bcr.1", + "2.95.4" ], "yanked_versions": {} }