From 91cb00b01a117f28025bd275fd2567291b025f73 Mon Sep 17 00:00:00 2001 From: Olivier Stasse <ostasse@laas.fr> Date: Mon, 26 Aug 2019 10:02:10 +0200 Subject: [PATCH] [wip/roscontrol-sot] Release v0.1.0 Add actuator by actuator control. Add VELOCITY based control. --- roscontrol-sot/Makefile | 3 +-- roscontrol-sot/PLIST | 9 +++++++-- roscontrol-sot/distinfo | 6 +++--- roscontrol-sot/patches/patch-aa | 17 ----------------- 4 files changed, 11 insertions(+), 24 deletions(-) delete mode 100644 roscontrol-sot/patches/patch-aa diff --git a/roscontrol-sot/Makefile b/roscontrol-sot/Makefile index 0dcb9636..db07fe76 100644 --- a/roscontrol-sot/Makefile +++ b/roscontrol-sot/Makefile @@ -1,14 +1,13 @@ # robotpkg Makefile for: wip/roscontrol_sot # -VERSION= 0.0.8 +VERSION= 0.1.0 PKGBASE= roscontrol-sot PKGNAME= ${PKGBASE}-${VERSION} ROSNAME= $(subst -,_,${PKGBASE}) DISTNAME= ${ROSNAME}-${VERSION} WRKSRC= ${WRKDIR}/${ROSNAME}-${VERSION} DIST_SUBDIR= ${PKGBASE} -PKGREVISION= 2 CATEGORIES= wip #MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=roscontrol_sot/} diff --git a/roscontrol-sot/PLIST b/roscontrol-sot/PLIST index 79c9918a..d6594792 100644 --- a/roscontrol-sot/PLIST +++ b/roscontrol-sot/PLIST @@ -1,13 +1,18 @@ -@comment Tue Mar 5 17:17:19 CET 2019 +@comment Mon Aug 26 09:58:56 CEST 2019 bin/roscontrol-sot-parse-log include/roscontrol/sot/config.hh include/roscontrol/sot/deprecated.hh include/roscontrol/sot/warning.hh 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${PYTHON_EXT_SUFFIX} 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/launch/sot_controller_gazebo.launch +share/roscontrol_sot/config/sot_test_params.yaml +share/roscontrol_sot/launch/roscontrol_sot_hardware.launch share/roscontrol_sot/package.xml diff --git a/roscontrol-sot/distinfo b/roscontrol-sot/distinfo index 589994a9..d410374d 100644 --- a/roscontrol-sot/distinfo +++ b/roscontrol-sot/distinfo @@ -1,4 +1,4 @@ -SHA1 (roscontrol-sot/roscontrol_sot-0.0.8.tar.gz) = 1c4f86838d2af7255f700b64fc41156515521f69 -RMD160 (roscontrol-sot/roscontrol_sot-0.0.8.tar.gz) = 8c760752cbc1528c1fdd2cddecd033e8af977e2e -Size (roscontrol-sot/roscontrol_sot-0.0.8.tar.gz) = 1242427 bytes +SHA1 (roscontrol-sot/roscontrol_sot-0.1.0.tar.gz) = 76143a98396369ab8e5ea6ff8f54e64b7e6d0265 +RMD160 (roscontrol-sot/roscontrol_sot-0.1.0.tar.gz) = 2202fa977745faff51772be35d6ddaab3a82771e +Size (roscontrol-sot/roscontrol_sot-0.1.0.tar.gz) = 1265429 bytes SHA1 (patch-aa) = 6e5ba385d23f200320bee245aa33d5c7bf23ae59 diff --git a/roscontrol-sot/patches/patch-aa b/roscontrol-sot/patches/patch-aa deleted file mode 100644 index 233bbc19..00000000 --- a/roscontrol-sot/patches/patch-aa +++ /dev/null @@ -1,17 +0,0 @@ ---- cmake/pkg-config.cmake -+++ cmake/pkg-config.cmake -@@ -761,9 +761,9 @@ MACRO(PKG_CONFIG_USE_LCOMPILE_DEPENDENCY TARGET PREFIX) - - # Include/libraries paths seems to be filtered on Linux, add paths - # again. -- INCLUDE_DIRECTORIES(SYSTEM ${${PREFIX}_INCLUDE_DIRS}) -+ INCLUDE_DIRECTORIES(${${PREFIX}_INCLUDE_DIRS}) - IF(DEFINED ${PREFIX}_DEBUG_FOUND) -- INCLUDE_DIRECTORIES(SYSTEM ${${PREFIX}_DEBUG_INCLUDE_DIRS}) -+ INCLUDE_DIRECTORIES(${${PREFIX}_DEBUG_INCLUDE_DIRS}) - ENDIF() - - ENDMACRO(PKG_CONFIG_USE_LCOMPILE_DEPENDENCY) --- -2.7.4 - -- GitLab