Merge pull request #2100 from ApexAI/iox-2099-add-introspection-to-ro…

…s-release Add introspection to ROS release for `v2.x` release
eclipse-iceoryx · Nov 27, 2023 · b225f3a · b225f3a
2 parents 40ef24e + d8b4bb8
commit b225f3a
Show file tree

Hide file tree

Showing 18 changed files with 57 additions and 23 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -102,14 +102,6 @@ jobs:
       - uses: actions/checkout@v2
       - run: ./tools/ci/build-test-macos-with-sanitizers.sh
 
-  # gcc 5.4 is compiler used in QNX 7.0
-  build-test-ubuntu-with-gcc54:
-    runs-on: ubuntu-18.04
-    needs: pre-flight-check
-    steps:
-      - uses: actions/checkout@v2
-      - run: ./tools/ci/build-test-ubuntu-with-gcc54.sh
-
   coverage-and-docs:
     runs-on: ubuntu-20.04
     needs: pre-flight-check

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.0.3
+2.0.4
diff --git 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.0.3")
+set(IOX_VERSION_STRING "2.0.4")
 
 project(iceoryx_package VERSION ${IOX_VERSION_STRING})
 

diff --git 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.0.3")
+set(IOX_VERSION_STRING "2.0.4")
 
 project(iceoryx_doc VERSION ${IOX_VERSION_STRING})
 

diff --git a/doc/website/release-notes/.pages b/doc/website/release-notes/.pages
@@ -1,4 +1,5 @@
 nav:
+  - iceoryx-v2-0-4.md
   - iceoryx-v2-0-3.md
   - iceoryx-v2-0-2.md
   - iceoryx-v2-0-1.md

diff --git a/doc/website/release-notes/iceoryx-v2-0-3.md b/doc/website/release-notes/iceoryx-v2-0-3.md
@@ -1,6 +1,6 @@
 # iceoryx v2.0.3
 
-## [v2.0.3](https://github.com/eclipse-iceoryx/iceoryx/tree/v2.0.2) (tbd)
+## [v2.0.3](https://github.com/eclipse-iceoryx/iceoryx/tree/v2.0.3) (2023-02-02)
 
 [Full Changelog](https://github.com/eclipse-iceoryx/iceoryx/compare/v2.0.2...v2.0.3)
 

diff --git a/doc/website/release-notes/iceoryx-v2-0-4.md b/doc/website/release-notes/iceoryx-v2-0-4.md
@@ -0,0 +1,9 @@
+# iceoryx v2.0.4
+
+## [v2.0.4](https://github.com/eclipse-iceoryx/iceoryx/tree/v2.0.4) (2023-11-xx)
+
+[Full Changelog](https://github.com/eclipse-iceoryx/iceoryx/compare/v2.0.3...v2.0.4)
+
+**Features:**
+
+- Add the introspection to the ROS release [\#2099](https://github.com/eclipse-iceoryx/iceoryx/issues/2099)
diff --git 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.0.3")
+set(IOX_VERSION_STRING "2.0.4")
 
 
 

diff --git a/iceoryx_binding_c/package.xml b/iceoryx_binding_c/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
     <name>iceoryx_binding_c</name>
-    <version>2.0.3</version>
+    <version>2.0.4</version>
     <description>Eclipse iceoryx inter-process-communication (IPC) middleware C-Language Binding</description>
     <maintainer email="[email protected]">Eclipse Foundation, Inc.</maintainer>
     <license>Apache 2.0</license>

diff --git a/iceoryx_dds/CMakeLists.txt b/iceoryx_dds/CMakeLists.txt
@@ -16,7 +16,7 @@
 # SPDX-License-Identifier: Apache-2.0
 cmake_minimum_required(VERSION 3.16)
 
-set(IOX_VERSION_STRING "2.0.3")
+set(IOX_VERSION_STRING "2.0.4")
 
 project(iceoryx_dds VERSION ${IOX_VERSION_STRING})
 

diff --git 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.0.3")
+set(IOX_VERSION_STRING "2.0.4")
 
 project(iceoryx_hoofs VERSION ${IOX_VERSION_STRING})
 

diff --git a/iceoryx_hoofs/package.xml b/iceoryx_hoofs/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
     <name>iceoryx_hoofs</name>
-    <version>2.0.3</version>
+    <version>2.0.4</version>
     <description>Eclipse iceoryx inter-process-communication (IPC) middleware basic building blocks</description>
     <maintainer email="[email protected]">Eclipse Foundation, Inc.</maintainer>
     <license>Apache 2.0</license>

diff --git a/iceoryx_integrationtest/package.xml b/iceoryx_integrationtest/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>iceoryx_integrationtest</name>
-  <version>2.0.3</version>
+  <version>2.0.4</version>
   <description>iceoryx Software Integrationtest</description>
     <maintainer email="[email protected]">Eclipse Foundation, Inc.</maintainer>
     <license>Apache 2.0</license>

diff --git 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.0.3")
+set(IOX_VERSION_STRING "2.0.4")
 
 project(iceoryx_posh VERSION ${IOX_VERSION_STRING})
 

diff --git a/iceoryx_posh/package.xml b/iceoryx_posh/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
     <name>iceoryx_posh</name>
-    <version>2.0.3</version>
+    <version>2.0.4</version>
     <description>Eclipse iceoryx inter-process-communication (IPC) middleware Posix Shared Memory Library and middleware daemon (RouDi)</description>
     <maintainer email="[email protected]">Eclipse Foundation, Inc.</maintainer>
     <license>Apache 2.0</license>

diff --git a/tools/introspection/CMakeLists.txt b/tools/introspection/CMakeLists.txt
@@ -17,10 +17,16 @@
 
 cmake_minimum_required(VERSION 3.16)
 
-set(IOX_VERSION_STRING "2.0.3")
+set(IOX_VERSION_STRING "2.0.4")
 
 project(iceoryx_introspection VERSION ${IOX_VERSION_STRING})
 
+# Do not build the introspection on Windows due to missing ncurses
+if(WIN32)
+    message(STATUS "The introspection client is not supported on Windows")
+    return()
+endif()
+
 find_package(iceoryx_hoofs REQUIRED)
 find_package(iceoryx_posh REQUIRED)
 
@@ -29,6 +35,10 @@ include(IceoryxPlatform)
 
 set(PREFIX iceoryx/v${CMAKE_PROJECT_VERSION})
 
+if(CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin)
+    option(BUILD_SHARED_LIBS "Create shared libraries by default" ON)
+endif()
+
 # cmake doesn't find ncurses under QNX; let the compiler complain if the header is missing
 if(NOT QNX)
     SET(CURSES_USE_NCURSES TRUE)
@@ -88,8 +98,6 @@ target_compile_options(iceoryx_introspection PRIVATE ${ICEORYX_WARNINGS} ${ICEOR
 
 if(LINUX)
     set(LIB_TINFO tinfo)
-elseif(WIN32)
-    message(WARNING "Introspection not supported for windows." )
 else()
     set(LIB_TINFO "")
 endif()

diff --git a/tools/introspection/COLCON_IGNORE b/tools/introspection/COLCON_IGNORE
diff --git a/tools/introspection/package.xml b/tools/introspection/package.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
+<package format="3">
+    <name>iceoryx_introspection</name>
+    <version>2.0.4</version>
+    <description>Eclipse iceoryx inter-process-communication (IPC) middleware introspection client</description>
+    <maintainer email="[email protected]">Eclipse Foundation, Inc.</maintainer>
+    <license>Apache 2.0</license>
+    <url type="website">https://iceoryx.io</url>
+    <url type="bugtracker">https://github.com/eclipse-iceoryx/iceoryx/issues</url>
+    <url type="repository">https://github.com/eclipse-iceoryx/iceoryx</url>
+
+    <buildtool_depend>cmake</buildtool_depend>
+
+    <depend>iceoryx_posh</depend>
+    <depend>iceoryx_hoofs</depend>
+    <depend>libncurses-dev</depend>
+
+    <doc_depend>doxygen</doc_depend>
+
+    <export>
+        <build_type>cmake</build_type>
+    </export>
+</package>