Skip to content
Snippets Groups Projects
Commit 9b09a702 authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

[wip/py-roscontrol-sot] Update to v0.4.0

Changes since v0.2.0:
- added missing dependency to control_toolbox
- Improve logging.
- CMake: export project and use exports from dependencies
- CMake: keep minimal required instructions

Packaging changes:
- added patch-aa, to fix links with catkin libraries
parent 9bf62c2f
No related branches found
No related tags found
No related merge requests found
......@@ -3,7 +3,7 @@
#
ORG= stack-of-tasks
VERSION= 0.3.0
VERSION= 0.4.0
NAME= roscontrol-sot
PKGNAME= ${PKGTAG.python-}${NAME}-${VERSION}
ROSNAME= $(subst -,_,${NAME})
......@@ -14,10 +14,8 @@ DIST_SUBDIR= ${NAME}
CATEGORIES= wip
COMMENT= This ROS package binds together the ROS control framework with the dynamic-graph real-time control architecture.
LICENSE= 2-clause-bsd
MAINTAINER= hpp@laas.fr
CMAKE_ARGS+= -DINSTALL_DOCUMENTATION=OFF
CMAKE_ARGS+= -DINSTALL_DOCUMENTATION=OFF
# disable -Werror because of x86_64 warnings (must be fixed upstream) and
# boost + gcc that don't cohabit well depending on their respective versions
......@@ -32,6 +30,8 @@ CMAKE_ARGS+= -DMANDIR=${PREFIX}/${PKGMANDIR}
CMAKE_PREFIX_PATH+= ${PREFIX}
USE_PYTHON= true
DYNAMIC_PLIST_DIRS+= share/doc/${ROSNAME}
include ../../devel/jrl-cmakemodules/Makefile.common
include ../../sysutils/ros-rospack/depend.mk
......@@ -58,7 +58,6 @@ ifeq (erbium,${PREFER.pal-distro})
SYSTEM_PREFIX+=/opt/pal/erbium
CXXFLAGS+="-I/opt/pal/erbium/include"
PKG_CONFIG_DIRS=/opt/pal/erbium/lib/pkgconfig
include ../../motion/ros-control-toolbox/depend.mk
else
include ../../wip/pal-hardware-interfaces/depend.mk
include ../../wip/prf-ros-control/depend.mk
......
......@@ -3,14 +3,16 @@ bin/roscontrol-sot-parse-log
include/roscontrol/sot/config.hh
include/roscontrol/sot/deprecated.hh
include/roscontrol/sot/warning.hh
lib/cmake/roscontrol_sot/roscontrol_sotConfig.cmake
lib/cmake/roscontrol_sot/roscontrol_sotConfigVersion.cmake
lib/cmake/roscontrol_sot/roscontrol_sotTargets-release.cmake
lib/cmake/roscontrol_sot/roscontrol_sotTargets.cmake
lib/librcsot_controller.so
lib/libsot-test-controller.so
lib/libsot-test-device.so
lib/pkgconfig/roscontrol_sot.pc
${PYTHON_SITELIB}/dynamic_graph/sot/test/sot_test_device/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/test/sot_test_device/wrap.so
share/roscontrol_sot/cmake/roscontrol_sotConfig-version.cmake
share/roscontrol_sot/cmake/roscontrol_sotConfig.cmake
share/roscontrol_sot/config/roscontrol_sot_controller_plugins.xml
share/roscontrol_sot/config/rosdoc.yaml
share/roscontrol_sot/config/sot_test_params.yaml
......
SHA1 (roscontrol-sot/roscontrol_sot-0.3.0.tar.gz) = ccbfbbdf5507cc135526387243adcc708dc6cc1a
RMD160 (roscontrol-sot/roscontrol_sot-0.3.0.tar.gz) = 377bd857672d35954e62864268f074f657299dfe
Size (roscontrol-sot/roscontrol_sot-0.3.0.tar.gz) = 1277625 bytes
SHA1 (roscontrol-sot/roscontrol_sot-0.4.0.tar.gz) = bb9778ced3daa912537d61929b3d9605162b27d5
RMD160 (roscontrol-sot/roscontrol_sot-0.4.0.tar.gz) = 2f25d0b2edbf903ab5e90d6dc214e29e1293d8b8
Size (roscontrol-sot/roscontrol_sot-0.4.0.tar.gz) = 1313384 bytes
SHA1 (patch-aa) = 9840e176448c23fcd29a1b2e8fd59084fffbc910
--- CMakeLists.txt.orig 2020-03-19 22:29:08.000000000 +0100
+++ CMakeLists.txt 2020-03-20 01:46:50.075110462 +0100
@@ -80,6 +80,7 @@
add_definitions(-DTEMPERATURE_SENSOR_CONTROLLER)
endif(temperature_sensor_controller_FOUND)
+LINK_DIRECTORIES(${catkin_LIBRARY_DIRS})
add_library(rcsot_controller
src/roscontrol-sot-controller.cpp
src/log.cpp
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment