From 1e3f4b57a6dee0a36385e3516cc57e0666243ebe Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Fri, 8 May 2020 01:08:48 +0200
Subject: [PATCH] [wip/{,py-}sot-core-v3] Update to v4.9.0
Changes in v4.9.0:
- Add Sot::maxControlIncrementSquaredNorm to avoid generating large controls.
- [Admittance] Move entity Admittance OpPoint
- Add Multiply_matrixTwist_vector in math_small_entities
- [tools] Add set_parameter and get_parameter
- [CMake] add dependency to example-robot-data
---
py-sot-core-v3/Makefile | 4 +++-
py-sot-core-v3/PLIST | 2 ++
py-sot-core-v3/distinfo | 6 +++---
sot-core-v3/Makefile | 3 ++-
sot-core-v3/PLIST | 2 ++
sot-core-v3/distinfo | 6 +++---
6 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/py-sot-core-v3/Makefile b/py-sot-core-v3/Makefile
index 33a23216..c1bda630 100644
--- a/py-sot-core-v3/Makefile
+++ b/py-sot-core-v3/Makefile
@@ -4,7 +4,7 @@
ORG= stack-of-tasks
NAME= sot-core
-VERSION= 4.8.1
+VERSION= 4.9.0
PKGNAME= ${PKGTAG.python-}${NAME}-v3-${VERSION}
@@ -23,6 +23,8 @@ include ../../math/eigen3/depend.mk
include ../../math/pinocchio/depend.mk
include ../../math/py-pinocchio/depend.mk
include ../../path/hpp-fcl/depend.mk
+include ../../robots/example-robot-data/depend.mk
+include ../../robots/py-example-robot-data/depend.mk
include ../../mapping/octomap/depend.mk
include ../../wip/dynamic-graph-v3/depend.mk
include ../../wip/py-dynamic-graph-v3/depend.mk
diff --git a/py-sot-core-v3/PLIST b/py-sot-core-v3/PLIST
index ab94e04f..fe85386a 100644
--- a/py-sot-core-v3/PLIST
+++ b/py-sot-core-v3/PLIST
@@ -1,6 +1,8 @@
@comment Fri Jul 13 12:13:49 CEST 2018
${PYTHON_SITELIB}/dynamic_graph/sot/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/core/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/admittance_control_op_point/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/admittance_control_op_point/wrap.so
${PYTHON_SITELIB}/dynamic_graph/sot/core/binary_int_to_uint/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/core/binary_int_to_uint/wrap.so
${PYTHON_SITELIB}/dynamic_graph/sot/core/clamp_workspace/__init__.py
diff --git a/py-sot-core-v3/distinfo b/py-sot-core-v3/distinfo
index c3b589d9..4207bd79 100644
--- a/py-sot-core-v3/distinfo
+++ b/py-sot-core-v3/distinfo
@@ -1,3 +1,3 @@
-SHA1 (sot-core-4.8.1.tar.gz) = 54077a666ed76f984502f3aadb3fd16365916eb3
-RMD160 (sot-core-4.8.1.tar.gz) = 77769d17eac2b2326b0ab219f621fb319dff76f6
-Size (sot-core-4.8.1.tar.gz) = 1120970 bytes
+SHA1 (sot-core-4.9.0.tar.gz) = cde662cf7a7fa646d7b560951d0a4bfdc8056c1e
+RMD160 (sot-core-4.9.0.tar.gz) = 9901365103905fd02ae4227a9036b8deb7ccfb13
+Size (sot-core-4.9.0.tar.gz) = 1102006 bytes
diff --git a/sot-core-v3/Makefile b/sot-core-v3/Makefile
index ee288a3e..0b26e150 100644
--- a/sot-core-v3/Makefile
+++ b/sot-core-v3/Makefile
@@ -4,7 +4,7 @@
ORG= stack-of-tasks
NAME= sot-core
-VERSION= 4.8.1
+VERSION= 4.9.0
PKGNAME= ${NAME}-v3-${VERSION}
@@ -24,6 +24,7 @@ include ../../path/hpp-fcl/depend.mk
include ../../mapping/octomap/depend.mk
include ../../wip/dynamic-graph-v3/depend.mk
include ../../pkgtools/pkg-config/depend.mk
+include ../../robots/example-robot-data/depend.mk
include ../../mk/sysdep/cmake.mk
include ../../mk/sysdep/doxygen.mk
include ../../mk/sysdep/graphviz.mk
diff --git a/sot-core-v3/PLIST b/sot-core-v3/PLIST
index fb07da3b..2dbdc810 100644
--- a/sot-core-v3/PLIST
+++ b/sot-core-v3/PLIST
@@ -88,6 +88,8 @@ lib/cmake/sot-core/sot-coreConfig.cmake
lib/cmake/sot-core/sot-coreConfigVersion.cmake
lib/cmake/sot-core/sot-coreTargets-release.cmake
lib/cmake/sot-core/sot-coreTargets.cmake
+lib/dynamic-graph-plugins/libadmittance-control-op-point.so
+lib/dynamic-graph-plugins/libadmittance-control-op-point.so.${PKGVERSION}
lib/dynamic-graph-plugins/libbinary-int-to-uint.so
lib/dynamic-graph-plugins/libbinary-int-to-uint.so.${PKGVERSION}
lib/dynamic-graph-plugins/libclamp-workspace.so
diff --git a/sot-core-v3/distinfo b/sot-core-v3/distinfo
index c3b589d9..4207bd79 100644
--- a/sot-core-v3/distinfo
+++ b/sot-core-v3/distinfo
@@ -1,3 +1,3 @@
-SHA1 (sot-core-4.8.1.tar.gz) = 54077a666ed76f984502f3aadb3fd16365916eb3
-RMD160 (sot-core-4.8.1.tar.gz) = 77769d17eac2b2326b0ab219f621fb319dff76f6
-Size (sot-core-4.8.1.tar.gz) = 1120970 bytes
+SHA1 (sot-core-4.9.0.tar.gz) = cde662cf7a7fa646d7b560951d0a4bfdc8056c1e
+RMD160 (sot-core-4.9.0.tar.gz) = 9901365103905fd02ae4227a9036b8deb7ccfb13
+Size (sot-core-4.9.0.tar.gz) = 1102006 bytes
--
GitLab