From 6e8ad8773665b0448a21f8ec13853dfaa55b684c Mon Sep 17 00:00:00 2001 From: v4hn Date: Wed, 21 Aug 2024 00:51:15 +0200 Subject: [PATCH 1/3] drop obsolete use of boost::bind and _1 Lambdas are preferred since c++11. The transitively included use of _1 starts failing with a recently proposed change to adapt the boost-bind include API in ros_comm. https://github.com/ros-o/ros_comm/pull/3 --- fetch_depth_layer/src/depth_layer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fetch_depth_layer/src/depth_layer.cpp b/fetch_depth_layer/src/depth_layer.cpp index ff36c5e0..5b7679c6 100644 --- a/fetch_depth_layer/src/depth_layer.cpp +++ b/fetch_depth_layer/src/depth_layer.cpp @@ -146,7 +146,7 @@ void FetchDepthLayer::onInitialize() depth_image_sub_.reset(new message_filters::Subscriber(private_nh, camera_depth_topic, 10)); depth_image_filter_ = boost::shared_ptr< tf2_ros::MessageFilter >( new tf2_ros::MessageFilter(*depth_image_sub_, *tf_, global_frame_, 10, private_nh)); - depth_image_filter_->registerCallback(boost::bind(&FetchDepthLayer::depthImageCallback, this, _1)); + depth_image_filter_->registerCallback([this](auto msg){ depthImageCallback(msg); }); observation_subscribers_.push_back(depth_image_sub_); observation_notifiers_.push_back(depth_image_filter_); observation_notifiers_.back()->setTolerance(ros::Duration(0.05)); From d3edd9b68674bc0951b9da755fd7d06c17d3c76b Mon Sep 17 00:00:00 2001 From: v4hn Date: Mon, 9 Sep 2024 13:38:47 +0200 Subject: [PATCH 2/3] drop c++14 requirement default almost everywhere and log4cxx breaks without 17 support for years. --- fetch_ikfast_plugin/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/fetch_ikfast_plugin/CMakeLists.txt b/fetch_ikfast_plugin/CMakeLists.txt index b85b25f9..99e375e0 100644 --- a/fetch_ikfast_plugin/CMakeLists.txt +++ b/fetch_ikfast_plugin/CMakeLists.txt @@ -1,8 +1,6 @@ cmake_minimum_required(VERSION 3.0.2) project(fetch_ikfast_plugin) -add_compile_options(-std=c++14) - find_package(catkin REQUIRED COMPONENTS moveit_core pluginlib From 11f8df9cc1d10a0ec5a50520a9957153d148a89a Mon Sep 17 00:00:00 2001 From: v4hn Date: Tue, 5 Nov 2024 11:20:04 +0100 Subject: [PATCH 3/3] do not create a python package ... where there is no package. Only a script was installed from the setup.py but catkin provides a separate command for that http://docs.ros.org/en/jade/api/catkin/html/howto/format2/installing_python.html I retained the installation to the global path. It is unusual to do that, but it has been like that for a long time. This started failing with recent setuptools with the following error message: --- error: Multiple top-level packages discovered in a flat-layout: ['debian', 'config', 'launch']. To avoid accidental inclusion of unwanted files or directories, setuptools will not proceed with this build. If you are trying to create a single distribution with multiple packages on purpose, you should not rely on automatic discovery. Instead, consider the following options: 1. set up custom discovery (`find` directive with `include` or `exclude`) 2. use a `src-layout` 3. explicitly set `py_modules` or `packages` with a list of names To find more information, look for "package discovery" on setuptools docs. --- --- fetch_calibration/CMakeLists.txt | 8 ++++++-- fetch_calibration/package.xml | 2 -- fetch_calibration/setup.py | 10 ---------- 3 files changed, 6 insertions(+), 14 deletions(-) delete mode 100644 fetch_calibration/setup.py diff --git a/fetch_calibration/CMakeLists.txt b/fetch_calibration/CMakeLists.txt index de157c1f..a4e4b842 100644 --- a/fetch_calibration/CMakeLists.txt +++ b/fetch_calibration/CMakeLists.txt @@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.0.2) project(fetch_calibration) find_package(catkin) -catkin_python_setup() catkin_package() install(DIRECTORY config @@ -13,7 +12,12 @@ install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} ) -install( +catkin_install_python( PROGRAMS scripts/camera_reconfigure.py DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} ) + +catkin_install_python( + PROGRAMS scripts/calibrate_robot + DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION} +) diff --git a/fetch_calibration/package.xml b/fetch_calibration/package.xml index 2c2c9520..f5730e3a 100644 --- a/fetch_calibration/package.xml +++ b/fetch_calibration/package.xml @@ -20,8 +20,6 @@ https://github.com/fetchrobotics/fetch_ros catkin - python-setuptools - python3-setuptools robot_calibration diff --git a/fetch_calibration/setup.py b/fetch_calibration/setup.py deleted file mode 100644 index cd991806..00000000 --- a/fetch_calibration/setup.py +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env python - -from setuptools import setup -from catkin_pkg.python_setup import generate_distutils_setup - -d = generate_distutils_setup( - scripts=['scripts/calibrate_robot'], - ) - -setup(**d)