diff --git a/.cirrus.yml b/.cirrus.yml index 493cc1d50..d478c2f24 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -242,6 +242,8 @@ ubuntu_22_04_aarch64_stable_debug_task: <<: *IOX2_FFI_COMMON_DEBUG ubuntu_22_04_aarch64_beta_debug_task: + # TODO commented out due to limited CI time + only_if: false depends_on: ubuntu_22_04_aarch64_stable_debug skip: "changesIncludeOnly('.github/**', '**.md')" allow_failures: true @@ -275,6 +277,8 @@ arch_linux_x64_stable_debug_task: <<: *IOX2_FFI_COMMON_DEBUG arch_linux_x64_beta_debug_task: + # TODO commented out due to limited CI time + only_if: false depends_on: arch_linux_x64_stable_debug skip: "changesIncludeOnly('.github/**', '**.md')" <<: *IOX2_CONTAINER_ARCH_LINUX_X64 diff --git a/CMakeLists.txt b/CMakeLists.txt index e87ab3fcc..0e531358f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ # SPDX-License-Identifier: Apache-2.0 OR MIT cmake_minimum_required(VERSION 3.22) -set(IOX2_VERSION_STRING "0.4.0") +set(IOX2_VERSION_STRING "0.4.1") project(iceoryx2 VERSION ${IOX2_VERSION_STRING}) #TODO how to handle feature flags diff --git a/Cargo.toml b/Cargo.toml index e78384077..9971a7ed6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,33 +40,33 @@ license = "MIT OR Apache-2.0" readme = "README.md" repository = "https://github.com/eclipse-iceoryx/iceoryx2" rust-version = "1.75" -version = "0.4.0" +version = "0.4.1" [workspace.dependencies] -iceoryx2-bb-threadsafe = { version = "0.4.0", path = "iceoryx2-bb/threadsafe/" } -iceoryx2-bb-lock-free = { version = "0.4.0", path = "iceoryx2-bb/lock-free/" } -iceoryx2-bb-container = { version = "0.4.0", path = "iceoryx2-bb/container/" } -iceoryx2-bb-derive-macros = { version = "0.4.0", path = "iceoryx2-bb/derive-macros/" } -iceoryx2-bb-elementary = { version = "0.4.0", path = "iceoryx2-bb/elementary/" } -iceoryx2-bb-log = { version = "0.4.0", path = "iceoryx2-bb/log/" } -iceoryx2-bb-memory = { version = "0.4.0", path = "iceoryx2-bb/memory/" } -iceoryx2-bb-posix = { version = "0.4.0", path = "iceoryx2-bb/posix/" } -iceoryx2-bb-system-types = { version = "0.4.0", path = "iceoryx2-bb/system-types/" } -iceoryx2-bb-trait-tests = { version = "0.4.0", path = "iceoryx2-bb/trait-tests/" } -iceoryx2-bb-testing = { version = "0.4.0", path = "iceoryx2-bb/testing/" } - -iceoryx2-pal-concurrency-sync = { version = "0.4.0", path = "iceoryx2-pal/concurrency-sync/" } -iceoryx2-pal-posix = { version = "0.4.0", path = "iceoryx2-pal/posix/" } -iceoryx2-pal-configuration = { version = "0.4.0", path = "iceoryx2-pal/configuration/" } - -iceoryx2-cal = { version = "0.4.0", path = "iceoryx2-cal" } - -iceoryx2-ffi = { version = "0.4.0", path = "iceoryx2-ffi/ffi" } -iceoryx2-ffi-macros = { version = "0.4.0", path = "iceoryx2-ffi/ffi-macros" } - -iceoryx2 = { version = "0.4.0", path = "iceoryx2/" } - -iceoryx2-cli = { version = "0.4.0", path = "iceoryx2_cli/"} +iceoryx2-bb-threadsafe = { version = "0.4.1", path = "iceoryx2-bb/threadsafe/" } +iceoryx2-bb-lock-free = { version = "0.4.1", path = "iceoryx2-bb/lock-free/" } +iceoryx2-bb-container = { version = "0.4.1", path = "iceoryx2-bb/container/" } +iceoryx2-bb-derive-macros = { version = "0.4.1", path = "iceoryx2-bb/derive-macros/" } +iceoryx2-bb-elementary = { version = "0.4.1", path = "iceoryx2-bb/elementary/" } +iceoryx2-bb-log = { version = "0.4.1", path = "iceoryx2-bb/log/" } +iceoryx2-bb-memory = { version = "0.4.1", path = "iceoryx2-bb/memory/" } +iceoryx2-bb-posix = { version = "0.4.1", path = "iceoryx2-bb/posix/" } +iceoryx2-bb-system-types = { version = "0.4.1", path = "iceoryx2-bb/system-types/" } +iceoryx2-bb-trait-tests = { version = "0.4.1", path = "iceoryx2-bb/trait-tests/" } +iceoryx2-bb-testing = { version = "0.4.1", path = "iceoryx2-bb/testing/" } + +iceoryx2-pal-concurrency-sync = { version = "0.4.1", path = "iceoryx2-pal/concurrency-sync/" } +iceoryx2-pal-posix = { version = "0.4.1", path = "iceoryx2-pal/posix/" } +iceoryx2-pal-configuration = { version = "0.4.1", path = "iceoryx2-pal/configuration/" } + +iceoryx2-cal = { version = "0.4.1", path = "iceoryx2-cal" } + +iceoryx2-ffi = { version = "0.4.1", path = "iceoryx2-ffi/ffi" } +iceoryx2-ffi-macros = { version = "0.4.1", path = "iceoryx2-ffi/ffi-macros" } + +iceoryx2 = { version = "0.4.1", path = "iceoryx2/" } + +iceoryx2-cli = { version = "0.4.1", path = "iceoryx2_cli/"} diff --git a/doc/release-notes/iceoryx2-v0.4.1.md b/doc/release-notes/iceoryx2-v0.4.1.md new file mode 100644 index 000000000..155ea833a --- /dev/null +++ b/doc/release-notes/iceoryx2-v0.4.1.md @@ -0,0 +1,14 @@ +# iceoryx2 v0.4.1 + +## [v0.4.1](https://github.com/eclipse-iceoryx/iceoryx2/tree/v0.4.1) + +[Full Changelog](https://github.com/eclipse-iceoryx/iceoryx2/compare/v0.4.0...v0.4.1) + +### Bugfixes + +* Fix bug preventing `iox2` from being executed from any location + [#409](https://github.com/eclipse-iceoryx/iceoryx2/issues/409) + +## Thanks To All Contributors Of This Version + +* [»orecham«](https://github.com/orecham) diff --git a/examples/c/discovery/CMakeLists.txt b/examples/c/discovery/CMakeLists.txt index bf1f78a79..d4afe92e7 100644 --- a/examples/c/discovery/CMakeLists.txt +++ b/examples/c/discovery/CMakeLists.txt @@ -13,7 +13,7 @@ cmake_minimum_required(VERSION 3.22) project(example_c_discovery LANGUAGES C) -find_package(iceoryx2-c 0.4.0 REQUIRED) +find_package(iceoryx2-c 0.4.1 REQUIRED) add_executable(example_c_discovery src/main.c) diff --git a/examples/c/domains/CMakeLists.txt b/examples/c/domains/CMakeLists.txt index f81f4cc06..92e6fd696 100644 --- a/examples/c/domains/CMakeLists.txt +++ b/examples/c/domains/CMakeLists.txt @@ -13,7 +13,7 @@ cmake_minimum_required(VERSION 3.22) project(example_c_domains LANGUAGES C) -find_package(iceoryx2-c 0.4.0 REQUIRED) +find_package(iceoryx2-c 0.4.1 REQUIRED) add_executable(example_c_domains_publisher src/publisher.c) target_link_libraries(example_c_domains_publisher iceoryx2-c::static-lib) diff --git a/examples/c/event/CMakeLists.txt b/examples/c/event/CMakeLists.txt index b7f3ec694..7bab17221 100644 --- a/examples/c/event/CMakeLists.txt +++ b/examples/c/event/CMakeLists.txt @@ -13,7 +13,7 @@ cmake_minimum_required(VERSION 3.22) project(example_c_event LANGUAGES C) -find_package(iceoryx2-c 0.4.0 REQUIRED) +find_package(iceoryx2-c 0.4.1 REQUIRED) add_executable(example_c_event_listener src/listener.c) target_link_libraries(example_c_event_listener iceoryx2-c::static-lib) diff --git a/examples/c/publish_subscribe/CMakeLists.txt b/examples/c/publish_subscribe/CMakeLists.txt index 9261fc510..a46ebed83 100644 --- a/examples/c/publish_subscribe/CMakeLists.txt +++ b/examples/c/publish_subscribe/CMakeLists.txt @@ -13,7 +13,7 @@ cmake_minimum_required(VERSION 3.22) project(example_c_publish_subscribe LANGUAGES C) -find_package(iceoryx2-c 0.4.0 REQUIRED) +find_package(iceoryx2-c 0.4.1 REQUIRED) add_executable(example_c_publisher src/publisher.c) target_link_libraries(example_c_publisher iceoryx2-c::static-lib) diff --git a/examples/c/publish_subscribe_with_user_header/CMakeLists.txt b/examples/c/publish_subscribe_with_user_header/CMakeLists.txt index afd0ab4c3..3209fdaeb 100644 --- a/examples/c/publish_subscribe_with_user_header/CMakeLists.txt +++ b/examples/c/publish_subscribe_with_user_header/CMakeLists.txt @@ -13,7 +13,7 @@ cmake_minimum_required(VERSION 3.22) project(example_c_publish_subscribe_with_user_header LANGUAGES C) -find_package(iceoryx2-c 0.4.0 REQUIRED) +find_package(iceoryx2-c 0.4.1 REQUIRED) add_executable(example_c_with_user_header_publisher src/publisher.c) target_link_libraries(example_c_with_user_header_publisher iceoryx2-c::static-lib) diff --git a/examples/cxx/complex_data_types/CMakeLists.txt b/examples/cxx/complex_data_types/CMakeLists.txt index 556174e05..98d83296b 100644 --- a/examples/cxx/complex_data_types/CMakeLists.txt +++ b/examples/cxx/complex_data_types/CMakeLists.txt @@ -13,7 +13,7 @@ cmake_minimum_required(VERSION 3.22) project(example_cxx_complex_data_types LANGUAGES CXX) -find_package(iceoryx2-cxx 0.4.0 REQUIRED) +find_package(iceoryx2-cxx 0.4.1 REQUIRED) add_executable(example_cxx_complex_data_types src/complex_data_types.cpp) target_link_libraries(example_cxx_complex_data_types iceoryx2-cxx::static-lib-cxx) diff --git a/examples/cxx/discovery/CMakeLists.txt b/examples/cxx/discovery/CMakeLists.txt index 451670d6b..08d7e89d9 100644 --- a/examples/cxx/discovery/CMakeLists.txt +++ b/examples/cxx/discovery/CMakeLists.txt @@ -13,7 +13,7 @@ cmake_minimum_required(VERSION 3.22) project(example_cxx_discovery LANGUAGES CXX) -find_package(iceoryx2-cxx 0.4.0 REQUIRED) +find_package(iceoryx2-cxx 0.4.1 REQUIRED) add_executable(example_cxx_discovery src/discovery.cpp) target_link_libraries(example_cxx_discovery iceoryx2-cxx::static-lib-cxx) diff --git a/examples/cxx/domains/CMakeLists.txt b/examples/cxx/domains/CMakeLists.txt index f247290de..9af1639db 100644 --- a/examples/cxx/domains/CMakeLists.txt +++ b/examples/cxx/domains/CMakeLists.txt @@ -13,7 +13,7 @@ cmake_minimum_required(VERSION 3.22) project(example_cxx_domains LANGUAGES CXX) -find_package(iceoryx2-cxx 0.4.0 REQUIRED) +find_package(iceoryx2-cxx 0.4.1 REQUIRED) add_executable(example_cxx_domains_publisher src/publisher.cpp) target_link_libraries(example_cxx_domains_publisher iceoryx2-cxx::static-lib-cxx) diff --git a/examples/cxx/event/CMakeLists.txt b/examples/cxx/event/CMakeLists.txt index 30c9b0bbe..c4cd23856 100644 --- a/examples/cxx/event/CMakeLists.txt +++ b/examples/cxx/event/CMakeLists.txt @@ -13,7 +13,7 @@ cmake_minimum_required(VERSION 3.22) project(example_cxx_event LANGUAGES CXX) -find_package(iceoryx2-cxx 0.4.0 REQUIRED) +find_package(iceoryx2-cxx 0.4.1 REQUIRED) add_executable(example_cxx_event_listener src/listener.cpp) target_link_libraries(example_cxx_event_listener iceoryx2-cxx::static-lib-cxx) diff --git a/examples/cxx/publish_subscribe/CMakeLists.txt b/examples/cxx/publish_subscribe/CMakeLists.txt index 39f2d4ea7..50d6ef0dc 100644 --- a/examples/cxx/publish_subscribe/CMakeLists.txt +++ b/examples/cxx/publish_subscribe/CMakeLists.txt @@ -13,7 +13,7 @@ cmake_minimum_required(VERSION 3.22) project(example_cxx_publish_subscribe LANGUAGES CXX) -find_package(iceoryx2-cxx 0.4.0 REQUIRED) +find_package(iceoryx2-cxx 0.4.1 REQUIRED) add_executable(example_cxx_publish_subscribe_publisher src/publisher.cpp) target_link_libraries(example_cxx_publish_subscribe_publisher iceoryx2-cxx::static-lib-cxx) diff --git a/examples/cxx/publish_subscribe_dynamic_data/CMakeLists.txt b/examples/cxx/publish_subscribe_dynamic_data/CMakeLists.txt index d36de7c8b..f264d8acc 100644 --- a/examples/cxx/publish_subscribe_dynamic_data/CMakeLists.txt +++ b/examples/cxx/publish_subscribe_dynamic_data/CMakeLists.txt @@ -13,7 +13,7 @@ cmake_minimum_required(VERSION 3.22) project(example_cxx_publish_subscribe_dynamic_data LANGUAGES CXX) -find_package(iceoryx2-cxx 0.4.0 REQUIRED) +find_package(iceoryx2-cxx 0.4.1 REQUIRED) add_executable(example_cxx_publish_subscribe_dyn_publisher src/publisher.cpp) target_link_libraries(example_cxx_publish_subscribe_dyn_publisher iceoryx2-cxx::static-lib-cxx) diff --git a/examples/cxx/publish_subscribe_with_user_header/CMakeLists.txt b/examples/cxx/publish_subscribe_with_user_header/CMakeLists.txt index 2eaeff5a3..9ce6fb5b1 100644 --- a/examples/cxx/publish_subscribe_with_user_header/CMakeLists.txt +++ b/examples/cxx/publish_subscribe_with_user_header/CMakeLists.txt @@ -13,7 +13,7 @@ cmake_minimum_required(VERSION 3.22) project(example_cxx_publish_subscribe_with_user_header LANGUAGES CXX) -find_package(iceoryx2-cxx 0.4.0 REQUIRED) +find_package(iceoryx2-cxx 0.4.1 REQUIRED) add_executable(example_cxx_publish_subscribe_user_header_publisher src/publisher.cpp) target_link_libraries(example_cxx_publish_subscribe_user_header_publisher iceoryx2-cxx::static-lib-cxx) diff --git a/examples/cxx/service_attributes/CMakeLists.txt b/examples/cxx/service_attributes/CMakeLists.txt index c38dd999d..797e2925d 100644 --- a/examples/cxx/service_attributes/CMakeLists.txt +++ b/examples/cxx/service_attributes/CMakeLists.txt @@ -13,7 +13,7 @@ cmake_minimum_required(VERSION 3.22) project(example_cxx_service_attributes LANGUAGES CXX) -find_package(iceoryx2-cxx 0.4.0 REQUIRED) +find_package(iceoryx2-cxx 0.4.1 REQUIRED) add_executable(example_cxx_service_attributes_creator src/creator.cpp) target_link_libraries(example_cxx_service_attributes_creator iceoryx2-cxx::static-lib-cxx) diff --git a/iceoryx2-cli/iox2/src/commands.rs b/iceoryx2-cli/iox2/src/commands.rs index 6fcf12245..c8991bc53 100644 --- a/iceoryx2-cli/iox2/src/commands.rs +++ b/iceoryx2-cli/iox2/src/commands.rs @@ -175,8 +175,8 @@ where E: Environment, { fn paths() -> Result { - let build = E::build_paths().context("Failed to retrieve build paths")?; - let install = E::install_paths().context("Failed to retrieve install paths")?; + let build = E::build_paths().unwrap_or_default(); + let install = E::install_paths().unwrap_or_default(); Ok(PathsList { build, install }) } @@ -225,13 +225,18 @@ where { let paths = IceoryxCommandFinder::::paths().context("Failed to list search paths")?; - println!("{}", "Build Paths:".bright_green().bold()); - for dir in paths.build { - println!(" {}", dir.display().to_string().bold()); + if !paths.build.is_empty() { + println!("{}", "Build Paths:".bright_green().bold()); + for dir in &paths.build { + println!(" {}", dir.display().to_string().bold()); + } + println!(); } - println!("\n{}", "Install Paths:".bright_green().bold()); - for dir in paths.install { - println!(" {}", dir.display().to_string().bold()); + if !paths.install.is_empty() { + println!("{}", "Install Paths:".bright_green().bold()); + for dir in &paths.install { + println!(" {}", dir.display().to_string().bold()); + } } Ok(()) diff --git a/iceoryx2-ffi/c/BUILD.bazel b/iceoryx2-ffi/c/BUILD.bazel index 1a1cfac2d..3a8bdadde 100644 --- a/iceoryx2-ffi/c/BUILD.bazel +++ b/iceoryx2-ffi/c/BUILD.bazel @@ -22,7 +22,7 @@ filegroup( cmake( name = "iceoryx2-c", cache_entries = { - "IOX2_VERSION_STRING": "0.4.0", + "IOX2_VERSION_STRING": "0.4.1", }, build_data = [ ":cmake_srcs", @@ -49,7 +49,7 @@ cmake( "//:win-msvc": "lib", "//conditions:default": "", }), - out_include_dir = "include/iceoryx2/v0.4.0/", + out_include_dir = "include/iceoryx2/v0.4.1/", exec_properties = { "requires-network": "true", }, diff --git a/iceoryx2-ffi/c/cmake/iceoryx2-cConfigVersion.cmake b/iceoryx2-ffi/c/cmake/iceoryx2-cConfigVersion.cmake index 8e04e23dd..f626b5046 100644 --- a/iceoryx2-ffi/c/cmake/iceoryx2-cConfigVersion.cmake +++ b/iceoryx2-ffi/c/cmake/iceoryx2-cConfigVersion.cmake @@ -14,7 +14,7 @@ ########## dummyConfig.cmake to be able to use find_package with a specific version with the source tree ########## # -set(IOX2_VERSION_STRING "0.4.0") +set(IOX2_VERSION_STRING "0.4.1") set(PACKAGE_VERSION ${IOX2_VERSION_STRING}) if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) diff --git a/iceoryx2-ffi/cxx/cmake/iceoryx2-cxxConfigVersion.cmake b/iceoryx2-ffi/cxx/cmake/iceoryx2-cxxConfigVersion.cmake index 8e04e23dd..f626b5046 100644 --- a/iceoryx2-ffi/cxx/cmake/iceoryx2-cxxConfigVersion.cmake +++ b/iceoryx2-ffi/cxx/cmake/iceoryx2-cxxConfigVersion.cmake @@ -14,7 +14,7 @@ ########## dummyConfig.cmake to be able to use find_package with a specific version with the source tree ########## # -set(IOX2_VERSION_STRING "0.4.0") +set(IOX2_VERSION_STRING "0.4.1") set(PACKAGE_VERSION ${IOX2_VERSION_STRING}) if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) diff --git a/package.xml b/package.xml index 0232db370..3ecff423c 100644 --- a/package.xml +++ b/package.xml @@ -2,7 +2,7 @@ iceoryx2_cxx - 0.4.0 + 0.4.1 iceoryx2 with c/c++ bindings ekxide developers Apache 2.0