Branch-out for fastdds 3.0.x

Signed-off-by: elianalf <[email protected]>
eProsima · Feb 21, 2024 · fae2801 · fae2801
1 parent 0c8ebde
commit fae2801
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 20 deletions.
diff --git a/.github/workflows/test.meta b/.github/workflows/test.meta
@@ -1,7 +1,7 @@
 {
     "names":
     {
-        "fastrtps":
+        "fastdds":
         {
             "cmake-args": [
                 "-DSECURITY=ON"

diff --git a/fastdds_python/CMakeLists.txt b/fastdds_python/CMakeLists.txt
@@ -43,7 +43,7 @@ set(CMAKE_SWIG_FLAGS "")
 find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
 
 find_package(fastcdr REQUIRED)
-find_package(fastrtps 2.12 REQUIRED)
+find_package(fastdds 3 REQUIRED)
 
 ###############################################################################
 # Project subdirectories

diff --git a/fastdds_python/colcon.pkg b/fastdds_python/colcon.pkg
@@ -1,5 +1,5 @@
 {
     "name": "fastdds_python",
     "type": "cmake",
-    "build-dependencies": ["fastrtps"]
+    "build-dependencies": ["fastdds"]
 }
diff --git a/fastdds_python/src/swig/CMakeLists.txt b/fastdds_python/src/swig/CMakeLists.txt
@@ -56,7 +56,7 @@ endif()
 target_link_libraries(${PROJECT_NAME}
     Python3::Module
     fastcdr
-    fastrtps
+    fastdds
     )
 
 # Find the installation path

diff --git a/fastdds_python/src/swig/fastdds.i b/fastdds_python/src/swig/fastdds.i
@@ -57,7 +57,7 @@
 %include "typemaps.i"
 
 %{
-#include "fastrtps/config.h"
+#include "fastdds/config.h"
 
 bool has_statistics()
 {
@@ -90,7 +90,6 @@ bool has_statistics();
 // Macro delcarations
 // Any macro used on the Fast DDS header files will give an error if it is not redefined here
 #define RTPS_DllAPI
-#define FASTRTPS_DEPRECATED(msg)
 #define FASTDDS_DEPRECATED_UNTIL(major, entity_name, msg)
 #define FASTDDS_TODO_BEFORE(major, minor, msg)
 

diff --git a/fastdds_python/test/api/DEFAULT_FASTRTPS_PROFILES.xml b/fastdds_python/test/api/DEFAULT_FASTRTPS_PROFILES.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"  ?>
-<dds xmlns="http://www.eprosima.com/XMLSchemas/fastRTPS_Profiles">
+<dds xmlns="http://www.eprosima.com">
     <profiles>
         <participant profile_name="test_participant_profile">
             <domainId>3</domainId>

diff --git a/fastdds_python/test/types/CMakeLists.txt b/fastdds_python/test/types/CMakeLists.txt
@@ -23,7 +23,7 @@ message(STATUS "Configuring python wrapper for types in test_included_modules...
 project(test_included_modules)
 
 find_package(fastcdr REQUIRED)
-find_package(fastrtps REQUIRED)
+find_package(fastdds REQUIRED)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
@@ -43,7 +43,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC
 target_link_libraries(${PROJECT_NAME}
     PUBLIC
     fastcdr
-    fastrtps
+    fastdds
     )
 
 ###############################################################################
@@ -88,7 +88,7 @@ endif()
 
 target_link_libraries(${${PROJECT_NAME}_MODULE}
     Python3::Module
-    fastrtps
+    fastdds
     ${PROJECT_NAME}
     )
 
@@ -131,7 +131,7 @@ message(STATUS "Configuring python wrapper for types in test_modules...")
 project(test_modules)
 
 find_package(fastcdr REQUIRED)
-find_package(fastrtps REQUIRED)
+find_package(fastdds REQUIRED)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
@@ -151,7 +151,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC
 target_link_libraries(${PROJECT_NAME}
     PUBLIC
     fastcdr
-    fastrtps
+    fastdds
     )
 
 ###############################################################################
@@ -196,7 +196,7 @@ endif()
 
 target_link_libraries(${${PROJECT_NAME}_MODULE}
     Python3::Module
-    fastrtps
+    fastdds
     ${PROJECT_NAME}
     )
 
@@ -239,7 +239,7 @@ message(STATUS "Configuring python wrapper for types in test_complete...")
 project(test_complete)
 
 find_package(fastcdr REQUIRED)
-find_package(fastrtps REQUIRED)
+find_package(fastdds REQUIRED)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
@@ -259,7 +259,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC
 target_link_libraries(${PROJECT_NAME}
     PUBLIC
     fastcdr
-    fastrtps
+    fastdds
     test_included_modules
     )
 
@@ -305,7 +305,7 @@ endif()
 
 target_link_libraries(${${PROJECT_NAME}_MODULE}
     Python3::Module
-    fastrtps
+    fastdds
     ${PROJECT_NAME}
     )
 

diff --git a/fastdds_python_examples/HelloWorldExample/CMakeLists.txt b/fastdds_python_examples/HelloWorldExample/CMakeLists.txt
@@ -23,7 +23,7 @@ message(STATUS "Configuring python wrapper for types in HelloWorld...")
 project(HelloWorld)
 
 find_package(fastcdr REQUIRED)
-find_package(fastrtps REQUIRED)
+find_package(fastdds REQUIRED)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
@@ -43,7 +43,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC
 target_link_libraries(${PROJECT_NAME}
     PUBLIC
     fastcdr
-    fastrtps
+    fastdds
     )
 
 ###############################################################################
@@ -88,7 +88,7 @@ endif()
 
 target_link_libraries(${${PROJECT_NAME}_MODULE}
     Python3::Module
-    fastrtps
+    fastdds
     ${PROJECT_NAME}
     )
 

diff --git a/fastdds_python_examples/colcon.pkg b/fastdds_python_examples/colcon.pkg
@@ -4,6 +4,6 @@
     "build-dependencies": [
         "fastdds_python",
         "fastcdr",
-        "fastrtps"
+        "fastdds"
     ]
 }