From 871c86218ecf3127264ab4b481bed5e0a62e5f0e Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Thu, 22 Apr 2021 12:49:13 +0200
Subject: [PATCH] [wip/{py-,}sot-core-v3] Update to v4.11.6
Changes in v4.11.6:
- fix CMP0115
- remove useless import
---
py-sot-core-v3/Makefile | 2 +-
py-sot-core-v3/distinfo | 6 +++---
sot-core-v3/Makefile | 2 +-
sot-core-v3/depend.mk | 23 +++++++++++++----------
sot-core-v3/distinfo | 6 +++---
5 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/py-sot-core-v3/Makefile b/py-sot-core-v3/Makefile
index d11de934..db0aa5cc 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.11.5
+VERSION= 4.11.6
PKGNAME= ${PKGTAG.python-}${NAME}-v3-${VERSION}
diff --git a/py-sot-core-v3/distinfo b/py-sot-core-v3/distinfo
index 9a209c82..66bb40ff 100644
--- a/py-sot-core-v3/distinfo
+++ b/py-sot-core-v3/distinfo
@@ -1,3 +1,3 @@
-SHA1 (sot-core-4.11.5.tar.gz) = 2f37a25604bea48b7e959d40819c183ecbb3986e
-RMD160 (sot-core-4.11.5.tar.gz) = 533f4073588c63ef916d6a5deaf202a8763a94f9
-Size (sot-core-4.11.5.tar.gz) = 1128548 bytes
+SHA1 (sot-core-4.11.6.tar.gz) = ad9e94f34101147e60b3c2e954416ca96b71363a
+RMD160 (sot-core-4.11.6.tar.gz) = e9527c3229290f42860cb0a32494563044e8725e
+Size (sot-core-4.11.6.tar.gz) = 1129543 bytes
diff --git a/sot-core-v3/Makefile b/sot-core-v3/Makefile
index 170506a2..504c6e61 100644
--- a/sot-core-v3/Makefile
+++ b/sot-core-v3/Makefile
@@ -4,7 +4,7 @@
ORG= stack-of-tasks
NAME= sot-core
-VERSION= 4.11.5
+VERSION= 4.11.6
PKGNAME= ${NAME}-v3-${VERSION}
diff --git a/sot-core-v3/depend.mk b/sot-core-v3/depend.mk
index e52ff03f..594aaf03 100644
--- a/sot-core-v3/depend.mk
+++ b/sot-core-v3/depend.mk
@@ -2,28 +2,31 @@
# Created: Rohan Budhiraja on Thu, 17 Dec 2015
#
-DEPEND_DEPTH:= ${DEPEND_DEPTH}+
-SOT_CORE_V3_DEPEND_MK:= ${SOT_CORE_V3_DEPEND_MK}+
+DEPEND_DEPTH:= ${DEPEND_DEPTH}+
+SOT_CORE_V3_DEPEND_MK:= ${SOT_CORE_V3_DEPEND_MK}+
ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+= sot-core-v3
+DEPEND_PKG+= sot-core-v3
endif
ifeq (+,$(SOT_CORE_V3_DEPEND_MK)) # -------------------------------------------
-PREFER.sot-core-v3?= robotpkg
-
-SYSTEM_SEARCH.sot-core-v3=\
- include/sot/core/device.hh \
- lib/libsot-core.so \
- 'lib/pkgconfig/sot-core.pc:/Version/s/[^0-9.]//gp' \
- 'lib/cmake/sot-core/sot-coreConfigVersion.cmake:/PACKAGE_VERSION/s/[^0-9.]//gp'
+PREFER.sot-core-v3?= robotpkg
DEPEND_USE+= sot-core-v3
DEPEND_ABI.sot-core-v3?= sot-core-v3>=4.1.0<5.0.0
DEPEND_DIR.sot-core-v3?= ../../wip/sot-core-v3
+SYSTEM_SEARCH.sot-core-v3= \
+ 'include/sot/core/config.hh:/SOT_CORE_VERSION /s/[^0-9.]//gp' \
+ 'lib/cmake/sot-core/sot-coreConfigVersion.cmake:/PACKAGE_VERSION/s/[^0-9.]//gp' \
+ 'lib/libsot-core.so' \
+ 'lib/pkgconfig/sot-core.pc:/Version/s/[^0-9.]//gp' \
+ 'share/sot-core/package.xml:/<version>/s/[^0-9.]//gp'
+
+
+
endif # SOT_CORE_DEPEND_MK -------------------------------------------------
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
diff --git a/sot-core-v3/distinfo b/sot-core-v3/distinfo
index 9a209c82..66bb40ff 100644
--- a/sot-core-v3/distinfo
+++ b/sot-core-v3/distinfo
@@ -1,3 +1,3 @@
-SHA1 (sot-core-4.11.5.tar.gz) = 2f37a25604bea48b7e959d40819c183ecbb3986e
-RMD160 (sot-core-4.11.5.tar.gz) = 533f4073588c63ef916d6a5deaf202a8763a94f9
-Size (sot-core-4.11.5.tar.gz) = 1128548 bytes
+SHA1 (sot-core-4.11.6.tar.gz) = ad9e94f34101147e60b3c2e954416ca96b71363a
+RMD160 (sot-core-4.11.6.tar.gz) = e9527c3229290f42860cb0a32494563044e8725e
+Size (sot-core-4.11.6.tar.gz) = 1129543 bytes
--
GitLab