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

[fastrtps] Update to 2.14.0 #38637

Merged
merged 6 commits into from
May 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions ports/fastrtps/fix-xtime.patch

This file was deleted.

40 changes: 0 additions & 40 deletions ports/fastrtps/fix_thread.patch

This file was deleted.

38 changes: 18 additions & 20 deletions ports/fastrtps/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,30 +1,28 @@
# https://github.com/eProsima/Fast-DDS/pull/3983
# Could remove after 2.6.6/2.10.2/2.11.2, other minor versions not applied
# Could remove after 2.13 released, or any newer mijor versions
vcpkg_download_distfile(
PR_3983_PATCH
URLS https://github.com/eProsima/Fast-DDS/commit/2601e95429f5676c47c25200e995fb93157e7815.patch?full_index=1
SHA512 440ee6a918d7085b6520613fad1482a9b833ee259e64c8919bdeb43277f3685362e6314380bafc6c51dad46fd16a9b415343e9db28f157d13f76b9af0cb21e8d
FILENAME fastrtps-2601e95429f5676c47c25200e995fb93157e7815.patch
)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO eProsima/Fast-DDS
REF v2.7.0
SHA512 289c94fb177209ffc80e93ae61822c83e7cb74ba7682f05a921c50ce048498bd811c19825d1fdb8af39b29a64904e96d87c5c59468139f0d8bb528549b80c94a
REF v2.14.0
SHA512 cf3628ac7598c83f09e3975de9fb59e868797adc331d7b4a226c38c0bbd1f7ce15deeb7cedee938a86a68426585e0b5646a84f40705c9a04553b7e37f20b2a4d
HEAD_REF master
PATCHES
fix-find-package-asio.patch
disable-symlink.patch
fix-xtime.patch
fix_thread.patch #https://github.com/eProsima/Fast-DDS/pull/3904
"${PR_3983_PATCH}"
)

set(extra_opts "")
if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
# when cross-compiling, try_run will not work.
set(extra_opts
-DSM_RUN_RESULT=TRUE
-DSM_RUN_RESULT__TRYRUN_OUTPUT=
)
endif()

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
DISABLE_PARALLEL_CONFIGURE # due to fix-xtime.patch
OPTIONS
${extra_opts}
)

vcpkg_cmake_install()
Expand All @@ -34,13 +32,13 @@ vcpkg_cmake_config_fixup(CONFIG_PATH share/fastrtps/cmake)

if(VCPKG_TARGET_IS_WINDOWS)
# copy tools from "bin" to "tools" folder
foreach(TOOL "fast-discovery-server-1.0.0.exe" "fast-discovery-server.bat" "fastdds.bat" "ros-discovery.bat")
foreach(TOOL "fast-discovery-server-1.0.1.exe" "fast-discovery-server.bat" "fastdds.bat" "ros-discovery.bat")
file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/${TOOL}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/${TOOL}")
endforeach()

# remove tools from debug builds
foreach(TOOL "fast-discovery-serverd-1.0.0.exe" "fast-discovery-server.bat" "fastdds.bat" "ros-discovery.bat")
foreach(TOOL "fast-discovery-serverd-1.0.1.exe" "fast-discovery-server.bat" "fastdds.bat" "ros-discovery.bat")
if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL}")
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL}")
endif()
Expand All @@ -53,17 +51,17 @@ if(VCPKG_TARGET_IS_WINDOWS)
vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}")
elseif(VCPKG_TARGET_IS_LINUX)
# copy tools from "bin" to "tools" folder
foreach(TOOL "fast-discovery-server-1.0.0" "fast-discovery-server" "fastdds" "ros-discovery")
foreach(TOOL "fast-discovery-server-1.0.1" "fast-discovery-server" "fastdds" "ros-discovery")
file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/${TOOL}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/${TOOL}")
endforeach()

# replace symlink by a copy because symlinks do not work well together with vcpkg binary caching
file(REMOVE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/fast-discovery-server")
file(INSTALL "${CURRENT_PACKAGES_DIR}/tools/${PORT}/fast-discovery-server-1.0.0" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}" RENAME "fast-discovery-server")
file(INSTALL "${CURRENT_PACKAGES_DIR}/tools/${PORT}/fast-discovery-server-1.0.1" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}" RENAME "fast-discovery-server")

# remove tools from debug builds
foreach(TOOL "fast-discovery-serverd-1.0.0" "fast-discovery-server" "fastdds" "ros-discovery")
foreach(TOOL "fast-discovery-serverd-1.0.1" "fast-discovery-server" "fastdds" "ros-discovery")
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL}")
endforeach()

Expand Down
5 changes: 2 additions & 3 deletions ports/fastrtps/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"name": "fastrtps",
"version": "2.7.0",
"port-version": 5,
"description": "Eprosima Fast RTPS is a C++ implementation of the RTPS (Real Time Publish Subscribe) protocol, which provides publisher-subscriber communications over unreliable transports such as UDP, as defined and maintained by the Object Management Group (OMG) consortium.",
"version": "2.14.0",
"description": "eprosima Fast DDS (formerly Fast RTPS) is a C++ implementation of the DDS (Data Distribution Service) standard of the OMG (Object Management Group). eProsima Fast DDS implements the RTPS (Real Time Publish Subscribe) protocol, which provides publisher-subscriber communications over unreliable transports such as UDP, as defined and maintained by the Object Management Group (OMG) consortium.",
"homepage": "https://www.eprosima.com/",
"license": "Apache-2.0",
"supports": "!uwp",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -2649,8 +2649,8 @@
"port-version": 1
},
"fastrtps": {
"baseline": "2.7.0",
"port-version": 5
"baseline": "2.14.0",
"port-version": 0
},
"faudio": {
"baseline": "24.03",
Expand Down
5 changes: 5 additions & 0 deletions versions/f-/fastrtps.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3ca79d1102948e72e1383c2aac8b5069932c790d",
"version": "2.14.0",
"port-version": 0
},
{
"git-tree": "e60f3fa00c69cc283d5ba48b642abdd8464c49f8",
"version": "2.7.0",
Expand Down