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.

Sign up for GitHub

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

Drop ROS 1 support in YARP and in the robotology-superbuild and use YARP before late January 2025 breaking changes in Unstable branches #1789

Merged
merged 5 commits into from
Feb 1, 2025
Merged

Drop ROS 1 support in YARP and in the robotology-superbuild and use YARP before late January 2025 breaking changes in Unstable branches #1789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6e91f4f
Drop ROS 1 support in YARP and in the robotology-superbuild
traversaro Jan 31, 2025
28cbfce
Pin YARP and yarp-devices-ros2 to a version before breaking changes
traversaro Jan 31, 2025
c45a2d5
Bump idyntree-yarp-tools to 0.0.10
traversaro Jan 31, 2025
cba8a61
Update Buildbipedal-locomotion-framework.cmake
traversaro Jan 31, 2025
9589e4c
Update ProjectsTagsStable.cmake
traversaro Jan 31, 2025
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
5 changes: 0 additions & 5 deletions cmake/BuildHumanDynamicsEstimation.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@ if(WIN32)
list(APPEND HDE_OPTIONAL_CMAKE_ARGS -DXSENS_MVN_USE_SDK:BOOL=${ROBOTOLOGY_USES_XSENS_MVN_SDK} -DENABLE_XsensSuit:BOOL=${ROBOTOLOGY_USES_XSENS_MVN_SDK} )
endif()

if(ROBOTOLOGY_BUILD_SEPARATE_YARP_ROS)
find_or_build_package(yarp-ros QUIET)
list(APPEND HumanDynamicsEstimation_OPTIONAL_DEPS yarp-ros)
endif()

ycm_ep_helper(HumanDynamicsEstimation TYPE GIT
STYLE GITHUB
REPOSITORY robotology/human-dynamics-estimation.git
Expand Down
6 changes: 1 addition & 5 deletions cmake/Buildbipedal-locomotion-framework.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,6 @@ if (ROBOTOLOGY_ENABLE_DYNAMICS_FULL_DEPS)
endif()
endif()

if(ROBOTOLOGY_BUILD_SEPARATE_YARP_ROS)
find_or_build_package(yarp-ros QUIET)
list(APPEND bipedal-locomotion-framework_DEPENDS yarp-ros)
endif()

set(bipedal-locomotion-framework_OPTIONAL_CMAKE_ARGS "")
if(ROBOTOLOGY_USES_PYTHON)
list(APPEND bipedal-locomotion-framework_OPTIONAL_CMAKE_ARGS "-DFRAMEWORK_PYTHON_INSTALL_DIR:PATH=${ROBOTOLOGY_SUPERBUILD_PYTHON_INSTALL_DIR}")
Expand Down Expand Up @@ -79,6 +74,7 @@ ycm_ep_helper(bipedal-locomotion-framework TYPE GIT
COMPONENT dynamics
FOLDER src
CMAKE_ARGS -DBUILD_TESTING:BOOL=OFF
-DFRAMEWORK_COMPILE_Ros1Publisher:BOOL=OFF
-DFRAMEWORK_USE_YARP:BOOL=ON
-DFRAMEWORK_USE_OsqpEigen:BOOL=ON
-DFRAMEWORK_USE_matioCpp:BOOL=ON
Expand Down
5 changes: 0 additions & 5 deletions cmake/Buildblocktest-yarp-plugins.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@ find_or_build_package(blocktestcore QUIET)

set(blocktest-yarp-plugins_OPTIONAL_DEPS "")

if(ROBOTOLOGY_BUILD_SEPARATE_YARP_ROS)
find_or_build_package(yarp-ros QUIET)
list(APPEND blocktest-yarp-plugins_OPTIONAL_DEPS yarp-ros)
endif()

ycm_ep_helper(blocktest-yarp-plugins TYPE GIT
STYLE GITHUB
REPOSITORY robotology/blocktest-yarp-plugins.git
Expand Down
5 changes: 0 additions & 5 deletions cmake/Buildidyntree-yarp-tools.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@ find_or_build_package(iDynTree QUIET)
find_or_build_package(YARP QUIET)
find_or_build_package(ICUB QUIET)

if(ROBOTOLOGY_BUILD_SEPARATE_YARP_ROS)
find_or_build_package(yarp-ros QUIET)
list(APPEND idyntree-yarp-tools_OPTIONAL_DEPS yarp-ros)
endif()

ycm_ep_helper(idyntree-yarp-tools TYPE GIT
STYLE GITHUB
REPOSITORY robotology/idyntree-yarp-tools.git
Expand Down
20 changes: 0 additions & 20 deletions cmake/Buildyarp-devices-ros.cmake
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions cmake/Buildyarp-ros.cmake
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions cmake/ProjectsTagsStable.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@ set_tag(casadi-matlab-bindings_TAG v3.6.7.0)
# Robotology projects
set_tag(YCM_TAG master)
set_tag(YARP_TAG yarp-3.10)
set_tag(yarp-devices-ros2_TAG v1.0.0)
set_tag(yarp-matlab-bindings_TAG yarp-3.10)
set_tag(gym-ignition_TAG v1.3.1)
3 changes: 3 additions & 0 deletions cmake/ProjectsTagsUnstable.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ set_tag(casadi_TAG 3.6.6)
set_tag(casadi-matlab-bindings_TAG v3.6.6.0)

# Robotology projects
# Pin YARP and yarp-devices-ros2 to a version before the yarp::dev::ReturnValue changes
set_tag(YARP_TAG 43ba0305f8ca690cea5c2a8a6bcdcec60d3ddd0a)
set_tag(yarp-devices-ros2_TAG e4ba8fa2efe7486edd3ade40b2236e69acb6ab37)
set_tag(ICUB_TAG devel)
set_tag(RobotTestingFramework_TAG devel)
set_tag(blockTest_TAG devel)
Expand Down
4 changes: 0 additions & 4 deletions cmake/RobotologySuperbuildLogic.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,6 @@ endif()
# Core
if(ROBOTOLOGY_ENABLE_CORE)
find_or_build_package(YARP)
if(ROBOTOLOGY_BUILD_SEPARATE_YARP_ROS)
find_or_build_package(yarp-ros)
endif()
find_or_build_package(yarp-devices-ros)
find_or_build_package(ICUB)
find_or_build_package(ICUBcontrib)
find_or_build_package(icub-models)
Expand Down
6 changes: 0 additions & 6 deletions cmake/RobotologySuperbuildOptions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,6 @@ set(ROBOTOLOGY_PROJECT_TAGS "Stable" CACHE STRING "The tags to be used for the r
set(ROBOTOLOGY_PROJECT_TAGS_CUSTOM_FILE CACHE FILEPATH "If ROBOTOLOGY_PROJECT_TAGS is custom, this file will be loaded to specify the tags of the projects to use.")
set_property(CACHE ROBOTOLOGY_PROJECT_TAGS PROPERTY STRINGS "Stable" "Unstable" "LatestRelease" "Custom")


# Since YARP 3.10 this requires to have separate yarp-ros and yarp-ros-devices
# However, we keep ROBOTOLOGY_BUILD_SEPARATE_YARP_ROS as a user selectable option to easily revert to the old behaviour
option(ROBOTOLOGY_BUILD_SEPARATE_YARP_ROS "If ON, build yarp-ros and yarp-ros-devices repository" ON)
mark_as_advanced(ROBOTOLOGY_BUILD_SEPARATE_YARP_ROS)

if(ROBOTOLOGY_PROJECT_TAGS STREQUAL "Stable")
include(ProjectsTagsStable)
elseif(ROBOTOLOGY_PROJECT_TAGS STREQUAL "Unstable")
Expand Down
2 changes: 1 addition & 1 deletion releases/latest.releases.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ repositories:
idyntree-yarp-tools:
type: git
url: https://github.com/robotology/idyntree-yarp-tools.git
version: v0.0.9
version: v0.0.10
pyqtconsole:
type: git
url: https://github.com/pyqtconsole/pyqtconsole.git
Expand Down
Loading