From 216bbbf185a0bf8e94cf0d322571e073a35462ad Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Mon, 27 Jul 2020 11:58:21 +0200
Subject: [PATCH] [wip/{py-,}multicontact-api] Update to v2.1.0
Changes in v2.1.0:
- fix curve serialization version
- Backward compatibility for serialization
- fix contactSequence check methods
- fix concatenate effector
- Improve ContactModel
- Add script to load examples in gepetto-gui
---
multicontact-api/Makefile | 2 +-
multicontact-api/PLIST | 7 +++++--
multicontact-api/distinfo | 6 +++---
py-multicontact-api/Makefile | 2 +-
py-multicontact-api/PLIST | 1 +
py-multicontact-api/distinfo | 6 +++---
6 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/multicontact-api/Makefile b/multicontact-api/Makefile
index 49bd4d5f..55b5039d 100644
--- a/multicontact-api/Makefile
+++ b/multicontact-api/Makefile
@@ -4,7 +4,7 @@
ORG= loco-3d
NAME= multicontact-api
-VERSION= 2.0.0
+VERSION= 2.1.0
CATEGORIES= wip
COMMENT= Multi-contact locomotion for multi-body systems
diff --git a/multicontact-api/PLIST b/multicontact-api/PLIST
index 4d5bbaa6..90024059 100644
--- a/multicontact-api/PLIST
+++ b/multicontact-api/PLIST
@@ -3,7 +3,7 @@ include/multicontact-api/bindings/python/geometry/ellipsoid.hpp
include/multicontact-api/bindings/python/geometry/expose-geometry.hpp
include/multicontact-api/bindings/python/geometry/linear-cone.hpp
include/multicontact-api/bindings/python/geometry/second-order-cone.hpp
-include/multicontact-api/bindings/python/scenario/contact-model-planar.hpp
+include/multicontact-api/bindings/python/scenario/contact-model.hpp
include/multicontact-api/bindings/python/scenario/contact-patch.hpp
include/multicontact-api/bindings/python/scenario/contact-phase.hpp
include/multicontact-api/bindings/python/scenario/contact-sequence.hpp
@@ -17,7 +17,7 @@ include/multicontact-api/geometry/ellipsoid.hpp
include/multicontact-api/geometry/fwd.hpp
include/multicontact-api/geometry/linear-cone.hpp
include/multicontact-api/geometry/second-order-cone.hpp
-include/multicontact-api/scenario/contact-model-planar.hpp
+include/multicontact-api/scenario/contact-model.hpp
include/multicontact-api/scenario/contact-patch.hpp
include/multicontact-api/scenario/contact-phase.hpp
include/multicontact-api/scenario/contact-sequence.hpp
@@ -27,4 +27,7 @@ include/multicontact-api/serialization/archive.hpp
include/multicontact-api/serialization/eigen-matrix.hpp
include/multicontact-api/serialization/spatial.hpp
include/multicontact-api/warning.hh
+lib/cmake/multicontact-api/multicontact-apiConfig.cmake
+lib/cmake/multicontact-api/multicontact-apiConfigVersion.cmake
+lib/cmake/multicontact-api/multicontact-apiTargets.cmake
lib/pkgconfig/multicontact-api.pc
diff --git a/multicontact-api/distinfo b/multicontact-api/distinfo
index b543c698..51a16359 100644
--- a/multicontact-api/distinfo
+++ b/multicontact-api/distinfo
@@ -1,3 +1,3 @@
-SHA1 (multicontact-api-2.0.0.tar.gz) = 4545b1e01f2ad3013238e54d7e06130d4ad04898
-RMD160 (multicontact-api-2.0.0.tar.gz) = 427aec7ffe0628282943ff11d2c3430646ada4a8
-Size (multicontact-api-2.0.0.tar.gz) = 53789406 bytes
+SHA1 (multicontact-api-2.1.0.tar.gz) = 7639cefdb28c5eb0f992b6bb604f97a4cf82dec6
+RMD160 (multicontact-api-2.1.0.tar.gz) = 6ae2f6c5214a1da4c4680ed80c7b2c27de32b43d
+Size (multicontact-api-2.1.0.tar.gz) = 82404503 bytes
diff --git a/py-multicontact-api/Makefile b/py-multicontact-api/Makefile
index bbe4079a..596cfc4e 100644
--- a/py-multicontact-api/Makefile
+++ b/py-multicontact-api/Makefile
@@ -4,7 +4,7 @@
ORG= loco-3d
NAME= multicontact-api
-VERSION= 2.0.0
+VERSION= 2.1.0
CATEGORIES= wip
COMMENT= Multi-contact locomotion for multi-body systems
diff --git a/py-multicontact-api/PLIST b/py-multicontact-api/PLIST
index e4172138..42725de2 100644
--- a/py-multicontact-api/PLIST
+++ b/py-multicontact-api/PLIST
@@ -1,3 +1,4 @@
@comment Fri Mar 29 12:11:22 CET 2019
${PYTHON_SITELIB}/multicontact_api/__init__.py
${PYTHON_SITELIB}/multicontact_api/libmulticontact_api.so
+${PYTHON_SITELIB}/multicontact_api/libmulticontact_api.so.${PKGVERSION}
diff --git a/py-multicontact-api/distinfo b/py-multicontact-api/distinfo
index b543c698..51a16359 100644
--- a/py-multicontact-api/distinfo
+++ b/py-multicontact-api/distinfo
@@ -1,3 +1,3 @@
-SHA1 (multicontact-api-2.0.0.tar.gz) = 4545b1e01f2ad3013238e54d7e06130d4ad04898
-RMD160 (multicontact-api-2.0.0.tar.gz) = 427aec7ffe0628282943ff11d2c3430646ada4a8
-Size (multicontact-api-2.0.0.tar.gz) = 53789406 bytes
+SHA1 (multicontact-api-2.1.0.tar.gz) = 7639cefdb28c5eb0f992b6bb604f97a4cf82dec6
+RMD160 (multicontact-api-2.1.0.tar.gz) = 6ae2f6c5214a1da4c4680ed80c7b2c27de32b43d
+Size (multicontact-api-2.1.0.tar.gz) = 82404503 bytes
--
GitLab