From 4825c6d768baf36105cb9a96a293409b44da5441 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Mon, 23 Mar 2020 16:07:17 +0100
Subject: [PATCH] [wip/{py-,}tsid] Update to v1.2.3
Changes since v1.2.2:
- renamed tests dir
- fix python tests
- CMake: export project and use exports from dependencies
- CMake: keep minimal required instructions
Packaging changes:
- removed patches aa, ac, applied upstream
---
py-tsid/Makefile | 10 ++--------
py-tsid/PLIST | 29 +----------------------------
py-tsid/depend.mk | 2 +-
py-tsid/distinfo | 8 +++-----
py-tsid/patches/patch-aa | 16 ----------------
py-tsid/patches/patch-ac | 30 ------------------------------
tsid/Makefile | 4 +---
tsid/PLIST | 5 +++++
tsid/distinfo | 6 +++---
9 files changed, 16 insertions(+), 94 deletions(-)
delete mode 100644 py-tsid/patches/patch-aa
delete mode 100644 py-tsid/patches/patch-ac
diff --git a/py-tsid/Makefile b/py-tsid/Makefile
index 9a75001c..43153a38 100644
--- a/py-tsid/Makefile
+++ b/py-tsid/Makefile
@@ -4,23 +4,17 @@
ORG= stack-of-tasks
NAME= tsid
-VERSION= 1.2.2
+VERSION= 1.2.3
CATEGORIES= wip
COMMENT= Efficient Inverse Dynamics based on Pinocchio (python bindings)
-LICENSE= 2-clause-bsd
-MAINTAINER= gepetto-soft@laas.fr
USE_BOOST_LIBS= unit_test_framework
-USE_PYTHON= yes
+USE_PYTHON_ONLY= yes
# this does not support multiple parallel python version
CONFLICTS+= py[0-9][0-9]-${NAME}-[0-9]*
-CMAKE_ARGS+= -DINSTALL_DOCUMENTATION=OFF
-CMAKE_ARGS+= -DINSTALL_GENERATED_HEADERS=OFF
-CMAKE_ARGS+= -DINSTALL_PKG_CONFIG_FILE=OFF
-
include ../../devel/jrl-cmakemodules/Makefile.common
include ../../${CATEGORIES}/${NAME}/depend.mk
include ../../devel/boost-headers/depend.mk
diff --git a/py-tsid/PLIST b/py-tsid/PLIST
index 862d22e1..085671c1 100644
--- a/py-tsid/PLIST
+++ b/py-tsid/PLIST
@@ -1,30 +1,3 @@
-@comment Mon Mar 4 15:01:27 CET 2019
-include/tsid/bindings/python/constraint/constraint-bound.hpp
-include/tsid/bindings/python/constraint/constraint-equality.hpp
-include/tsid/bindings/python/constraint/constraint-inequality.hpp
-include/tsid/bindings/python/constraint/expose-constraints.hpp
-include/tsid/bindings/python/contacts/contact-6d.hpp
-include/tsid/bindings/python/contacts/contact-point.hpp
-include/tsid/bindings/python/contacts/expose-contact.hpp
-include/tsid/bindings/python/formulations/expose-formulations.hpp
-include/tsid/bindings/python/formulations/formulation.hpp
-include/tsid/bindings/python/robots/expose-robots.hpp
-include/tsid/bindings/python/robots/robot-wrapper.hpp
-include/tsid/bindings/python/solvers/HQPData.hpp
-include/tsid/bindings/python/solvers/HQPOutput.hpp
-include/tsid/bindings/python/solvers/expose-solvers.hpp
-include/tsid/bindings/python/solvers/solver-HQP-eiquadprog.hpp
-include/tsid/bindings/python/tasks/expose-tasks.hpp
-include/tsid/bindings/python/tasks/task-actuation-bounds.hpp
-include/tsid/bindings/python/tasks/task-am-equality.hpp
-include/tsid/bindings/python/tasks/task-com-equality.hpp
-include/tsid/bindings/python/tasks/task-joint-bounds.hpp
-include/tsid/bindings/python/tasks/task-joint-posture.hpp
-include/tsid/bindings/python/tasks/task-se3-equality.hpp
-include/tsid/bindings/python/trajectories/expose-trajectories.hpp
-include/tsid/bindings/python/trajectories/trajectory-base.hpp
-include/tsid/bindings/python/trajectories/trajectory-euclidian.hpp
-include/tsid/bindings/python/trajectories/trajectory-se3.hpp
-include/tsid/bindings/python/utils/container.hpp
+@comment Mon Mar 23 15:44:55 CET 2020
${PYTHON_SITELIB}/tsid/__init__.py
${PYTHON_SITELIB}/tsid/libtsid_pywrap.so
diff --git a/py-tsid/depend.mk b/py-tsid/depend.mk
index 6d83e003..84a5a3fd 100644
--- a/py-tsid/depend.mk
+++ b/py-tsid/depend.mk
@@ -14,7 +14,7 @@ ifeq (+,$(PY_TSID_DEPEND_MK)) # ------------------------------------------
PREFER.py-tsid?= robotpkg
SYSTEM_SEARCH.py-tsid=\
- '${PYTHON_SYSLIBSEARCH}/tsid/__init__.py'
+ '${PYTHON_SYSLIBSEARCH}/tsid.so'
DEPEND_USE+= py-tsid
diff --git a/py-tsid/distinfo b/py-tsid/distinfo
index 67ea1442..67944847 100644
--- a/py-tsid/distinfo
+++ b/py-tsid/distinfo
@@ -1,5 +1,3 @@
-SHA1 (tsid-1.2.2.tar.gz) = 15b2b2bd747bac8c88ffb52434d725f740facf0d
-RMD160 (tsid-1.2.2.tar.gz) = b921a355d6ee06e5e8ebfbd2e06bbc8172db8da2
-Size (tsid-1.2.2.tar.gz) = 9414313 bytes
-SHA1 (patch-aa) = ade66fdc5a9567b6113647d8437db86670444dc7
-SHA1 (patch-ac) = cbb0d033e963f3117cd74eaff26761a6cc3f281a
+SHA1 (tsid-1.2.3.tar.gz) = 4f9e5e4871a021c104abc4eebad8fc6c229d4308
+RMD160 (tsid-1.2.3.tar.gz) = d6ef7f2edb1603690560a3dde268736fbf197fc6
+Size (tsid-1.2.3.tar.gz) = 9414383 bytes
diff --git a/py-tsid/patches/patch-aa b/py-tsid/patches/patch-aa
deleted file mode 100644
index 49579bae..00000000
--- a/py-tsid/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
---- CMakeLists.txt.orig 2020-03-01 11:46:57.000000000 +0100
-+++ CMakeLists.txt 2020-03-01 14:13:37.990434348 +0100
-@@ -193,13 +193,9 @@
- LIST(APPEND HEADERS_FULL_PATH "${CMAKE_SOURCE_DIR}/${header}")
- GET_FILENAME_COMPONENT(headerName ${header} NAME)
- GET_FILENAME_COMPONENT(headerPath ${header} PATH)
-- INSTALL(FILES ${${PROJECT_NAME}_SOURCE_DIR}/${header}
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/${headerPath}
-- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE)
- ENDFOREACH(header ${HEADERS})
-
- # --- MAIN LIBRARY -------------------------------------------------------------
--ADD_SUBDIRECTORY(src)
-
- # --- BINDINGS ----------------------------------------------------------------
- IF(BUILD_PYTHON_INTERFACE)
diff --git a/py-tsid/patches/patch-ac b/py-tsid/patches/patch-ac
deleted file mode 100644
index 9823f51d..00000000
--- a/py-tsid/patches/patch-ac
+++ /dev/null
@@ -1,30 +0,0 @@
---- CMakeLists.txt.orig 2020-03-01 11:46:57.000000000 +0100
-+++ CMakeLists.txt 2020-03-01 14:17:32.940105405 +0100
-@@ -83,6 +83,7 @@
- #find_package(catkin QUIET COMPONENTS pinocchio)
-
- ADD_REQUIRED_DEPENDENCY("pinocchio >= 2.2.0")
-+ADD_REQUIRED_DEPENDENCY("tsid >= 1.2.2")
-
- SET(BOOST_REQUIERED_COMPONENTS filesystem system)
- SET(BOOST_BUILD_COMPONENTS unit_test_framework)
---- bindings/python/CMakeLists.txt.orig 2020-03-01 11:46:57.000000000 +0100
-+++ bindings/python/CMakeLists.txt 2020-03-01 14:17:43.320002318 +0100
-@@ -112,6 +112,7 @@
- ADD_SOURCE_GROUP(${PYWRAP}_SOURCES)
- PKG_CONFIG_USE_DEPENDENCY(${PYWRAP} eigenpy)
- PKG_CONFIG_USE_DEPENDENCY(${PYWRAP} pinocchio)
-+PKG_CONFIG_USE_DEPENDENCY(${PYWRAP} tsid)
-
- TARGET_LINK_LIBRARIES(${PYWRAP} ${PROJECT_NAME})
- TARGET_LINK_BOOST_PYTHON(${PYWRAP})
---- unittest/CMakeLists.txt.orig 2020-03-01 11:46:57.000000000 +0100
-+++ unittest/CMakeLists.txt 2020-03-01 14:17:55.651879822 +0100
-@@ -41,6 +41,7 @@
- FOREACH(PKG ${PKGS})
- PKG_CONFIG_USE_DEPENDENCY(${NAME} ${PKG})
- ENDFOREACH(PKG)
-+ PKG_CONFIG_USE_DEPENDENCY(${NAME} tsid)
-
- TARGET_LINK_LIBRARIES(${NAME} ${PROJECT_NAME})
- TARGET_LINK_LIBRARIES(${NAME} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
diff --git a/tsid/Makefile b/tsid/Makefile
index cca450ca..c7062418 100644
--- a/tsid/Makefile
+++ b/tsid/Makefile
@@ -4,12 +4,10 @@
ORG= stack-of-tasks
NAME= tsid
-VERSION= 1.2.2
+VERSION= 1.2.3
CATEGORIES= wip
COMMENT= Efficient Inverse Dynamics based on Pinocchio
-LICENSE= 2-clause-bsd
-MAINTAINER= gepetto-soft@laas.fr
CMAKE_ARGS+= -DBUILD_PYTHON_INTERFACE=OFF
diff --git a/tsid/PLIST b/tsid/PLIST
index 49ddd673..7a1cbb23 100644
--- a/tsid/PLIST
+++ b/tsid/PLIST
@@ -53,5 +53,10 @@ include/tsid/utils/Stdafx.hh
include/tsid/utils/statistics.hpp
include/tsid/utils/stop-watch.hpp
include/tsid/warning.hh
+lib/cmake/tsid/tsidConfig.cmake
+lib/cmake/tsid/tsidConfigVersion.cmake
+lib/cmake/tsid/tsidTargets-release.cmake
+lib/cmake/tsid/tsidTargets.cmake
lib/libtsid.so
+lib/libtsid.so.${PKGVERSION}
lib/pkgconfig/tsid.pc
diff --git a/tsid/distinfo b/tsid/distinfo
index 8f6f6ae7..67944847 100644
--- a/tsid/distinfo
+++ b/tsid/distinfo
@@ -1,3 +1,3 @@
-SHA1 (tsid-1.2.2.tar.gz) = 15b2b2bd747bac8c88ffb52434d725f740facf0d
-RMD160 (tsid-1.2.2.tar.gz) = b921a355d6ee06e5e8ebfbd2e06bbc8172db8da2
-Size (tsid-1.2.2.tar.gz) = 9414313 bytes
+SHA1 (tsid-1.2.3.tar.gz) = 4f9e5e4871a021c104abc4eebad8fc6c229d4308
+RMD160 (tsid-1.2.3.tar.gz) = d6ef7f2edb1603690560a3dde268736fbf197fc6
+Size (tsid-1.2.3.tar.gz) = 9414383 bytes
--
GitLab