Skip to content

Commit

Permalink
Branch-out for fastdds v3.0.0 (#660)
Browse files Browse the repository at this point in the history
* 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: adriancampo <adriancampo@eprosima.com>
  • Loading branch information
elianalf authored and adriancampo committed Mar 17, 2024
1 parent b95cc4a commit 3b5a6a8
Show file tree
Hide file tree
Showing 35 changed files with 252 additions and 1,159 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/mirror.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
fail-fast: false
matrix:
dest_branch:
- '2.14.x'
- '3.0.x'
steps:
- name: Mirror action step
id: mirror
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ project(fastdds-docs VERSION "${LIB_VERSION_STR}" LANGUAGES C CXX)
# * Generating the doxygen XML files that are then used for the API reference
# * Documentation tests applications
# It is required that Fast DDS is built with -DSECURITY=ON
find_package(fastrtps REQUIRED)
get_target_property(FAST_INCLUDE_DIR fastrtps INTERFACE_INCLUDE_DIRECTORIES)
find_package(fastdds REQUIRED)
get_target_property(FAST_INCLUDE_DIR fastdds INTERFACE_INCLUDE_DIRECTORIES)

message(STATUS "Fast DDS include directories: ${FAST_INCLUDE_DIR}")
file(GLOB_RECURSE HPP_FILES "${FAST_INCLUDE_DIR}/fastdds/**/*.h*")
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ building tools.
mkdir -p <path_to_ws>/fastdds-docs_ws/src
cd <path_to_ws>/fastdds-docs_ws
wget https://raw.githubusercontent.com/eProsima/Fast-DDS-docs/<version>/colcon.meta
wget https://raw.githubusercontent.com/eProsima/Fast-DDS/<version>/fastrtps.repos
vcs import src < fastrtps.repos
wget https://raw.githubusercontent.com/eProsima/Fast-DDS/<version>/fastdds.repos
vcs import src < fastdds.repos
cd src
git clone https://github.com/eProsima/Fast-DDS-docs fastdds-docs
```
Expand Down
14 changes: 7 additions & 7 deletions code/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ add_subdirectory(Examples/C++/DDSHelloWorld)
# CodeTester utilizes Fast RTPS API
add_executable(doctest CodeTester.cpp)
target_include_directories(doctest PRIVATE ${FAST_INCLUDE_DIR})
target_link_libraries(doctest fastrtps)
target_link_libraries(doctest fastdds)

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

####################################################################################################
# Add tests
Expand Down Expand Up @@ -101,11 +101,11 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/helloworld_test.py
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/grep.py
${CMAKE_CURRENT_BINARY_DIR}/grep.py COPYONLY)

configure_file(${FAST_INCLUDE_DIR}/../share/fastRTPS_profiles.xsd
${CMAKE_CURRENT_BINARY_DIR}/fastRTPS_profiles.xsd COPYONLY)
configure_file(${FAST_INCLUDE_DIR}/../share/fastdds_profiles.xsd
${CMAKE_CURRENT_BINARY_DIR}/fastdds_profiles.xsd COPYONLY)

# Check validity of Permissions and Governance XML files using Fast RTPS API
add_test(NAME xml.fastrtps_permissions_test
add_test(NAME xml.rtps_permissions_test
COMMAND doctest
"file://${CMAKE_CURRENT_BINARY_DIR}/certs/maincacert.pem"
"file://${CMAKE_CURRENT_BINARY_DIR}/certs/appcert.pem"
Expand All @@ -118,9 +118,9 @@ add_test(NAME xml.profiles COMMAND dds-doctest XMLTester.xml)
# Check validity of XML full example
add_test(NAME xml.example COMMAND dds-doctest XMLTesterExample.xml)
# Validate XML full example against XSD schema
add_test(NAME xml.validate COMMAND fastdds xml validate XMLTesterExample.xml -x fastRTPS_profiles.xsd)
add_test(NAME xml.validate COMMAND fastdds xml validate XMLTesterExample.xml -x fastdds_profiles.xsd)
# Validate XML snippets doc against XSD schema
add_test(NAME xml.snippets COMMAND fastdds xml validate XMLTester.xml -x fastRTPS_profiles.xsd)
add_test(NAME xml.snippets COMMAND fastdds xml validate XMLTester.xml -x fastdds_profiles.xsd)
# Check validity of Permissions and Governance XML files using Fast DDS API
add_test(NAME xml.fastdds_permissions_test
COMMAND dds-doctest
Expand Down
Loading

0 comments on commit 3b5a6a8

Please sign in to comment.