Skip to content
Snippets Groups Projects
Commit d9e8342d authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

[wip/{py-,}sot-pattern-generator] Update to v3.2.3

Changes since v3.2.2:
- fix imports for python 3
- fix sot-dynamic-pinocchio python lib use
- renammed test dir
- [cmake] CmakeLists.txt modified with new rules for compiling
- CMake: export project and use exports from dependencies
- CMake: keep minimal required instructions

Packaging changes:
- removed patches aa, obsolete
parent 27e57de9
No related branches found
No related tags found
No related merge requests found
......@@ -4,14 +4,12 @@
ORG= stack-of-tasks
NAME= sot-pattern-generator
VERSION= 3.2.2
VERSION= 3.2.3
PKGNAME= ${PKGTAG.python-}${NAME}-v3-${VERSION}
CATEGORIES= wip
COMMENT= Walking Pattern Generator (python bindings)
LICENSE= 2-clause-bsd
MAINTAINER= gepetto@laas.fr
CONFLICTS+= py[0-9][0-9]-${NAME}
......
SHA1 (sot-pattern-generator-3.2.2.tar.gz) = 85f9369987f7a4d665d85e55b3c53c1a0a5a0ade
RMD160 (sot-pattern-generator-3.2.2.tar.gz) = 27f7ca462e44bba04c7063aa0f49307bb2f63d3c
Size (sot-pattern-generator-3.2.2.tar.gz) = 851750 bytes
SHA1 (patch-aa) = 53d7ee3240053b452293f5bb98cde978d87cf4eb
SHA1 (sot-pattern-generator-3.2.3.tar.gz) = 98d4618db6fd9c36fd5db10430d89c55acf46b4b
RMD160 (sot-pattern-generator-3.2.3.tar.gz) = a381bf27009b71da249cf51f8482499ba5b89196
Size (sot-pattern-generator-3.2.3.tar.gz) = 909222 bytes
From d6c549f1440ef5b1aef0e3bbba45276210ae7923 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Sun, 1 Mar 2020 22:02:25 +0100
Subject: [PATCH] [Tests] add missing link to dynamic-graph
fix:
> /usr/bin/ld: CMakeFiles/testsot-pattern-generator.dir/main.cc.o: undefined reference to symbol '_ZN12dynamicgraph15ExceptionSignalC1ERKNS0_13ErrorCodeEnumERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKcz'
---
.travis | 2 +-
cmake | 2 +-
unitTesting/CMakeLists.txt | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.travis b/.travis
index e1f2f35..dc8b946 160000
--- .travis
+++ .travis
@@ -1 +1 @@
-Subproject commit e1f2f35d92dbac830a3d189200b46a3370bd8327
+Subproject commit dc8b946d456d2c41ad12b819111b005148c68031
diff --git a/cmake b/cmake
index 63efaec..8e7bedf 160000
--- cmake
+++ cmake
@@ -1 +1 @@
-Subproject commit 63efaecd7c1fa3f9c190b5365561c38ea33f3236
+Subproject commit 8e7bedfcbd8524c0401a58fd74edc07c3d4308d0
diff --git a/unitTesting/CMakeLists.txt b/unitTesting/CMakeLists.txt
index 422533a..533283d 100644
--- unitTesting/CMakeLists.txt
+++ unitTesting/CMakeLists.txt
@@ -31,3 +31,4 @@ ADD_TEST(main_test ${EXECUTABLE_NAME})
PKG_CONFIG_USE_DEPENDENCY(${EXECUTABLE_NAME} pinocchio)
PKG_CONFIG_USE_DEPENDENCY(${EXECUTABLE_NAME} jrl-walkgen)
PKG_CONFIG_USE_DEPENDENCY(${EXECUTABLE_NAME} sot-core)
+PKG_CONFIG_USE_DEPENDENCY(${EXECUTABLE_NAME} dynamic-graph)
--
2.17.1
......@@ -4,14 +4,12 @@
ORG= stack-of-tasks
NAME= sot-pattern-generator
VERSION= 3.2.2
VERSION= 3.2.3
PKGNAME= ${NAME}-v3-${VERSION}
CATEGORIES= wip
COMMENT= Walking Pattern Generator
LICENSE= 2-clause-bsd
MAINTAINER= gepetto-soft@laas.fr
CONFLICTS+= ${NAME}
......@@ -24,6 +22,7 @@ include ../../math/pinocchio/depend.mk
include ../../wip/jrl-walkgen-v3/depend.mk
include ../../wip/dynamic-graph-v3/depend.mk
include ../../wip/sot-core-v3/depend.mk
include ../../wip/talos-data/depend.mk
include ../../pkgtools/pkg-config/depend.mk
include ../../mk/sysdep/cmake.mk
include ../../mk/sysdep/doxygen.mk
......
@comment Thu Dec 13 11:47:41 CET 2018
include/sot-pattern-generator/config.hh
include/sot-pattern-generator/deprecated.hh
include/sot-pattern-generator/exception-pg.h
include/sot-pattern-generator/next-step-pg-sot.h
include/sot-pattern-generator/next-step.h
include/sot-pattern-generator/pg-manager.h
include/sot-pattern-generator/pg.h
include/sot-pattern-generator/selector.h
include/sot-pattern-generator/step-checker.h
include/sot-pattern-generator/step-computer-force.h
include/sot-pattern-generator/step-computer-joystick.h
include/sot-pattern-generator/step-computer-pos.h
include/sot-pattern-generator/step-computer.h
include/sot-pattern-generator/step-observer.h
include/sot-pattern-generator/step-queue.h
include/sot-pattern-generator/step-time-line.h
include/sot-pattern-generator/warning.hh
include/sot-pattern-generator/which-foot-upper.h
include/sot/pattern-generator/config.hh
include/sot/pattern-generator/deprecated.hh
include/sot/pattern-generator/exception-pg.h
include/sot/pattern-generator/next-step-pg-sot.h
include/sot/pattern-generator/next-step.h
include/sot/pattern-generator/pg-manager.h
include/sot/pattern-generator/pg.h
include/sot/pattern-generator/selector.h
include/sot/pattern-generator/step-checker.h
include/sot/pattern-generator/step-computer-force.h
include/sot/pattern-generator/step-computer-joystick.h
include/sot/pattern-generator/step-computer-pos.h
include/sot/pattern-generator/step-computer.h
include/sot/pattern-generator/step-observer.h
include/sot/pattern-generator/step-queue.h
include/sot/pattern-generator/step-time-line.h
include/sot/pattern-generator/warning.hh
include/sot/pattern-generator/which-foot-upper.h
lib/cmake/sot-pattern-generator/sot-pattern-generatorConfig.cmake
lib/cmake/sot-pattern-generator/sot-pattern-generatorConfigVersion.cmake
lib/cmake/sot-pattern-generator/sot-pattern-generatorTargets-release.cmake
lib/cmake/sot-pattern-generator/sot-pattern-generatorTargets.cmake
lib/dynamic-graph-plugins/libexception-pg.so
lib/dynamic-graph-plugins/libexception-pg.so.${PKGVERSION}
lib/dynamic-graph-plugins/libnext-step-pg-sot.so
lib/dynamic-graph-plugins/libnext-step-pg-sot.so.${PKGVERSION}
lib/dynamic-graph-plugins/libnext-step.so
lib/dynamic-graph-plugins/libnext-step.so.${PKGVERSION}
lib/dynamic-graph-plugins/libpg-manager.so
lib/dynamic-graph-plugins/libpg-manager.so.${PKGVERSION}
lib/dynamic-graph-plugins/libpg.so
lib/dynamic-graph-plugins/libpg.so.${PKGVERSION}
lib/dynamic-graph-plugins/libselector.so
lib/dynamic-graph-plugins/libselector.so.${PKGVERSION}
lib/dynamic-graph-plugins/libstep-checker.so
lib/dynamic-graph-plugins/libstep-checker.so.${PKGVERSION}
lib/dynamic-graph-plugins/libstep-computer-force.so
lib/dynamic-graph-plugins/libstep-computer-force.so.${PKGVERSION}
lib/dynamic-graph-plugins/libstep-computer-joystick.so
lib/dynamic-graph-plugins/libstep-computer-joystick.so.${PKGVERSION}
lib/dynamic-graph-plugins/libstep-computer-pos.so
lib/dynamic-graph-plugins/libstep-computer-pos.so.${PKGVERSION}
lib/dynamic-graph-plugins/libstep-observer.so
lib/dynamic-graph-plugins/libstep-observer.so.${PKGVERSION}
lib/dynamic-graph-plugins/libstep-queue.so
lib/dynamic-graph-plugins/libstep-queue.so.${PKGVERSION}
lib/dynamic-graph-plugins/libstep-time-line.so
lib/dynamic-graph-plugins/libstep-time-line.so.${PKGVERSION}
lib/dynamic-graph-plugins/libwhich-foot-upper.so
lib/dynamic-graph-plugins/libwhich-foot-upper.so.${PKGVERSION}
lib/pkgconfig/sot-pattern-generator.pc
lib/plugin/exception-pg.so
lib/plugin/exception-pg.so.${PKGVERSION}
lib/plugin/next-step-pg-sot.so
lib/plugin/next-step-pg-sot.so.${PKGVERSION}
lib/plugin/next-step.so
lib/plugin/next-step.so.${PKGVERSION}
lib/plugin/pg-manager.so
lib/plugin/pg-manager.so.${PKGVERSION}
lib/plugin/pg.so
lib/plugin/pg.so.${PKGVERSION}
lib/plugin/selector.so
lib/plugin/selector.so.${PKGVERSION}
lib/plugin/step-checker.so
lib/plugin/step-checker.so.${PKGVERSION}
lib/plugin/step-computer-force.so
lib/plugin/step-computer-force.so.${PKGVERSION}
lib/plugin/step-computer-joystick.so
lib/plugin/step-computer-joystick.so.${PKGVERSION}
lib/plugin/step-computer-pos.so
lib/plugin/step-computer-pos.so.${PKGVERSION}
lib/plugin/step-observer.so
lib/plugin/step-observer.so.${PKGVERSION}
lib/plugin/step-queue.so
lib/plugin/step-queue.so.${PKGVERSION}
lib/plugin/step-time-line.so
lib/plugin/step-time-line.so.${PKGVERSION}
lib/plugin/which-foot-upper.so
lib/plugin/which-foot-upper.so.${PKGVERSION}
share/sot-pattern-generator/package.xml
......@@ -6,19 +6,20 @@ DEPEND_DEPTH:= ${DEPEND_DEPTH}+
SOT_PATTERN_GENERATOR_V3_DEPEND_MK:= ${SOT_PATTERN_GENERATOR_V3_DEPEND_MK}+
ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= sot-pattern-generator-v3
DEPEND_PKG+= sot-pattern-generator-v3
endif
ifeq (+,$(SOT_PATTERN_GENERATOR_V3_DEPEND_MK)) # ------------------------------
DEPEND_USE+= sot-pattern-generator-v3
DEPEND_USE+= sot-pattern-generator-v3
PREFER.sot-pattern-generator-v3?= robotpkg
DEPEND_ABI.sot-pattern-generator-v3?= sot-pattern-generator-v3>=2.10
DEPEND_DIR.sot-pattern-generator-v3?= ../../wip/sot-pattern-generator-v3
SYSTEM_SEARCH.sot-pattern-generator-v3=\
include/sot-pattern-generator/pg.h \
lib/plugin/pg.so \
'include/sot/pattern-generator/config.hh:/SOT_PATTERN_GENERATOR_VERSION /s/[^0-9.]//gp' \
'lib/dynamic-graph-plugins/libpg.so' \
'lib/cmake/sot-pattern-generator/sot-pattern-generatorConfigVersion.cmake:/PACKAGE_VERSION/s/[^0-9.]//gp' \
'lib/pkgconfig/sot-pattern-generator.pc:/Version/s/[^0-9.]//pg'
include ../../mk/sysdep/python.mk
......
SHA1 (sot-pattern-generator-3.2.2.tar.gz) = 85f9369987f7a4d665d85e55b3c53c1a0a5a0ade
RMD160 (sot-pattern-generator-3.2.2.tar.gz) = 27f7ca462e44bba04c7063aa0f49307bb2f63d3c
Size (sot-pattern-generator-3.2.2.tar.gz) = 851750 bytes
SHA1 (patch-aa) = 53d7ee3240053b452293f5bb98cde978d87cf4eb
SHA1 (sot-pattern-generator-3.2.3.tar.gz) = 98d4618db6fd9c36fd5db10430d89c55acf46b4b
RMD160 (sot-pattern-generator-3.2.3.tar.gz) = a381bf27009b71da249cf51f8482499ba5b89196
Size (sot-pattern-generator-3.2.3.tar.gz) = 909222 bytes
From d6c549f1440ef5b1aef0e3bbba45276210ae7923 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Sun, 1 Mar 2020 22:02:25 +0100
Subject: [PATCH] [Tests] add missing link to dynamic-graph
fix:
> /usr/bin/ld: CMakeFiles/testsot-pattern-generator.dir/main.cc.o: undefined reference to symbol '_ZN12dynamicgraph15ExceptionSignalC1ERKNS0_13ErrorCodeEnumERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKcz'
---
.travis | 2 +-
cmake | 2 +-
unitTesting/CMakeLists.txt | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.travis b/.travis
index e1f2f35..dc8b946 160000
--- .travis
+++ .travis
@@ -1 +1 @@
-Subproject commit e1f2f35d92dbac830a3d189200b46a3370bd8327
+Subproject commit dc8b946d456d2c41ad12b819111b005148c68031
diff --git a/cmake b/cmake
index 63efaec..8e7bedf 160000
--- cmake
+++ cmake
@@ -1 +1 @@
-Subproject commit 63efaecd7c1fa3f9c190b5365561c38ea33f3236
+Subproject commit 8e7bedfcbd8524c0401a58fd74edc07c3d4308d0
diff --git a/unitTesting/CMakeLists.txt b/unitTesting/CMakeLists.txt
index 422533a..533283d 100644
--- unitTesting/CMakeLists.txt
+++ unitTesting/CMakeLists.txt
@@ -31,3 +31,4 @@ ADD_TEST(main_test ${EXECUTABLE_NAME})
PKG_CONFIG_USE_DEPENDENCY(${EXECUTABLE_NAME} pinocchio)
PKG_CONFIG_USE_DEPENDENCY(${EXECUTABLE_NAME} jrl-walkgen)
PKG_CONFIG_USE_DEPENDENCY(${EXECUTABLE_NAME} sot-core)
+PKG_CONFIG_USE_DEPENDENCY(${EXECUTABLE_NAME} dynamic-graph)
--
2.17.1
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment