From f0eb23d32243dc4a00fa73901b96ea3726896850 Mon Sep 17 00:00:00 2001 From: Mathias Kraus Date: Tue, 15 Oct 2024 15:08:36 +0200 Subject: [PATCH 1/3] iox-#1547 Simplify integration of iceoryx into external bazel projects --- WORKSPACE.bazel | 9 ++------- bazel/deps.bzl | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 bazel/deps.bzl diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel index 136a69f31d..76d740b401 100644 --- a/WORKSPACE.bazel +++ b/WORKSPACE.bazel @@ -17,11 +17,6 @@ workspace(name = "org_eclipse_iceoryx") # Load dependency googletest -load("//bazel:load_repositories.bzl", "load_repositories") +load("//bazel:deps.bzl", "iceoryx_deps") -load_repositories() - -# Load dependency cpptoml -load("//bazel:setup_repositories.bzl", "setup_repositories") - -setup_repositories() +iceoryx_deps() diff --git a/bazel/deps.bzl b/bazel/deps.bzl new file mode 100644 index 0000000000..fe9142763c --- /dev/null +++ b/bazel/deps.bzl @@ -0,0 +1,27 @@ +""" +Copyright (c) 2024 by ekxide IO GmbH. All rights reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +SPDX-License-Identifier: Apache-2.0 +""" + +load("//bazel:load_repositories.bzl", "load_repositories") +load("//bazel:setup_repositories.bzl", "setup_repositories") + +def iceoryx_deps(): + """ + Loads iceoryx dependencies into workspace + """ + load_repositories() + setup_repositories() From a25fd104f8ce33fdd1f74088a37d83d3c28d9e12 Mon Sep 17 00:00:00 2001 From: Mathias Kraus Date: Tue, 15 Oct 2024 15:44:29 +0200 Subject: [PATCH 2/3] iox-#1295 Update release script to check the version in MODULES.bazel --- tools/scripts/iceoryx_release.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/scripts/iceoryx_release.sh b/tools/scripts/iceoryx_release.sh index 4a7f1e8f92..b01939861e 100755 --- a/tools/scripts/iceoryx_release.sh +++ b/tools/scripts/iceoryx_release.sh @@ -38,6 +38,14 @@ select yn in "Yes" "No"; do esac done +echo "Did you updated the VERSION in MODULE.bazel?" +select yn in "Yes" "No"; do + case $yn in + Yes ) break;; + No ) exit 0;; + esac +done + target_version=$(head -n 1 "$WORKSPACE/VERSION") echo "The new version number will be: $target_version" From 763ca5dd2d818d645faa56d79fbd03e447f7ccb5 Mon Sep 17 00:00:00 2001 From: Mathias Kraus Date: Tue, 15 Oct 2024 15:58:31 +0200 Subject: [PATCH 3/3] iox-#1295 Bump version to 2.95.3 --- MODULE.bazel | 2 +- VERSION | 2 +- cmake/package/package.cmake | 2 +- doc/aspice_swe3_4/CMakeLists.txt | 2 +- iceoryx_binding_c/CMakeLists.txt | 2 +- iceoryx_binding_c/cmake/iceoryx_binding_cConfigVersion.cmake | 2 +- iceoryx_binding_c/package.xml | 2 +- iceoryx_hoofs/CMakeLists.txt | 2 +- iceoryx_hoofs/cmake/iceoryx_hoofsConfigVersion.cmake | 2 +- iceoryx_hoofs/package.xml | 2 +- iceoryx_integrationtest/package.xml | 2 +- iceoryx_platform/CMakeLists.txt | 2 +- iceoryx_platform/cmake/iceoryx_platformConfigVersion.cmake | 2 +- iceoryx_platform/package.xml | 2 +- iceoryx_posh/CMakeLists.txt | 2 +- iceoryx_posh/cmake/iceoryx_poshConfigVersion.cmake | 2 +- iceoryx_posh/package.xml | 2 +- tools/introspection/CMakeLists.txt | 2 +- .../cmake/iceoryx_introspectionConfigVersion.cmake | 2 +- tools/introspection/package.xml | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index bb065793c6..20fead79d0 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,6 +1,6 @@ module( name = "org_eclipse_iceroyx", - version = "2.95.0", + version = "2.95.3", ) bazel_dep(name = "bazel_skylib", version = "1.7.1") diff --git a/VERSION b/VERSION index f820281663..228c711c24 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.95.2 +2.95.3 diff --git a/cmake/package/package.cmake b/cmake/package/package.cmake index bfbd0643a0..dce9023c4c 100644 --- a/cmake/package/package.cmake +++ b/cmake/package/package.cmake @@ -14,7 +14,7 @@ # # SPDX-License-Identifier: Apache-2.0 cmake_minimum_required(VERSION 3.16) -set(IOX_VERSION_STRING "2.95.2") +set(IOX_VERSION_STRING "2.95.3") project(iceoryx_package VERSION ${IOX_VERSION_STRING}) diff --git a/doc/aspice_swe3_4/CMakeLists.txt b/doc/aspice_swe3_4/CMakeLists.txt index fb24bd4438..095d7effe3 100644 --- a/doc/aspice_swe3_4/CMakeLists.txt +++ b/doc/aspice_swe3_4/CMakeLists.txt @@ -16,7 +16,7 @@ cmake_minimum_required(VERSION 3.16) -set(IOX_VERSION_STRING "2.95.2") +set(IOX_VERSION_STRING "2.95.3") project(iceoryx_doc VERSION ${IOX_VERSION_STRING}) diff --git a/iceoryx_binding_c/CMakeLists.txt b/iceoryx_binding_c/CMakeLists.txt index f2c7fcb6c3..efdf016a1f 100644 --- a/iceoryx_binding_c/CMakeLists.txt +++ b/iceoryx_binding_c/CMakeLists.txt @@ -16,7 +16,7 @@ # SPDX-License-Identifier: Apache-2.0 cmake_minimum_required(VERSION 3.16) -set(IOX_VERSION_STRING "2.95.2") +set(IOX_VERSION_STRING "2.95.3") project(iceoryx_binding_c VERSION ${IOX_VERSION_STRING}) diff --git a/iceoryx_binding_c/cmake/iceoryx_binding_cConfigVersion.cmake b/iceoryx_binding_c/cmake/iceoryx_binding_cConfigVersion.cmake index 72f0fbb4b2..b620bba7dd 100644 --- a/iceoryx_binding_c/cmake/iceoryx_binding_cConfigVersion.cmake +++ b/iceoryx_binding_c/cmake/iceoryx_binding_cConfigVersion.cmake @@ -18,7 +18,7 @@ ########## dummyConfig.cmake to be able to use find_package with a specific version with the source tree ########## # -set(IOX_VERSION_STRING "2.95.2") +set(IOX_VERSION_STRING "2.95.3") set(PACKAGE_VERSION ${IOX_VERSION_STRING}) if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) diff --git a/iceoryx_binding_c/package.xml b/iceoryx_binding_c/package.xml index 2638ecf623..e2ced7bd62 100644 --- a/iceoryx_binding_c/package.xml +++ b/iceoryx_binding_c/package.xml @@ -2,7 +2,7 @@ iceoryx_binding_c - 2.95.2 + 2.95.3 Eclipse iceoryx inter-process-communication (IPC) middleware C-Language Binding Eclipse Foundation, Inc. Apache 2.0 diff --git a/iceoryx_hoofs/CMakeLists.txt b/iceoryx_hoofs/CMakeLists.txt index a9a9355bff..86eca3c86d 100644 --- a/iceoryx_hoofs/CMakeLists.txt +++ b/iceoryx_hoofs/CMakeLists.txt @@ -17,7 +17,7 @@ cmake_minimum_required(VERSION 3.16) -set(IOX_VERSION_STRING "2.95.2") +set(IOX_VERSION_STRING "2.95.3") project(iceoryx_hoofs VERSION ${IOX_VERSION_STRING}) diff --git a/iceoryx_hoofs/cmake/iceoryx_hoofsConfigVersion.cmake b/iceoryx_hoofs/cmake/iceoryx_hoofsConfigVersion.cmake index 72f0fbb4b2..b620bba7dd 100644 --- a/iceoryx_hoofs/cmake/iceoryx_hoofsConfigVersion.cmake +++ b/iceoryx_hoofs/cmake/iceoryx_hoofsConfigVersion.cmake @@ -18,7 +18,7 @@ ########## dummyConfig.cmake to be able to use find_package with a specific version with the source tree ########## # -set(IOX_VERSION_STRING "2.95.2") +set(IOX_VERSION_STRING "2.95.3") set(PACKAGE_VERSION ${IOX_VERSION_STRING}) if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) diff --git a/iceoryx_hoofs/package.xml b/iceoryx_hoofs/package.xml index e3ec5513cf..81539e9b0f 100644 --- a/iceoryx_hoofs/package.xml +++ b/iceoryx_hoofs/package.xml @@ -2,7 +2,7 @@ iceoryx_hoofs - 2.95.2 + 2.95.3 Eclipse iceoryx inter-process-communication (IPC) middleware basic building blocks Eclipse Foundation, Inc. Apache 2.0 diff --git a/iceoryx_integrationtest/package.xml b/iceoryx_integrationtest/package.xml index 3fbbda617c..08e5772ec0 100644 --- a/iceoryx_integrationtest/package.xml +++ b/iceoryx_integrationtest/package.xml @@ -2,7 +2,7 @@ iceoryx_integrationtest - 2.95.2 + 2.95.3 iceoryx Software Integrationtest Eclipse Foundation, Inc. Apache 2.0 diff --git a/iceoryx_platform/CMakeLists.txt b/iceoryx_platform/CMakeLists.txt index 1a46713b11..bd164328dd 100644 --- a/iceoryx_platform/CMakeLists.txt +++ b/iceoryx_platform/CMakeLists.txt @@ -17,7 +17,7 @@ cmake_minimum_required(VERSION 3.16) -set(IOX_VERSION_STRING "2.95.2") +set(IOX_VERSION_STRING "2.95.3") project(iceoryx_platform VERSION ${IOX_VERSION_STRING}) if(UNIX AND NOT APPLE) diff --git a/iceoryx_platform/cmake/iceoryx_platformConfigVersion.cmake b/iceoryx_platform/cmake/iceoryx_platformConfigVersion.cmake index 72f0fbb4b2..b620bba7dd 100644 --- a/iceoryx_platform/cmake/iceoryx_platformConfigVersion.cmake +++ b/iceoryx_platform/cmake/iceoryx_platformConfigVersion.cmake @@ -18,7 +18,7 @@ ########## dummyConfig.cmake to be able to use find_package with a specific version with the source tree ########## # -set(IOX_VERSION_STRING "2.95.2") +set(IOX_VERSION_STRING "2.95.3") set(PACKAGE_VERSION ${IOX_VERSION_STRING}) if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) diff --git a/iceoryx_platform/package.xml b/iceoryx_platform/package.xml index 3f5e8be9cf..3f44f3b06e 100644 --- a/iceoryx_platform/package.xml +++ b/iceoryx_platform/package.xml @@ -2,7 +2,7 @@ iceoryx_platform - 2.95.2 + 2.95.3 Eclipse iceoryx inter-process-communication (IPC) middleware platform Eclipse Foundation, Inc. Apache 2.0 diff --git a/iceoryx_posh/CMakeLists.txt b/iceoryx_posh/CMakeLists.txt index b29aff77af..3d2cbdc64d 100644 --- a/iceoryx_posh/CMakeLists.txt +++ b/iceoryx_posh/CMakeLists.txt @@ -16,7 +16,7 @@ # SPDX-License-Identifier: Apache-2.0 cmake_minimum_required(VERSION 3.16) -set(IOX_VERSION_STRING "2.95.2") +set(IOX_VERSION_STRING "2.95.3") project(iceoryx_posh VERSION ${IOX_VERSION_STRING}) diff --git a/iceoryx_posh/cmake/iceoryx_poshConfigVersion.cmake b/iceoryx_posh/cmake/iceoryx_poshConfigVersion.cmake index 72f0fbb4b2..b620bba7dd 100644 --- a/iceoryx_posh/cmake/iceoryx_poshConfigVersion.cmake +++ b/iceoryx_posh/cmake/iceoryx_poshConfigVersion.cmake @@ -18,7 +18,7 @@ ########## dummyConfig.cmake to be able to use find_package with a specific version with the source tree ########## # -set(IOX_VERSION_STRING "2.95.2") +set(IOX_VERSION_STRING "2.95.3") set(PACKAGE_VERSION ${IOX_VERSION_STRING}) if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) diff --git a/iceoryx_posh/package.xml b/iceoryx_posh/package.xml index e0ff974531..632de0bd99 100644 --- a/iceoryx_posh/package.xml +++ b/iceoryx_posh/package.xml @@ -2,7 +2,7 @@ iceoryx_posh - 2.95.2 + 2.95.3 Eclipse iceoryx inter-process-communication (IPC) middleware Posix Shared Memory Library and middleware daemon (RouDi) Eclipse Foundation, Inc. Apache 2.0 diff --git a/tools/introspection/CMakeLists.txt b/tools/introspection/CMakeLists.txt index b3334974d0..113d4d906b 100644 --- a/tools/introspection/CMakeLists.txt +++ b/tools/introspection/CMakeLists.txt @@ -17,7 +17,7 @@ cmake_minimum_required(VERSION 3.16) -set(IOX_VERSION_STRING "2.95.2") +set(IOX_VERSION_STRING "2.95.3") project(iceoryx_introspection VERSION ${IOX_VERSION_STRING}) diff --git a/tools/introspection/cmake/iceoryx_introspectionConfigVersion.cmake b/tools/introspection/cmake/iceoryx_introspectionConfigVersion.cmake index 72f0fbb4b2..b620bba7dd 100644 --- a/tools/introspection/cmake/iceoryx_introspectionConfigVersion.cmake +++ b/tools/introspection/cmake/iceoryx_introspectionConfigVersion.cmake @@ -18,7 +18,7 @@ ########## dummyConfig.cmake to be able to use find_package with a specific version with the source tree ########## # -set(IOX_VERSION_STRING "2.95.2") +set(IOX_VERSION_STRING "2.95.3") set(PACKAGE_VERSION ${IOX_VERSION_STRING}) if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) diff --git a/tools/introspection/package.xml b/tools/introspection/package.xml index 6a215d9bbe..42f315407c 100644 --- a/tools/introspection/package.xml +++ b/tools/introspection/package.xml @@ -2,7 +2,7 @@ iceoryx_introspection - 2.95.2 + 2.95.3 Eclipse iceoryx inter-process-communication (IPC) middleware introspection client Eclipse Foundation, Inc. Apache 2.0