Skip to content

Commit 8ac6e42

Browse files
elianalfEduPonz
elianalf
authored and
EduPonz
committed
Branch-out for fastdds 3.0.x (#96)
Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
1 parent 57d1c13 commit 8ac6e42

10 files changed

Lines changed: 66 additions & 20 deletions

File tree

‎.github/workflows/test.meta‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"names":
33
{
4-
"fastrtps":
4+
"fastdds":
55
{
66
"cmake-args": [
77
"-DSECURITY=ON"

‎fastdds_python/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ set(CMAKE_SWIG_FLAGS "")
4343
find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
4444

4545
find_package(fastcdr REQUIRED)
46-
find_package(fastrtps 2.12 REQUIRED)
46+
find_package(fastdds 3 REQUIRED)
4747

4848
###############################################################################
4949
# Project subdirectories

‎fastdds_python/colcon.pkg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"name": "fastdds_python",
33
"type": "cmake",
4-
"build-dependencies": ["fastrtps"]
4+
"build-dependencies": ["fastdds"]
55
}

‎fastdds_python/src/swig/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ endif()
5656
target_link_libraries(${PROJECT_NAME}
5757
Python3::Module
5858
fastcdr
59-
fastrtps
59+
fastdds
6060
)
6161

6262
# Find the installation path

‎fastdds_python/src/swig/fastdds.i‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
%include "typemaps.i"
5858

5959
%{
60-
#include "fastrtps/config.h"
60+
#include "fastdds/config.h"
6161

6262
bool has_statistics()
6363
{
@@ -90,7 +90,6 @@ bool has_statistics();
9090
// Macro delcarations
9191
// Any macro used on the Fast DDS header files will give an error if it is not redefined here
9292
#define RTPS_DllAPI
93-
#define FASTRTPS_DEPRECATED(msg)
9493
#define FASTDDS_DEPRECATED_UNTIL(major, entity_name, msg)
9594
#define FASTDDS_TODO_BEFORE(major, minor, msg)
9695

‎fastdds_python/test/api/DEFAULT_FASTDDS_PROFILES.xml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<dds xmlns="http://www.eprosima.com">
3+
<profiles>
4+
<participant profile_name="test_participant_profile">
5+
<domainId>3</domainId>
6+
<rtps>
7+
<name>test_name</name>
8+
</rtps>
9+
</participant>
10+
11+
<publisher profile_name="test_publisher_profile">
12+
<qos>
13+
<partition>
14+
<names>
15+
<name>partition_name_c</name>
16+
</names>
17+
</partition>
18+
</qos>
19+
</publisher>
20+
21+
<subscriber profile_name="test_subscriber_profile">
22+
<qos>
23+
<partition>
24+
<names>
25+
<name>partition_name_b</name>
26+
</names>
27+
</partition>
28+
</qos>
29+
</subscriber>
30+
31+
<publisher profile_name="test_datawriter_profile">
32+
<qos>
33+
<durability>
34+
<kind>VOLATILE</kind>
35+
</durability>
36+
</qos>
37+
</publisher>
38+
39+
<subscriber profile_name="test_datareader_profile">
40+
<qos>
41+
<reliability>
42+
<kind>RELIABLE</kind>
43+
</reliability>
44+
</qos>
45+
</subscriber>
46+
</profiles>
47+
</dds>

‎fastdds_python/test/api/DEFAULT_FASTRTPS_PROFILES.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8" ?>
2-
<dds xmlns="http://www.eprosima.com/XMLSchemas/fastRTPS_Profiles">
2+
<dds xmlns="http://www.eprosima.com">
33
<profiles>
44
<participant profile_name="test_participant_profile">
55
<domainId>3</domainId>

‎fastdds_python/test/types/CMakeLists.txt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ message(STATUS "Configuring python wrapper for types in test_included_modules...
2323
project(test_included_modules)
2424

2525
find_package(fastcdr REQUIRED)
26-
find_package(fastrtps REQUIRED)
26+
find_package(fastdds REQUIRED)
2727

2828
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
2929

@@ -43,7 +43,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC
4343
target_link_libraries(${PROJECT_NAME}
4444
PUBLIC
4545
fastcdr
46-
fastrtps
46+
fastdds
4747
)
4848

4949
###############################################################################
@@ -88,7 +88,7 @@ endif()
8888

8989
target_link_libraries(${${PROJECT_NAME}_MODULE}
9090
Python3::Module
91-
fastrtps
91+
fastdds
9292
${PROJECT_NAME}
9393
)
9494

@@ -131,7 +131,7 @@ message(STATUS "Configuring python wrapper for types in test_modules...")
131131
project(test_modules)
132132

133133
find_package(fastcdr REQUIRED)
134-
find_package(fastrtps REQUIRED)
134+
find_package(fastdds REQUIRED)
135135

136136
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
137137

@@ -151,7 +151,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC
151151
target_link_libraries(${PROJECT_NAME}
152152
PUBLIC
153153
fastcdr
154-
fastrtps
154+
fastdds
155155
)
156156

157157
###############################################################################
@@ -196,7 +196,7 @@ endif()
196196

197197
target_link_libraries(${${PROJECT_NAME}_MODULE}
198198
Python3::Module
199-
fastrtps
199+
fastdds
200200
${PROJECT_NAME}
201201
)
202202

@@ -239,7 +239,7 @@ message(STATUS "Configuring python wrapper for types in test_complete...")
239239
project(test_complete)
240240

241241
find_package(fastcdr REQUIRED)
242-
find_package(fastrtps REQUIRED)
242+
find_package(fastdds REQUIRED)
243243

244244
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
245245

@@ -259,7 +259,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC
259259
target_link_libraries(${PROJECT_NAME}
260260
PUBLIC
261261
fastcdr
262-
fastrtps
262+
fastdds
263263
test_included_modules
264264
)
265265

@@ -305,7 +305,7 @@ endif()
305305

306306
target_link_libraries(${${PROJECT_NAME}_MODULE}
307307
Python3::Module
308-
fastrtps
308+
fastdds
309309
${PROJECT_NAME}
310310
)
311311

‎fastdds_python_examples/HelloWorldExample/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ message(STATUS "Configuring python wrapper for types in HelloWorld...")
2323
project(HelloWorld)
2424

2525
find_package(fastcdr REQUIRED)
26-
find_package(fastrtps REQUIRED)
26+
find_package(fastdds REQUIRED)
2727

2828
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
2929

@@ -43,7 +43,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC
4343
target_link_libraries(${PROJECT_NAME}
4444
PUBLIC
4545
fastcdr
46-
fastrtps
46+
fastdds
4747
)
4848

4949
###############################################################################
@@ -88,7 +88,7 @@ endif()
8888

8989
target_link_libraries(${${PROJECT_NAME}_MODULE}
9090
Python3::Module
91-
fastrtps
91+
fastdds
9292
${PROJECT_NAME}
9393
)
9494

‎fastdds_python_examples/colcon.pkg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"build-dependencies": [
55
"fastdds_python",
66
"fastcdr",
7-
"fastrtps"
7+
"fastdds"
88
]
99
}

0 commit comments

Comments
 (0)