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.

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

Add support for FastDDS versions earlier than 2.13 #82

Merged
merged 7 commits into from
Jan 23, 2024

Conversation

irenebm
Copy link
Member

@irenebm irenebm commented Jan 10, 2024

@codecov-commenter
Copy link

codecov-commenter commented Jan 11, 2024

Codecov Report

Attention: 4 lines in your changes are missing coverage. Please review.

Comparison is base (16b1acb) 36.78% compared to head (dfcb11c) 36.78%.

Files Patch % Lines
...e_participants/src/cpp/reader/dds/CommonReader.cpp 25.00% 0 Missing and 3 partials ⚠️
...e_participants/src/cpp/writer/dds/CommonWriter.cpp 75.00% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##             main      #82   +/-   ##
=======================================
  Coverage   36.78%   36.78%           
=======================================
  Files         116      116           
  Lines        4975     4983    +8     
  Branches     1909     1913    +4     
=======================================
+ Hits         1830     1833    +3     
  Misses       2332     2332           
- Partials      813      818    +5     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: Irene Bandera <irenebandera@eprosima.com>
@irenebm irenebm force-pushed the feature/support_fast_versions branch from cf6dbf8 to 9e6d5aa Compare January 11, 2024 16:40
@irenebm irenebm marked this pull request as ready for review January 11, 2024 16:42
@rsanchez15 rsanchez15 self-requested a review January 12, 2024 07:17
Signed-off-by: Irene Bandera <irenebandera@eprosima.com>
ddspipe_core/CMakeLists.txt Outdated Show resolved Hide resolved
ddspipe_participants/src/cpp/reader/dds/CommonReader.cpp Outdated Show resolved Hide resolved
ddspipe_participants/src/cpp/writer/dds/CommonWriter.cpp Outdated Show resolved Hide resolved
ddspipe_core/CMakeLists.txt Outdated Show resolved Hide resolved
Signed-off-by: Irene Bandera <irenebandera@eprosima.com>
Signed-off-by: Irene Bandera <irenebandera@eprosima.com>
Signed-off-by: Irene Bandera <irenebandera@eprosima.com>
Signed-off-by: Irene Bandera <irenebandera@eprosima.com>
@irenebm irenebm force-pushed the feature/support_fast_versions branch from 36c1a02 to 9253fc5 Compare January 22, 2024 07:46
Comment on lines 76 to 78
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/")

Comment on lines 81 to 86
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.

Signed-off-by: Irene Bandera <irenebandera@eprosima.com>
Copy link
Contributor

@rsanchez15 rsanchez15 left a comment

Choose a reason for hiding this comment

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

LGTM 🚀

@rsanchez15 rsanchez15 merged commit 3b41d0d into main Jan 23, 2024
45 of 46 checks passed
@rsanchez15 rsanchez15 deleted the feature/support_fast_versions branch January 23, 2024 09:48
Tempate pushed a commit that referenced this pull request Mar 8, 2024
* Add support for FastDDS versions earlier than 2.13

Signed-off-by: Irene Bandera <irenebandera@eprosima.com>

* FASTDDS_SUBDIRECTORY -> DDS_TYPES_VERSION

Signed-off-by: Irene Bandera <irenebandera@eprosima.com>

* Apply changes

Signed-off-by: Irene Bandera <irenebandera@eprosima.com>

* Correct function names

Signed-off-by: Irene Bandera <irenebandera@eprosima.com>

* Update FASTRTPS version check in CommonReader and CommonWriter

Signed-off-by: Irene Bandera <irenebandera@eprosima.com>

* Uncrustify

Signed-off-by: Irene Bandera <irenebandera@eprosima.com>

* Compile test libraries in ddspipe_core

Signed-off-by: Irene Bandera <irenebandera@eprosima.com>

---------

Signed-off-by: Irene Bandera <irenebandera@eprosima.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants