From 7a258bb9dc88e926c96e8c1d372f075656f13960 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Mon, 23 Mar 2020 16:12:04 +0100
Subject: [PATCH] [wip/pyrene-motions] Update to v1.0.0
Changes:
- CMake: export project and use exports from dependencies
- CMake: keep minimal required instructions
---
pyrene-motions/Makefile | 10 +++-------
pyrene-motions/PLIST | 3 +++
pyrene-motions/depend.mk | 27 +++++++++++++++++++++++++++
pyrene-motions/distinfo | 6 +++---
4 files changed, 36 insertions(+), 10 deletions(-)
create mode 100644 pyrene-motions/depend.mk
diff --git a/pyrene-motions/Makefile b/pyrene-motions/Makefile
index b3f4e5bc..26b3e40f 100644
--- a/pyrene-motions/Makefile
+++ b/pyrene-motions/Makefile
@@ -1,19 +1,15 @@
# robotpkg Makefile for: wip/pyrene-motions
-# Created: Olivier Stasse, on Tue. 21th Aug, 2018
+# Created: Olivier Stasse on Tue, 21 Aug 2018
#
ORG= pyrene-dev
NAME= pyrene-motions
-VERSION= 0.0.1
+VERSION= 1.0.0
CATEGORIES= wip
COMMENT= This packages provides motions of the humanoid robot Pyrene readable by the SoT framework.
-LICENSE= 2-clause-bsd
-MAINTAINER= ostasse@laas.fr
-
-CMAKE_PREFIX_PATH+= ${PREFIX}
-WRKSRC= ${WRKDIR}/pyrene-motions-${VERSION}
+CMAKE_PREFIX_PATH+= ${PREFIX}
include ../../devel/jrl-cmakemodules/Makefile.common
include ../../pkgtools/pkg-config/depend.mk
diff --git a/pyrene-motions/PLIST b/pyrene-motions/PLIST
index b8a20e83..84a9bac9 100644
--- a/pyrene-motions/PLIST
+++ b/pyrene-motions/PLIST
@@ -2,6 +2,9 @@
include/pyrene/motions/config.hh
include/pyrene/motions/deprecated.hh
include/pyrene/motions/warning.hh
+lib/cmake/pyrene-motions/pyrene-motionsConfig.cmake
+lib/cmake/pyrene-motions/pyrene-motionsConfigVersion.cmake
+lib/cmake/pyrene-motions/pyrene-motionsTargets.cmake
lib/pkgconfig/pyrene-motions.pc
share/pyrene-motions/climb15cmStairsNoHandrail/no_handrail_15cm_1_step.posture
share/pyrene-motions/grabHandrail15/handrail_grab.posture
diff --git a/pyrene-motions/depend.mk b/pyrene-motions/depend.mk
new file mode 100644
index 00000000..bb698431
--- /dev/null
+++ b/pyrene-motions/depend.mk
@@ -0,0 +1,27 @@
+# robotpkg depend.mk for: wip/pyrene-motions
+# Created: Guilhem Saurel on Mon, 16 Mar 2020
+#
+
+DEPEND_DEPTH:= ${DEPEND_DEPTH}+
+PYRENE_MOTIONS_DEPEND_MK:= ${PYRENE_MOTIONS_DEPEND_MK}+
+
+ifeq (+,$(DEPEND_DEPTH))
+DEPEND_PKG+= pyrene-motions
+endif
+
+ifeq (+,$(PYRENE_MOTIONS_DEPEND_MK)) # -----------------------------------------
+
+PREFER.pyrene-motions?= robotpkg
+
+SYSTEM_SEARCH.pyrene-motions=\
+ 'include/pyrene/motions/config.hh:/PYRENE_MOTIOINS_VERSION /s/[^0-9.]//gp' \
+ 'lib/cmake/pyrene-motions/pyrene-motionsConfigVersion.cmake:/PACKAGE_VERSION/s/[^0-9.]//gp' \
+ 'lib/pkgconfig/pyrene-motions.pc:/Version/s/[^0-9.]//gp'
+
+DEPEND_USE+= pyrene-motions
+DEPEND_ABI.pyrene-motions?= pyrene-motions>=1.0.0
+DEPEND_DIR.pyrene-motions?= ../../wip/pyrene-motions
+
+endif # PYRENE_MOTIONS_DEPEND_MK -----------------------------------------------
+
+DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
diff --git a/pyrene-motions/distinfo b/pyrene-motions/distinfo
index 91516de6..14e11c45 100644
--- a/pyrene-motions/distinfo
+++ b/pyrene-motions/distinfo
@@ -1,3 +1,3 @@
-SHA1 (pyrene-motions-0.0.1.tar.gz) = 8defb8a5f29beb58e9ec7eaab8994986ac160878
-RMD160 (pyrene-motions-0.0.1.tar.gz) = 1e27309dd3e42bdfb11e470866f1851b97a48cd5
-Size (pyrene-motions-0.0.1.tar.gz) = 19170786 bytes
+SHA1 (pyrene-motions-1.0.0.tar.gz) = a85184fd929016f3925dd6293998948cddeb1ef6
+RMD160 (pyrene-motions-1.0.0.tar.gz) = e8491c08fc9e0d965adda9daa9ea4803498e51b6
+Size (pyrene-motions-1.0.0.tar.gz) = 23468940 bytes
--
GitLab