Merge branch 'master' into core/server-service-response

eclipse-ecal · Jan 9, 2025 · 2675824 · 2675824
2 parents 867d0e8 + b3023ae
commit 2675824
Show file tree

Hide file tree

Showing 200 changed files with 715 additions and 353 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 # ========================= eCAL LICENSE =================================
 #
-# Copyright (C) 2016 - 2024 Continental Corporation
+# Copyright (C) 2016 - 2025 Continental Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -79,9 +79,12 @@ endif()
 option(HAS_QT                                  "Platform supports Qt 5 / 6 library."                               ON)
 
 option(HAS_CURL                                "Build with CURL (i.e. upload support in the recorder app)"         ON)
+option(HAS_FTXUI                               "Platform supports FTXUI library. Requires C++17 and up."           ON)
+
+# Serialization format support
 option(HAS_CAPNPROTO                           "Platform supports Cap'n Proto library"                            OFF)
 option(HAS_FLATBUFFERS                         "Platform supports flatbuffers library"                            OFF)
-option(HAS_FTXUI                               "Platform supports FTXUI library. Requires C++17 and up."           ON)
+option(HAS_MESSAGEPACK                         "Platform supports messagepack library"                            OFF)
 
 option(BUILD_DOCS                              "Build the eCAL documentation"                                     OFF)
 option(BUILD_APPS                              "Build the eCAL applications"                                       ON)
@@ -307,7 +310,6 @@ endif()
 if(HAS_HDF5)
   add_subdirectory(contrib/measurement/hdf5)
   add_subdirectory(contrib/ecalhdf5)
-  add_subdirectory(contrib/message)
 endif()
 add_subdirectory(contrib/measurement/base)
 
@@ -390,6 +392,43 @@ if(BUILD_SAMPLES)
   add_subdirectory(samples)
 endif()
 
+
+# --------------------------------------------------------
+# Serialization extensions
+# --------------------------------------------------------
+# Capnroto
+if (HAS_CAPNPROTO)
+set(ECAL_CAPNPROTO_BUILD_SAMPLES                                                                     ${BUILD_SAMPLES})
+set(ECAL_CAPNPROTO_BUILD_TESTS                                                                    ${BUILD_ECAL_TESTS})
+add_subdirectory(serialization/capnproto)
+endif ()
+
+# Flatbuffers
+if (HAS_FLATBUFFERS)
+set(ECAL_FLATBUFFERS_BUILD_SAMPLES                                                                   ${BUILD_SAMPLES})
+set(ECAL_FLATBUFFERS_BUILD_TESTS                                                                  ${BUILD_ECAL_TESTS})
+add_subdirectory(serialization/flatbuffers)
+endif()
+
+# Messagepack
+#if (HAS_MESSAGEPACK)
+#set(ECAL_MESSAGEPACK_BUILD_SAMPLES                                                                   ${BUILD_SAMPLES})
+#set(ECAL_MESSAGEPACK_BUILD_TESTS                                                                  ${BUILD_ECAL_TESTS})
+#add_subdirectory(serialization/messagepack)
+#endif()
+
+# Protobuf
+set(ECAL_PROTOBUF_BUILD_SAMPLES                                                                      ${BUILD_SAMPLES})
+set(ECAL_PROTOBUF_BUILD_TESTS                                                                     ${BUILD_ECAL_TESTS})
+add_subdirectory(serialization/protobuf)
+
+# String
+set(ECAL_STRING_BUILD_SAMPLES                                                                        ${BUILD_SAMPLES})
+set(ECAL_STRING_BUILD_TESTS                                                                       ${BUILD_ECAL_TESTS})
+add_subdirectory(serialization/string)
+
+
+
 # --------------------------------------------------------
 # unit tests
 # --------------------------------------------------------
@@ -402,8 +441,6 @@ if(BUILD_ECAL_TESTS)
   if(HAS_HDF5)
     add_subdirectory(tests/contrib/ecalhdf5/hdf5_test)
   endif()
-  add_subdirectory(tests/contrib/ecalproto/dynproto_test)
-  add_subdirectory(tests/contrib/ecalproto/ecal_proto_test)
 
   # ------------------------------------------------------
   # test apps

diff --git a/app/mon/mon_cli/CMakeLists.txt b/app/mon/mon_cli/CMakeLists.txt
@@ -1,6 +1,6 @@
 # ========================= eCAL LICENSE =================================
 #
-# Copyright (C) 2016 - 2024 Continental Corporation
+# Copyright (C) 2016 - 2025 Continental Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -43,7 +43,8 @@ create_targets_protobuf()
 
 target_link_libraries(${PROJECT_NAME}
   tclap::tclap
-  eCAL::core_protobuf
+  eCAL::protobuf_core
+  eCAL::string_core
   eCAL::core_pb)
 target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17) 
 

diff --git a/app/mon/mon_plugins/capnproto_reflection/CMakeLists.txt b/app/mon/mon_plugins/capnproto_reflection/CMakeLists.txt
@@ -1,6 +1,6 @@
 # ========================= eCAL LICENSE =================================
 #
-# Copyright (C) 2016 - 2024 Continental Corporation
+# Copyright (C) 2016 - 2025 Continental Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -61,7 +61,7 @@ ecal_add_mon_plugin(${PROJECT_NAME}
 target_link_libraries (${PROJECT_NAME}
   Qt${QT_VERSION_MAJOR}::Core
   Qt${QT_VERSION_MAJOR}::Widgets
-  eCAL::core
+  eCAL::capnproto_core
   CapnProto::capnp
   CustomQt
   eCAL::mon_plugin_lib

diff --git a/app/mon/mon_plugins/protobuf_reflection/CMakeLists.txt b/app/mon/mon_plugins/protobuf_reflection/CMakeLists.txt
@@ -1,6 +1,6 @@
 # ========================= eCAL LICENSE =================================
 #
-# Copyright (C) 2016 - 2024 Continental Corporation
+# Copyright (C) 2016 - 2025 Continental Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -63,7 +63,7 @@ create_targets_protobuf()
 target_link_libraries (${PROJECT_NAME}
   Qt${QT_VERSION_MAJOR}::Core
   Qt${QT_VERSION_MAJOR}::Widgets
-  eCAL::core_protobuf
+  eCAL::protobuf_core
   eCAL::app_pb
   protobuf::libprotobuf
   MonitorTreeView

diff --git a/app/mon/mon_plugins/signals_plotting/CMakeLists.txt b/app/mon/mon_plugins/signals_plotting/CMakeLists.txt
@@ -1,6 +1,6 @@
 # ========================= eCAL LICENSE =================================
 #
-# Copyright (C) 2016 - 2024 Continental Corporation
+# Copyright (C) 2016 - 2025 Continental Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -76,7 +76,7 @@ target_link_libraries (${PROJECT_NAME}
   Qt${QT_VERSION_MAJOR}::Core
   Qt${QT_VERSION_MAJOR}::Widgets
   eCAL::core
-  eCAL::core_protobuf
+  eCAL::protobuf_core
   eCAL::app_pb
   protobuf::libprotobuf
   eCAL::mon_plugin_lib

diff --git a/app/mon/mon_plugins/string_reflection/CMakeLists.txt b/app/mon/mon_plugins/string_reflection/CMakeLists.txt
@@ -1,6 +1,6 @@
 # ========================= eCAL LICENSE =================================
 #
-# Copyright (C) 2016 - 2019 Continental Corporation
+# Copyright (C) 2016 - 2025 Continental Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -58,7 +58,7 @@ create_targets_protobuf()
 target_link_libraries (${PROJECT_NAME}
   Qt${QT_VERSION_MAJOR}::Core
   Qt${QT_VERSION_MAJOR}::Widgets
-  eCAL::core
+  eCAL::string_core
   eCAL::mon_plugin_lib
 )
 target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) 

diff --git a/app/mon/mon_tui/CMakeLists.txt b/app/mon/mon_tui/CMakeLists.txt
@@ -1,6 +1,6 @@
 # ========================= eCAL LICENSE =================================
 #
-# Copyright (C) 2016 - 2019 Continental Corporation
+# Copyright (C) 2016 - 2025 Continental Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -118,7 +118,8 @@ create_targets_protobuf()
 target_link_libraries(${PROJECT_NAME}
   protobuf::libprotobuf
   tclap::tclap
-  eCAL::core_protobuf
+  eCAL::protobuf_core
+  eCAL::string_core
   eCAL::core_pb
   ftxui::screen
   ftxui::dom

diff --git a/app/play/play_core/CMakeLists.txt b/app/play/play_core/CMakeLists.txt
@@ -1,6 +1,6 @@
 # ========================= eCAL LICENSE =================================
 #
-# Copyright (C) 2016 - 2024 Continental Corporation
+# Copyright (C) 2016 - 2025 Continental Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC
   Threads::Threads
   spdlog::spdlog
   protobuf::libprotobuf
-  eCAL::core_protobuf
+  eCAL::protobuf_core
   eCAL::app_pb
   eCAL::ecaltime_pb
   eCAL::hdf5

diff --git a/app/rec/rec_client_core/CMakeLists.txt b/app/rec/rec_client_core/CMakeLists.txt
@@ -1,6 +1,6 @@
 # ========================= eCAL LICENSE =================================
 #
-# Copyright (C) 2016 - 2024 Continental Corporation
+# Copyright (C) 2016 - 2025 Continental Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -94,7 +94,7 @@ target_link_libraries(${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME}
   PUBLIC
     protobuf::libprotobuf
-    eCAL::core_protobuf
+    eCAL::protobuf_core
     eCAL::core_pb
     eCAL::app_pb
   PRIVATE

diff --git a/app/rec/rec_server_core/CMakeLists.txt b/app/rec/rec_server_core/CMakeLists.txt
@@ -1,6 +1,6 @@
 # ========================= eCAL LICENSE =================================
 #
-# Copyright (C) 2016 - 2018 Continental Corporation
+# Copyright (C) 2016 - 2025 Continental Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -68,7 +68,7 @@ target_link_libraries(${PROJECT_NAME}
     PRIVATE
     tinyxml2::tinyxml2
     protobuf::libprotobuf
-    eCAL::core_protobuf
+    eCAL::protobuf_core
     eCAL::app_pb
     ThreadingUtils
     Threads::Threads

diff --git a/app/sys/sys_client_cli/CMakeLists.txt b/app/sys/sys_client_cli/CMakeLists.txt
@@ -1,6 +1,6 @@
 # ========================= eCAL LICENSE =================================
 #
-# Copyright (C) 2016 - 2020 Continental Corporation
+# Copyright (C) 2016 - 2025 Continental Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ target_link_libraries(${PROJECT_NAME}
   spdlog::spdlog
   tclap::tclap
   protobuf::libprotobuf
-  eCAL::core_protobuf
+  eCAL::protobuf_core
   eCAL::core_pb
   eCAL::app_pb
   eCAL::sys_client_core

diff --git a/app/sys/sys_core/CMakeLists.txt b/app/sys/sys_core/CMakeLists.txt
@@ -1,6 +1,6 @@
 # ========================= eCAL LICENSE =================================
 #
-# Copyright (C) 2016 - 2020 Continental Corporation
+# Copyright (C) 2016 - 2025 Continental Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -91,7 +91,7 @@ target_link_libraries(${PROJECT_NAME}
   tinyxml2::tinyxml2
   spdlog::spdlog
   protobuf::libprotobuf
-  eCAL::core_protobuf
+  eCAL::protobuf_core
   eCAL::core_pb
   eCAL::app_pb
   EcalParser

diff --git a/contrib/ecaltime/simtime/CMakeLists.txt b/contrib/ecaltime/simtime/CMakeLists.txt
@@ -1,6 +1,6 @@
 # ========================= eCAL LICENSE =================================
 #
-# Copyright (C) 2016 - 2019 Continental Corporation
+# Copyright (C) 2016 - 2025 Continental Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -45,7 +45,7 @@ ecal_add_time_plugin(${PROJECT_NAME} SHARED ${ecal_time_simtime_src} ${ecal_time
 
 target_compile_definitions(${PROJECT_NAME} PRIVATE ECAL_TIME_PLUGIN_API_EXPORT)
 
-target_link_libraries(${PROJECT_NAME} PRIVATE eCAL::core_protobuf)
+target_link_libraries(${PROJECT_NAME} PRIVATE eCAL::protobuf_core)
 target_link_libraries(${PROJECT_NAME} PRIVATE eCAL::ecaltime_pb)
 
 target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14)

diff --git a/contrib/message/CMakeLists.txt b/contrib/message/CMakeLists.txt
diff --git a/contrib/mma/CMakeLists.txt b/contrib/mma/CMakeLists.txt
@@ -1,6 +1,6 @@
 # ========================= eCAL LICENSE =================================
 #
-# Copyright (C) 2016 - 2019 Continental Corporation
+# Copyright (C) 2016 - 2025 Continental Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -82,7 +82,7 @@ create_targets_protobuf()
 
 target_link_libraries(${PROJECT_NAME}
   Threads::Threads
-  eCAL::core_protobuf
+  eCAL::protobuf_core
   eCAL::app_pb
   $<$<BOOL:${WIN32}>:Pdh>
   $<$<BOOL:${WIN32}>:wbemuuid.lib>)

diff --git a/ecal/CMakeLists.txt b/ecal/CMakeLists.txt
@@ -1,6 +1,6 @@
 # ========================= eCAL LICENSE =================================
 #
-# Copyright (C) 2016 - 2024 Continental Corporation
+# Copyright (C) 2016 - 2025 Continental Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@ set(ECAL_CORE_PROJECT_ROOT ${CMAKE_CURRENT_LIST_DIR})
 add_subdirectory(core)
 
 if(ECAL_CORE_HAS_PROTOBUF)
-  add_subdirectory(msg/protobuf)
   add_subdirectory(core_pb)
 endif()