From 4584844a100caf053c0b95c21a5b9ee3e1f70982 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Wed, 1 Apr 2020 21:54:30 +0200
Subject: [PATCH] [wip/{,py-}example-robot-data] Update to v3.2.0
Changes since v3.1.2:
- delete duplicate file
- Add the IRIS quadcopter model
- [CMake] Export
---
example-robot-data/Makefile | 2 +-
example-robot-data/PLIST | 9 ++++++++-
example-robot-data/depend.mk | 21 +++++++++++----------
example-robot-data/distinfo | 6 +++---
py-example-robot-data/Makefile | 2 +-
py-example-robot-data/distinfo | 6 +++---
6 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/example-robot-data/Makefile b/example-robot-data/Makefile
index 415a796d..39679bde 100644
--- a/example-robot-data/Makefile
+++ b/example-robot-data/Makefile
@@ -4,7 +4,7 @@
ORG= gepetto
NAME= example-robot-data
-VERSION= 3.1.2
+VERSION= 3.2.0
CATEGORIES= wip
COMMENT= Set of robot URDFs for benchmarking and developed examples.
diff --git a/example-robot-data/PLIST b/example-robot-data/PLIST
index 5273c89f..c44f311b 100644
--- a/example-robot-data/PLIST
+++ b/example-robot-data/PLIST
@@ -3,6 +3,9 @@ include/example-robot-data/config.hh
include/example-robot-data/deprecated.hh
include/example-robot-data/path.hpp
include/example-robot-data/warning.hh
+lib/cmake/example-robot-data/example-robot-dataConfig.cmake
+lib/cmake/example-robot-data/example-robot-dataConfigVersion.cmake
+lib/cmake/example-robot-data/example-robot-dataTargets.cmake
lib/pkgconfig/example-robot-data.pc
share/example-robot-data/package.xml
share/example-robot-data/robots/anymal_b_simple_description/meshes/base/anymal_base.dae
@@ -92,6 +95,11 @@ share/example-robot-data/robots/icub_description/meshes/upmc/visual/icub_root_li
share/example-robot-data/robots/icub_description/robots/icub.urdf
share/example-robot-data/robots/icub_description/robots/icub_reduced.urdf
share/example-robot-data/robots/icub_description/srdf/icub.srdf
+share/example-robot-data/robots/iris_description/meshes/iris.stl
+share/example-robot-data/robots/iris_description/meshes/iris_prop_ccw.dae
+share/example-robot-data/robots/iris_description/meshes/iris_prop_cw.dae
+share/example-robot-data/robots/iris_description/robots/iris.urdf
+share/example-robot-data/robots/iris_description/robots/iris_simple.urdf
share/example-robot-data/robots/kinova_description/meshes/arm.dae
share/example-robot-data/robots/kinova_description/meshes/base.dae
share/example-robot-data/robots/kinova_description/meshes/finger_distal.dae
@@ -255,7 +263,6 @@ share/example-robot-data/robots/talos_data/meshes/v2/knee_lo_res.stl
share/example-robot-data/robots/talos_data/robots/talos_left_arm.urdf
share/example-robot-data/robots/talos_data/robots/talos_reduced.urdf
share/example-robot-data/robots/talos_data/srdf/talos.srdf
-share/example-robot-data/robots/talos_data/urdf/talos_reduced.urdf
share/example-robot-data/robots/tiago_description/config/collision/collision_parameters.yaml
share/example-robot-data/robots/tiago_description/meshes/arm/arm_1.stl
share/example-robot-data/robots/tiago_description/meshes/arm/arm_1_collision.dae
diff --git a/example-robot-data/depend.mk b/example-robot-data/depend.mk
index 47a5121c..e999fb06 100644
--- a/example-robot-data/depend.mk
+++ b/example-robot-data/depend.mk
@@ -2,27 +2,28 @@
# Created: Guilhem Saurel on Wed, 20 Feb 2019
#
-DEPEND_DEPTH:= ${DEPEND_DEPTH}+
-EXAMPLE_ROBOT_DATA_DEPEND_MK:= ${EXAMPLE_ROBOT_DATA_DEPEND_MK}+
+DEPEND_DEPTH:= ${DEPEND_DEPTH}+
+EXAMPLE_ROBOT_DATA_DEPEND_MK:= ${EXAMPLE_ROBOT_DATA_DEPEND_MK}+
ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+= example-robot-data
+DEPEND_PKG+= example-robot-data
endif
ifeq (+,$(EXAMPLE_ROBOT_DATA_DEPEND_MK)) # ------------------------------------------
-PREFER.example-robot-data?= robotpkg
+PREFER.example-robot-data?= robotpkg
#TODO
-SYSTEM_SEARCH.example-robot-data=\
- 'include/example-robot-data/config.hh:/EXAMPLE_ROBOT_DATA_VERSION /s/[^0-9.]//gp' \
- 'lib/pkgconfig/example-robot-data.pc:/Version/s/[^0-9.]//gp' \
+SYSTEM_SEARCH.example-robot-data= \
+ 'include/example-robot-data/config.hh:/EXAMPLE_ROBOT_DATA_VERSION /s/[^0-9.]//gp' \
+ 'lib/cmake/example-robot-data/example-robot-dataConfigVersion.cmake:/PACKAGE_VERSION/s/[^0-9.]//gp' \
+ 'lib/pkgconfig/example-robot-data.pc:/Version/s/[^0-9.]//gp' \
'share/example-robot-data/package.xml:/<version>/s/[^0-9.]//gp'
-DEPEND_USE+= example-robot-data
+DEPEND_USE+= example-robot-data
-DEPEND_ABI.example-robot-data?= example-robot-data>=3.0.0
-DEPEND_DIR.example-robot-data?= ../../wip/example-robot-data
+DEPEND_ABI.example-robot-data?= example-robot-data>=3.2.0
+DEPEND_DIR.example-robot-data?= ../../wip/example-robot-data
endif # EXAMPLE_ROBOT_DATA_DEPEND_MK ------------------------------------------------
diff --git a/example-robot-data/distinfo b/example-robot-data/distinfo
index bda4da43..85767623 100644
--- a/example-robot-data/distinfo
+++ b/example-robot-data/distinfo
@@ -1,3 +1,3 @@
-SHA1 (example-robot-data-3.1.2.tar.gz) = 442ba223c25e1265c629fbe300ef5411c9ba7088
-RMD160 (example-robot-data-3.1.2.tar.gz) = 4acc2f11a20a4bbaf9a09b7739bc37e3a74f31e1
-Size (example-robot-data-3.1.2.tar.gz) = 36386979 bytes
+SHA1 (example-robot-data-3.2.0.tar.gz) = bda81b03d9df250512ca6e97b854c9981726bc1d
+RMD160 (example-robot-data-3.2.0.tar.gz) = 79bbd6586b93ffaefb592e422c403f2e6a410e0e
+Size (example-robot-data-3.2.0.tar.gz) = 36950319 bytes
diff --git a/py-example-robot-data/Makefile b/py-example-robot-data/Makefile
index ec6894eb..9619a611 100644
--- a/py-example-robot-data/Makefile
+++ b/py-example-robot-data/Makefile
@@ -4,7 +4,7 @@
ORG= gepetto
NAME= example-robot-data
-VERSION= 3.1.2
+VERSION= 3.2.0
CATEGORIES= wip
COMMENT= Set of robot URDFs for benchmarking and developed examples.
diff --git a/py-example-robot-data/distinfo b/py-example-robot-data/distinfo
index bda4da43..85767623 100644
--- a/py-example-robot-data/distinfo
+++ b/py-example-robot-data/distinfo
@@ -1,3 +1,3 @@
-SHA1 (example-robot-data-3.1.2.tar.gz) = 442ba223c25e1265c629fbe300ef5411c9ba7088
-RMD160 (example-robot-data-3.1.2.tar.gz) = 4acc2f11a20a4bbaf9a09b7739bc37e3a74f31e1
-Size (example-robot-data-3.1.2.tar.gz) = 36386979 bytes
+SHA1 (example-robot-data-3.2.0.tar.gz) = bda81b03d9df250512ca6e97b854c9981726bc1d
+RMD160 (example-robot-data-3.2.0.tar.gz) = 79bbd6586b93ffaefb592e422c403f2e6a410e0e
+Size (example-robot-data-3.2.0.tar.gz) = 36950319 bytes
--
GitLab