From 9bf62c2ff0028a38c3ea53e5791ffee91ecd776f Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Mon, 23 Mar 2020 16:12:43 +0100
Subject: [PATCH] [wip/py-dynamic-graph-bridge-v3] Update to v3.3.1
Changes since v3.3.0:
- fix imports for python 3
- Remove dependency to bullet.
- CMake: export project and use exports from dependencies
- CMake: keep minimal required instructions
---
py-dynamic-graph-bridge-v3/Makefile | 25 ++++++++-------------
py-dynamic-graph-bridge-v3/PLIST | 33 ++++++++++------------------
py-dynamic-graph-bridge-v3/depend.mk | 8 +++----
py-dynamic-graph-bridge-v3/distinfo | 6 ++---
4 files changed, 28 insertions(+), 44 deletions(-)
diff --git a/py-dynamic-graph-bridge-v3/Makefile b/py-dynamic-graph-bridge-v3/Makefile
index f9a68a61..c8db5eb2 100644
--- a/py-dynamic-graph-bridge-v3/Makefile
+++ b/py-dynamic-graph-bridge-v3/Makefile
@@ -3,42 +3,35 @@
ORG= stack-of-tasks
NAME= dynamic-graph-bridge
-VERSION= 3.3.0
+VERSION= 3.3.1
ROSNAME= $(subst -,_,${NAME})
-DISTNAME= ${ROSNAME}-v3-${VERSION}
+DISTNAME= ${ROSNAME}-${VERSION}
PKGNAME= ${PKGTAG.python-}${NAME}-v3-${VERSION}
-# Specifying the source repository
-MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=${NAME}/}
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${ROSNAME}.git
-CHECKOUT_VCS_OPTS+= --recursive
CATEGORIES= wip
COMMENT= This ROS package binds together the ROS framework with the dynamic-graph real-time control architecture.
-LICENSE= 2-clause-bsd
-MAINTAINER= gepetto-soft@laas.fr
CONFLICTS+= ${ROSNAME}
CONFLICTS+= py[0-9][0-9]-${ROSNAME}
-CMAKE_ARGS+= -DINSTALL_DOCUMENTATION=OFF
-# Needed for robotpkg to install in site-packages
-CMAKE_ARGS+= -DSETUPTOOLS_DEB_LAYOUT=OFF
-# Needed for dynamic_graph_bridge to be installed in site-packages
-CMAKE_ARGS+= -DPYTHON_STANDARD_LAYOUT=ON
+USE_PYTHON= true
+
CMAKE_ARGS+= -DCXX_DISABLE_WERROR=ON
-DYNAMIC_PLIST_DIRS+= share/doc/doxygen-html
-DYNAMIC_PLIST_DIRS+= share/gennodejs/ros/${ROSNAME}
-DYNAMIC_PLIST_DIRS+= share/roseus/ros/${ROSNAME}
-DYNAMIC_PLIST_DIRS+= share/commonlisp/ros/${ROSNAME}
+DYNAMIC_PLIST_DIRS+= share/doc/${ROSNAME}
include ../../devel/jrl-cmakemodules/Makefile.common
include ../../devel/ros-catkin/depend.mk
include ../../devel/ros-realtime-tools/depend.mk
include ../../devel/ros-roscpp-core/depend.mk
include ../../interfaces/ros-common-msgs/depend.mk
+include ../../math/pinocchio/depend.mk
+include ../../math/py-pinocchio/depend.mk
+include ../../path/hpp-fcl/depend.mk
+include ../../path/py-hpp-fcl/depend.mk
include ../../math/ros-geometry2/depend.mk
include ../../math/ros-geometry/depend.mk
include ../../motion/dynamic-graph-bridge-msgs/depend.mk
diff --git a/py-dynamic-graph-bridge-v3/PLIST b/py-dynamic-graph-bridge-v3/PLIST
index c2d197af..f2749e92 100644
--- a/py-dynamic-graph-bridge-v3/PLIST
+++ b/py-dynamic-graph-bridge-v3/PLIST
@@ -1,7 +1,5 @@
@comment Tue Sep 4 16:54:15 CEST 2018
-include/dynamic_graph_bridge/RunPythonFile.h
-include/dynamic_graph_bridge/RunPythonFileRequest.h
-include/dynamic_graph_bridge/RunPythonFileResponse.h
+bin/geometric_simu
include/dynamic_graph_bridge/config.hh
include/dynamic_graph_bridge/deprecated.hh
include/dynamic_graph_bridge/ros_init.hh
@@ -9,15 +7,21 @@ include/dynamic_graph_bridge/ros_interpreter.hh
include/dynamic_graph_bridge/sot_loader.hh
include/dynamic_graph_bridge/sot_loader_basic.hh
include/dynamic_graph_bridge/warning.hh
+include/src/converter.hh
+include/src/sot_to_ros.hh
+lib/cmake/dynamic_graph_bridge/dynamic_graph_bridgeConfig.cmake
+lib/cmake/dynamic_graph_bridge/dynamic_graph_bridgeConfigVersion.cmake
+lib/cmake/dynamic_graph_bridge/dynamic_graph_bridgeTargets-release.cmake
+lib/cmake/dynamic_graph_bridge/dynamic_graph_bridgeTargets.cmake
+lib/dynamic-graph-plugins/libros_publish.so
+lib/dynamic-graph-plugins/libros_queued_subscribe.so
+lib/dynamic-graph-plugins/libros_subscribe.so
+lib/dynamic-graph-plugins/libros_tf_listener.so
+lib/dynamic-graph-plugins/libros_time.so
lib/libros_bridge.so
lib/libros_interpreter.so
lib/libsot_loader.so
lib/pkgconfig/dynamic_graph_bridge.pc
-lib/plugin/ros_publish.so
-lib/plugin/ros_queued_subscribe.so
-lib/plugin/ros_subscribe.so
-lib/plugin/ros_tf_listener.so
-lib/plugin/ros_time.so
${PYTHON_SITELIB}/dynamic_graph/ros/__init__.py
${PYTHON_SITELIB}/dynamic_graph/ros/dgcompleter.py
${PYTHON_SITELIB}/dynamic_graph/ros/ros.py
@@ -31,21 +35,8 @@ ${PYTHON_SITELIB}/dynamic_graph/ros/ros_tf_listener/__init__.py
${PYTHON_SITELIB}/dynamic_graph/ros/ros_tf_listener/wrap.so
${PYTHON_SITELIB}/dynamic_graph/ros/ros_time/__init__.py
${PYTHON_SITELIB}/dynamic_graph/ros/ros_time/wrap.so
-${PYTHON_SITELIB}/dynamic_graph_bridge/__init__.py
-${PYTHON_SITELIB}/dynamic_graph_bridge/srv/_RunPythonFile.py
-${PYTHON_SITELIB}/dynamic_graph_bridge/srv/__init__.py
-share/common-lisp/ros/dynamic_graph_bridge/srv/RunPythonFile.lisp
-share/common-lisp/ros/dynamic_graph_bridge/srv/_package.lisp
-share/common-lisp/ros/dynamic_graph_bridge/srv/_package_RunPythonFile.lisp
-share/common-lisp/ros/dynamic_graph_bridge/srv/dynamic_graph_bridge-srv.asd
-share/dynamic_graph_bridge/cmake/dynamic_graph_bridge-msg-extras.cmake
-share/dynamic_graph_bridge/cmake/dynamic_graph_bridge-msg-paths.cmake
-share/dynamic_graph_bridge/cmake/dynamic_graph_bridgeConfig-version.cmake
-share/dynamic_graph_bridge/cmake/dynamic_graph_bridgeConfig.cmake
-share/dynamic_graph_bridge/geometric_simu
share/dynamic_graph_bridge/manifest.xml
share/dynamic_graph_bridge/package.xml
share/dynamic_graph_bridge/robot_pose_publisher
share/dynamic_graph_bridge/run_command
-share/dynamic_graph_bridge/srv/RunPythonFile.srv
share/dynamic_graph_bridge/tf_publisher
diff --git a/py-dynamic-graph-bridge-v3/depend.mk b/py-dynamic-graph-bridge-v3/depend.mk
index d7f53d34..8373a30b 100644
--- a/py-dynamic-graph-bridge-v3/depend.mk
+++ b/py-dynamic-graph-bridge-v3/depend.mk
@@ -19,10 +19,10 @@ DEPEND_ABI.py-dynamic-graph-bridge-v3?= ${PKGTAG.python-}dynamic-graph-bridge-v
DEPEND_DIR.py-dynamic-graph-bridge-v3?= ../../wip/py-dynamic-graph-bridge-v3
SYSTEM_SEARCH.py-dynamic-graph-bridge-v3=\
- 'include/dynamic_graph_bridge/config.hh' \
- 'lib/pkgconfig/dynamic_graph_bridge.pc:/Version/s/[^0-9.]//gp' \
- 'share/dynamic_graph_bridge/robot_pose_publisher' \
- 'share/dynamic_graph_bridge/cmake/dynamic_graph_bridgeConfig.cmake' \
+ 'include/dynamic_graph_bridge/config.hh:/DYNAMIC_GRAPH_BRIDGE_VERSION /s/[^0-9.]//gp' \
+ 'lib/pkgconfig/dynamic_graph_bridge.pc:/Version/s/[^0-9.]//gp' \
+ 'lib/cmake/dynamic_graph_bridge/dynamic_graph_bridgeConfigVersion.cmake:/PACKAGE_VERSION/s/[^0-9.]//gp' \
+ 'share/dynamic_graph_bridge/robot_pose_publisher' \
'${PYTHON_SITELIB}/dynamic_graph/ros/ros.py'
diff --git a/py-dynamic-graph-bridge-v3/distinfo b/py-dynamic-graph-bridge-v3/distinfo
index 1175936f..844c5338 100644
--- a/py-dynamic-graph-bridge-v3/distinfo
+++ b/py-dynamic-graph-bridge-v3/distinfo
@@ -1,3 +1,3 @@
-SHA1 (dynamic_graph_bridge-v3-3.3.0.tar.gz) = d3e19eaf0598bf4c445ed40d70d96e7423986a4a
-RMD160 (dynamic_graph_bridge-v3-3.3.0.tar.gz) = d5f4680f0031560c17c4ae9e7800901722e7cd90
-Size (dynamic_graph_bridge-v3-3.3.0.tar.gz) = 813447 bytes
+SHA1 (dynamic_graph_bridge-3.3.1.tar.gz) = 8467c345a2e14ddb472a80090557e5c2e4c26ec1
+RMD160 (dynamic_graph_bridge-3.3.1.tar.gz) = 6a448263e4b11769e500e7c363e93d7ef98aa570
+Size (dynamic_graph_bridge-3.3.1.tar.gz) = 851450 bytes
--
GitLab