Skip to content

Commit 4e79984

Browse files
elianalfrichiware
authored andcommitted
Branch-out for fastdds v3.0.0 (#660)
* Branch-out and change dependencies Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #20370: Remove FASTRTPS_API_TESTS and GTEST_INDIVIDUAL Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #20370: Rename FASTRTPS_DEFAULT_PROFILES_FILE Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #20370: Update CodeTester.cpp file and APIs Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #20370: Update APIs in DDSCodeTester.cpp Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #20370: fix malformed table issue Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #20370: fix xml name issue Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #20370: Rename namespace in xml files Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #20370: Apply suggestions Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> --------- Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
1 parent 5de1a15 commit 4e79984

35 files changed

Lines changed: 252 additions & 1159 deletions

.github/workflows/mirror.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
dest_branch:
15-
- '2.14.x'
15+
- '3.0.x'
1616
steps:
1717
- name: Mirror action step
1818
id: mirror

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ project(fastdds-docs VERSION "${LIB_VERSION_STR}" LANGUAGES C CXX)
3838
# * Generating the doxygen XML files that are then used for the API reference
3939
# * Documentation tests applications
4040
# It is required that Fast DDS is built with -DSECURITY=ON
41-
find_package(fastrtps REQUIRED)
42-
get_target_property(FAST_INCLUDE_DIR fastrtps INTERFACE_INCLUDE_DIRECTORIES)
41+
find_package(fastdds REQUIRED)
42+
get_target_property(FAST_INCLUDE_DIR fastdds INTERFACE_INCLUDE_DIRECTORIES)
4343

4444
message(STATUS "Fast DDS include directories: ${FAST_INCLUDE_DIR}")
4545
file(GLOB_RECURSE HPP_FILES "${FAST_INCLUDE_DIR}/fastdds/**/*.h*")

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ building tools.
114114
mkdir -p <path_to_ws>/fastdds-docs_ws/src
115115
cd <path_to_ws>/fastdds-docs_ws
116116
wget https://raw.githubusercontent.com/eProsima/Fast-DDS-docs/<version>/colcon.meta
117-
wget https://raw.githubusercontent.com/eProsima/Fast-DDS/<version>/fastrtps.repos
118-
vcs import src < fastrtps.repos
117+
wget https://raw.githubusercontent.com/eProsima/Fast-DDS/<version>/fastdds.repos
118+
vcs import src < fastdds.repos
119119
cd src
120120
git clone https://github.com/eProsima/Fast-DDS-docs fastdds-docs
121121
```

code/CMakeLists.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ add_subdirectory(Examples/C++/DDSHelloWorld)
5656
# CodeTester utilizes Fast RTPS API
5757
add_executable(doctest CodeTester.cpp)
5858
target_include_directories(doctest PRIVATE ${FAST_INCLUDE_DIR})
59-
target_link_libraries(doctest fastrtps)
59+
target_link_libraries(doctest fastdds)
6060

6161
# DDSCodeTester utilizes Fast DDS API
6262
add_executable(dds-doctest DDSCodeTester.cpp FastDDSGenCodeTester.cpp)
6363
target_include_directories(dds-doctest PRIVATE ${FAST_INCLUDE_DIR})
64-
target_link_libraries(dds-doctest fastrtps fastcdr)
64+
target_link_libraries(dds-doctest fastdds fastcdr)
6565

6666
####################################################################################################
6767
# Add tests
@@ -101,11 +101,11 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/helloworld_test.py
101101
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/grep.py
102102
${CMAKE_CURRENT_BINARY_DIR}/grep.py COPYONLY)
103103

104-
configure_file(${FAST_INCLUDE_DIR}/../share/fastRTPS_profiles.xsd
105-
${CMAKE_CURRENT_BINARY_DIR}/fastRTPS_profiles.xsd COPYONLY)
104+
configure_file(${FAST_INCLUDE_DIR}/../share/fastdds_profiles.xsd
105+
${CMAKE_CURRENT_BINARY_DIR}/fastdds_profiles.xsd COPYONLY)
106106

107107
# Check validity of Permissions and Governance XML files using Fast RTPS API
108-
add_test(NAME xml.fastrtps_permissions_test
108+
add_test(NAME xml.rtps_permissions_test
109109
COMMAND doctest
110110
"file://${CMAKE_CURRENT_BINARY_DIR}/certs/maincacert.pem"
111111
"file://${CMAKE_CURRENT_BINARY_DIR}/certs/appcert.pem"
@@ -118,9 +118,9 @@ add_test(NAME xml.profiles COMMAND dds-doctest XMLTester.xml)
118118
# Check validity of XML full example
119119
add_test(NAME xml.example COMMAND dds-doctest XMLTesterExample.xml)
120120
# Validate XML full example against XSD schema
121-
add_test(NAME xml.validate COMMAND fastdds xml validate XMLTesterExample.xml -x fastRTPS_profiles.xsd)
121+
add_test(NAME xml.validate COMMAND fastdds xml validate XMLTesterExample.xml -x fastdds_profiles.xsd)
122122
# Validate XML snippets doc against XSD schema
123-
add_test(NAME xml.snippets COMMAND fastdds xml validate XMLTester.xml -x fastRTPS_profiles.xsd)
123+
add_test(NAME xml.snippets COMMAND fastdds xml validate XMLTester.xml -x fastdds_profiles.xsd)
124124
# Check validity of Permissions and Governance XML files using Fast DDS API
125125
add_test(NAME xml.fastdds_permissions_test
126126
COMMAND dds-doctest

0 commit comments

Comments
 (0)