Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for FastDDS versions earlier than 2.13 #82

Merged
merged 7 commits into from
Jan 23, 2024
Merged

Add support for FastDDS versions earlier than 2.13 #82

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9e6d5aa
Add support for FastDDS versions earlier than 2.13
irenebm Jan 10, 2024
95ba5ac
FASTDDS_SUBDIRECTORY -> DDS_TYPES_VERSION
irenebm Jan 12, 2024
a4b5e49
Apply changes
irenebm Jan 17, 2024
5dcfd24
Correct function names
irenebm Jan 17, 2024
4c0071e
Update FASTRTPS version check in CommonReader and CommonWriter
irenebm Jan 19, 2024
9253fc5
Uncrustify
irenebm Jan 19, 2024
dfcb11c
Compile test libraries in ddspipe_core
irenebm Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions ddspipe_core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,20 @@ compile_library(
# Test
###############################################################################
# Compile tests if CMake options requires it
compile_test_library(
"${PROJECT_SOURCE_DIR}/test" # Test directory
)

# Determine Fast DDS version
if ("${fastrtps_VERSION}" VERSION_LESS 2.13)
rsanchez15 marked this conversation as resolved.
Show resolved Hide resolved
set(DDS_TYPES_VERSION "/v2/")
else()
set(DDS_TYPES_VERSION "/v1/")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
set(DDS_TYPES_VERSION "/v2/")
else()
set(DDS_TYPES_VERSION "/v1/")
set(DDS_TYPES_VERSION "/v1/")
else()
set(DDS_TYPES_VERSION "/v2/")

endif()

file(GLOB_RECURSE TEST_FILES "${PROJECT_SOURCE_DIR}/test/")
foreach(TEST_FILE ${TEST_FILES})
if(NOT TEST_FILE MATCHES ${DDS_TYPES_VERSION})
compile_test_library(${TEST_FILE})
endif()
endforeach()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has the same issue as we already resolved for the router. You are setting test files while the function request the path to tests.


###############################################################################
# Packaging
Expand Down
2 changes: 1 addition & 1 deletion ddspipe_core/project_settings.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ set(MODULE_FIND_PACKAGES
cpp_utils
)

set(fastrtps_MINIMUM_VERSION "2.8")
set(fastrtps_MINIMUM_VERSION "2.10")

set(MODULE_DEPENDENCIES
$<$<BOOL:${WIN32}>:iphlpapi$<SEMICOLON>Shlwapi>
Expand Down
15 changes: 11 additions & 4 deletions ddspipe_core/test/unittest/types/dynamic_types/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,15 @@

set(TEST_NAME dtypes_idl_tests)

# Determine Fast DDS version
if ("${fastrtps_VERSION}" VERSION_LESS 2.13)
set(DDS_TYPES_VERSION "v1")
else()
set(DDS_TYPES_VERSION "v2")
endif()

# Add to test sources every FastDDSGen file generated
file(GLOB DATATYPE_SOURCES_CXX "types/**/*.cxx")
file(GLOB DATATYPE_SOURCES_CXX "types/${DDS_TYPES_VERSION}/**/*.cxx")
set(TEST_SOURCES
dtypes_idl_tests.cpp
${PROJECT_SOURCE_DIR}/src/cpp/types/dynamic_types/schema_idl.cpp
Expand All @@ -42,7 +49,7 @@ file(
RESULT_SOURCES_IDL
RELATIVE
"${CMAKE_CURRENT_SOURCE_DIR}"
"types/idls/*.idl")
"types/${DDS_TYPES_VERSION}/idls/*.idl")

set(TEST_NEEDED_SOURCES
${RESULT_SOURCES_IDL}
Expand All @@ -63,7 +70,7 @@ add_unittest_executable(
set(TEST_NAME dtypes_msg_tests)

# Add to test sources every FastDDSGen file generated
file(GLOB DATATYPE_SOURCES_CXX "types/**/*.cxx")
file(GLOB DATATYPE_SOURCES_CXX "types/${DDS_TYPES_VERSION}/**/*.cxx")
set(TEST_SOURCES
dtypes_msg_tests.cpp
${PROJECT_SOURCE_DIR}/src/cpp/types/dynamic_types/schema_msg.cpp
Expand All @@ -86,7 +93,7 @@ file(
RESULT_SOURCES_MSG
RELATIVE
"${CMAKE_CURRENT_SOURCE_DIR}"
"types/msgs/*.msg")
"types/${DDS_TYPES_VERSION}/msgs/*.msg")

set(TEST_NEEDED_SOURCES
${RESULT_SOURCES_MSG}
Expand Down
12 changes: 10 additions & 2 deletions ddspipe_core/test/unittest/types/dynamic_types/dtypes_idl_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@

#include <ddspipe_core/types/dynamic_types/schema.hpp>

#include "types/all_types.hpp"
#if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
#include "types/v1/all_types.hpp"
#else
#include "types/v2/all_types.hpp"
#endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13

using namespace eprosima;

Expand All @@ -39,7 +43,11 @@ std::string read_idl_from_file_(
std::string file_name_by_type(
SupportedType type)
{
return std::string("types/idls/") + to_string(type) + ".idl";
#if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
return std::string("types/v1/idls/") + to_string(type) + ".idl";
#else
return std::string("types/v2/idls/") + to_string(type) + ".idl";
#endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
}

void compare_schemas(
Expand Down
12 changes: 10 additions & 2 deletions ddspipe_core/test/unittest/types/dynamic_types/dtypes_msg_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@
#include <cpp_utils/file/file_utils.hpp>
#include <fastrtps/types/DynamicTypePtr.h>
#include <ddspipe_core/types/dynamic_types/schema.hpp>
#include "types/all_types.hpp"
#if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
#include "types/v1/all_types.hpp"
#else
#include "types/v2/all_types.hpp"
#endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13

using namespace eprosima;

Expand All @@ -34,7 +38,11 @@ std::string read_msg_from_file_(
std::string file_name_by_type(
SupportedType type)
{
return std::string("types/msgs/") + to_string(type) + ".msg";
#if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
return std::string("types/v1/msgs/") + to_string(type) + ".msg";
#else
return std::string("types/v2/msgs/") + to_string(type) + ".msg";
#endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
}

void compare_schemas(
Expand Down
0 ...t/types/dynamic_types/types/all_types.hpp → ...ypes/dynamic_types/types/v1/all_types.hpp
View file
Open in desktop
File renamed without changes.
0 ...types/types/idls/arrays_and_sequences.idl → ...es/types/v1/idls/arrays_and_sequences.idl
View file
Open in desktop
File renamed without changes.
0 ...c_types/types/idls/basic_array_struct.idl → ...ypes/types/v1/idls/basic_array_struct.idl
View file
Open in desktop
File renamed without changes.
0 ...dynamic_types/types/idls/basic_struct.idl → ...amic_types/types/v1/idls/basic_struct.idl
View file
Open in desktop
File renamed without changes.
0 ...ynamic_types/types/idls/char_sequence.idl → ...mic_types/types/v1/idls/char_sequence.idl
View file
Open in desktop
File renamed without changes.
0 ...ypes/types/idls/complex_nested_arrays.idl → ...s/types/v1/idls/complex_nested_arrays.idl
View file
Open in desktop
File renamed without changes.
0 .../dynamic_types/types/idls/enum_struct.idl → ...namic_types/types/v1/idls/enum_struct.idl
View file
Open in desktop
File renamed without changes.
0 ...pes/types/idls/float_bounded_sequence.idl → .../types/v1/idls/float_bounded_sequence.idl
View file
Open in desktop
File renamed without changes.
0 .../dynamic_types/types/idls/hello_world.idl → ...namic_types/types/v1/idls/hello_world.idl
View file
Open in desktop
File renamed without changes.
0 ...s/dynamic_types/types/idls/map_struct.idl → ...ynamic_types/types/v1/idls/map_struct.idl
View file
Open in desktop
File renamed without changes.
0 ...ynamic_types/types/idls/numeric_array.idl → ...mic_types/types/v1/idls/numeric_array.idl
View file
Open in desktop
File renamed without changes.
0 ...dynamic_types/types/idls/union_struct.idl → ...amic_types/types/v1/idls/union_struct.idl
View file
Open in desktop
File renamed without changes.
0 ...types/types/msgs/arrays_and_sequences.msg → ...es/types/v1/msgs/arrays_and_sequences.msg
View file
Open in desktop
File renamed without changes.
0 ...c_types/types/msgs/basic_array_struct.msg → ...ypes/types/v1/msgs/basic_array_struct.msg
View file
Open in desktop
File renamed without changes.
0 ...dynamic_types/types/msgs/basic_struct.msg → ...amic_types/types/v1/msgs/basic_struct.msg
View file
Open in desktop
File renamed without changes.
0 ...ynamic_types/types/msgs/char_sequence.msg → ...mic_types/types/v1/msgs/char_sequence.msg
View file
Open in desktop
File renamed without changes.
0 ...ypes/types/msgs/complex_nested_arrays.msg → ...s/types/v1/msgs/complex_nested_arrays.msg
View file
Open in desktop
File renamed without changes.
0 ...pes/types/msgs/float_bounded_sequence.msg → .../types/v1/msgs/float_bounded_sequence.msg
View file
Open in desktop
File renamed without changes.
0 .../dynamic_types/types/msgs/hello_world.msg → ...namic_types/types/v1/msgs/hello_world.msg
View file
Open in desktop
File renamed without changes.
0 ...ynamic_types/types/msgs/numeric_array.msg → ...mic_types/types/v1/msgs/numeric_array.msg
View file
Open in desktop
File renamed without changes.
Loading
Loading