From b7bd015f63f807312d719f4bb899a3a7b53f5b4b Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Mon, 23 Mar 2020 23:38:36 +0100
Subject: [PATCH] =?UTF-8?q?[wip/{=20=E2=86=92=20py-}prf-ros-control]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Affected packages:
- wip/pal-hardware-gazebo-melodic
- wip/pal-hardware-gazebo
- wip/play-motion
- wip/pal-transmissions
- wip/prf-ros-controllers
- wip/talos-dev
- wip/pal-hardware-interfaces
- wip/prf-teleop-tools
- wip/py-roscontrol-sot
- wip/prf-gazebo-ros-pkgs-melodic
- wip/prf-gazebo-ros-pkgs
---
Makefile | 2 +-
pal-hardware-gazebo-melodic/Makefile | 2 +-
pal-hardware-gazebo/Makefile | 2 +-
pal-hardware-interfaces/Makefile | 4 +-
pal-transmissions/Makefile | 2 +-
play-motion/Makefile | 2 +-
prf-gazebo-ros-pkgs-melodic/Makefile | 2 +-
prf-gazebo-ros-pkgs/Makefile | 2 +-
prf-ros-controllers/Makefile | 2 +-
prf-teleop-tools/Makefile | 2 +-
py-pal-statistics/Makefile | 2 -
{prf-ros-control => py-prf-ros-control}/DESCR | 0
.../Makefile | 47 +++++++++++--------
{prf-ros-control => py-prf-ros-control}/PLIST | 0
.../depend.mk | 21 +++++----
.../distinfo | 0
py-roscontrol-sot/Makefile | 4 +-
talos-dev/Makefile | 2 +-
18 files changed, 52 insertions(+), 46 deletions(-)
rename {prf-ros-control => py-prf-ros-control}/DESCR (100%)
rename {prf-ros-control => py-prf-ros-control}/Makefile (59%)
rename {prf-ros-control => py-prf-ros-control}/PLIST (100%)
rename {prf-ros-control => py-prf-ros-control}/depend.mk (89%)
rename {prf-ros-control => py-prf-ros-control}/distinfo (100%)
diff --git a/Makefile b/Makefile
index de535e03..cf64a6fa 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,6 @@ SUBDIR+= pmb2-simulation
SUBDIR+= prf-gazebo-ros-pkgs
SUBDIR+= prf-gazebo-ros-pkgs-melodic
SUBDIR+= prf-roboticsgroup-gazebo-plugins
-SUBDIR+= prf-ros-control
SUBDIR+= prf-ros-controllers
SUBDIR+= prf-teleop-tools
SUBDIR+= py-bmtools
@@ -100,6 +99,7 @@ SUBDIR+= py-ospi
SUBDIR+= py-pal
SUBDIR+= py-pal-statistics
SUBDIR+= py-parametric-curves
+SUBDIR+= py-prf-ros-control
SUBDIR+= py-qpoases
SUBDIR+= py-qt-gepetto-pythonqt
SUBDIR+= py-quadprog
diff --git a/pal-hardware-gazebo-melodic/Makefile b/pal-hardware-gazebo-melodic/Makefile
index fd3d78e9..49d3eceb 100644
--- a/pal-hardware-gazebo-melodic/Makefile
+++ b/pal-hardware-gazebo-melodic/Makefile
@@ -39,7 +39,7 @@ include ../../middleware/ros-comm/depend.mk
include ../../wip/pal-hardware-interfaces/depend.mk
include ../../wip/py-pal-statistics/depend.mk
include ../../wip/prf-gazebo-ros-pkgs-melodic/depend.mk
-include ../../wip/prf-ros-control/depend.mk
+include ../../wip/py-prf-ros-control/depend.mk
include ../../wip/dynamic-introspection/depend.mk
include ../../motion/ros-control-toolbox/depend.mk
include ../../mk/language/c++.mk
diff --git a/pal-hardware-gazebo/Makefile b/pal-hardware-gazebo/Makefile
index cce5f4f9..fc674d46 100644
--- a/pal-hardware-gazebo/Makefile
+++ b/pal-hardware-gazebo/Makefile
@@ -37,7 +37,7 @@ include ../../middleware/ros-comm/depend.mk
include ../../wip/pal-hardware-interfaces/depend.mk
include ../../wip/py-pal-statistics/depend.mk
include ../../wip/prf-gazebo-ros-pkgs/depend.mk
-include ../../wip/prf-ros-control/depend.mk
+include ../../wip/py-prf-ros-control/depend.mk
include ../../wip/dynamic-introspection/depend.mk
include ../../motion/ros-control-toolbox/depend.mk
include ../../mk/language/c++.mk
diff --git a/pal-hardware-interfaces/Makefile b/pal-hardware-interfaces/Makefile
index 17810514..928d7c47 100644
--- a/pal-hardware-interfaces/Makefile
+++ b/pal-hardware-interfaces/Makefile
@@ -41,10 +41,10 @@ ifeq (erbium,${PREFER.pal-distro})
ifeq (palerbium,${PALDISTRO})
CMAKE_PREFIX_PATH+=/opt/pal/erbium
else
- include ../../wip/prf-ros-control/depend.mk
+ include ../../wip/py-prf-ros-control/depend.mk
endif
else
- include ../../wip/prf-ros-control/depend.mk
+ include ../../wip/py-prf-ros-control/depend.mk
endif
include ../../mk/language/c++.mk
include ../../mk/language/c.mk
diff --git a/pal-transmissions/Makefile b/pal-transmissions/Makefile
index d15ea59e..56a91ac1 100644
--- a/pal-transmissions/Makefile
+++ b/pal-transmissions/Makefile
@@ -34,7 +34,7 @@ include ../../interfaces/ros-std-msgs/depend.mk
include ../../lang/ros-message-generation/depend.mk
include ../../lang/ros-message-runtime/depend.mk
include ../../middleware/ros-comm/depend.mk
-include ../../wip/prf-ros-control/depend.mk
+include ../../wip/py-prf-ros-control/depend.mk
include ../../mk/language/c++.mk
include ../../mk/language/c.mk
include ../../mk/robotpkg.mk
diff --git a/play-motion/Makefile b/play-motion/Makefile
index 21a8f5d3..a15c34a3 100644
--- a/play-motion/Makefile
+++ b/play-motion/Makefile
@@ -39,7 +39,7 @@ include ../../wip/sysdep/ubuntu-distro.mk
ifeq (bionic,${UBUNTUDISTRO})
include ../../wip/ros-moveit/depend.mk
endif
-include ../../wip/prf-ros-control/depend.mk
+include ../../wip/py-prf-ros-control/depend.mk
include ../../mk/language/c++.mk
include ../../mk/language/c.mk
include ../../mk/robotpkg.mk
diff --git a/prf-gazebo-ros-pkgs-melodic/Makefile b/prf-gazebo-ros-pkgs-melodic/Makefile
index c2f9dce5..1e2805b0 100644
--- a/prf-gazebo-ros-pkgs-melodic/Makefile
+++ b/prf-gazebo-ros-pkgs-melodic/Makefile
@@ -51,7 +51,7 @@ include ../../middleware/ros-actionlib/depend.mk
include ../../middleware/ros-comm/depend.mk
include ../../motion/ros-control-toolbox/depend.mk
include ../../sysutils/ros-diagnostics/depend.mk
-include ../../wip/prf-ros-control/depend.mk
+include ../../wip/py-prf-ros-control/depend.mk
include ../../mk/sysdep/gazebo.mk
include ../../mk/sysdep/libogre.mk
include ../../mk/language/c++.mk
diff --git a/prf-gazebo-ros-pkgs/Makefile b/prf-gazebo-ros-pkgs/Makefile
index 6347697b..b594c0b5 100644
--- a/prf-gazebo-ros-pkgs/Makefile
+++ b/prf-gazebo-ros-pkgs/Makefile
@@ -52,7 +52,7 @@ include ../../middleware/ros-actionlib/depend.mk
include ../../middleware/ros-comm/depend.mk
include ../../motion/ros-control-toolbox/depend.mk
include ../../sysutils/ros-diagnostics/depend.mk
-include ../../wip/prf-ros-control/depend.mk
+include ../../wip/py-prf-ros-control/depend.mk
include ../../mk/sysdep/gazebo.mk
include ../../mk/sysdep/libogre.mk
include ../../mk/language/c++.mk
diff --git a/prf-ros-controllers/Makefile b/prf-ros-controllers/Makefile
index ecc4351f..8173346a 100644
--- a/prf-ros-controllers/Makefile
+++ b/prf-ros-controllers/Makefile
@@ -32,7 +32,7 @@ CMAKE_PREFIX_PATH+= /opt/ros/melodic
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
-include ../../wip/prf-ros-control/depend.mk
+include ../../wip/py-prf-ros-control/depend.mk
include ../../devel/ros-catkin/depend.mk
include ../../devel/ros-cmake-modules/depend.mk
include ../../devel/ros-pluginlib/depend.mk
diff --git a/prf-teleop-tools/Makefile b/prf-teleop-tools/Makefile
index 2c903b56..a4d51546 100644
--- a/prf-teleop-tools/Makefile
+++ b/prf-teleop-tools/Makefile
@@ -32,7 +32,7 @@ CMAKE_PREFIX_PATH+= ${PREFIX}
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
-include ../../wip/prf-ros-control/depend.mk
+include ../../wip/py-prf-ros-control/depend.mk
include ../../devel/ros-catkin/depend.mk
include ../../devel/ros-pluginlib/depend.mk
include ../../devel/ros-ros/depend.mk
diff --git a/py-pal-statistics/Makefile b/py-pal-statistics/Makefile
index 2b813291..3654c8ac 100644
--- a/py-pal-statistics/Makefile
+++ b/py-pal-statistics/Makefile
@@ -26,8 +26,6 @@ MASTER_SITES= ${HOMEPAGE}/archive/
COMMENT= Provides statistics
LICENSE= gnu-gpl-v3
-USE_BOOST_LIBS= thread
-
ROS_METAPKG= yes
USE_BOOST_LIBS= thread
diff --git a/prf-ros-control/DESCR b/py-prf-ros-control/DESCR
similarity index 100%
rename from prf-ros-control/DESCR
rename to py-prf-ros-control/DESCR
diff --git a/prf-ros-control/Makefile b/py-prf-ros-control/Makefile
similarity index 59%
rename from prf-ros-control/Makefile
rename to py-prf-ros-control/Makefile
index 2e54b94f..3b377184 100644
--- a/prf-ros-control/Makefile
+++ b/py-prf-ros-control/Makefile
@@ -1,30 +1,36 @@
-# robotpkg Makefile for: wip/pdf-ros-control
+# robotpkg Makefile for: wip/py-prf-ros-control
# Created: Olivier Stasse on Wed, 27 Apr 2018
#
-ORG= pal-robotics-forks
-VERSION= 0.2.8
-PRFNAME= ros-control
-PKGBASE= prf-${PRFNAME}
-PKGNAME= ${PKGBASE}-${VERSION}
-DISTNAME= ${VERSION}
-ROSNAME= $(subst -,_,${PRFNAME})
-WRKSRC= ${WRKDIR}/${ROSNAME}-${VERSION}
-DIST_SUBDIR= ${PKGBASE}
+#
+ORG= pal-robotics-forks
+VERSION= 0.2.8
+PRFNAME= ros-control
+PKGBASE= prf-${PRFNAME}
+PKGNAME= ${PKGTAG.python-}${PKGBASE}-${VERSION}
+DISTNAME= ${VERSION}
+ROSNAME= $(subst -,_,${PRFNAME})
+WRKSRC= ${WRKDIR}/${ROSNAME}-${VERSION}
+DIST_SUBDIR= ${PKGBASE}
+PKGREVISION= 1
-CATEGORIES= wip
-MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}.git
-CHECKOUT_VCS_OPTS+= --recursive
+# old package name and other Python versions
+CONFLICTS= ${PKGBBASE}-[0-9]*
+CONFLICTS+= py[0-9][0-9]-${PKGBBASE}-[0-9]*
+CONFLICTS+= ros-control-[0-9]*
-HOMEPAGE= ${MASTER_SITE_GITHUB:=${ORG}/${ROSNAME}}
-MASTER_SITES= ${HOMEPAGE}/archive/
-COMMENT= ros_control package with torque sensors
-LICENSE= 2-clause-bsd
+CATEGORIES= wip
+
+MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}.git
+CHECKOUT_VCS_OPTS+= --recursive
-CONFLICTS+= ros-control-[0-9]*
+HOMEPAGE= ${MASTER_SITE_GITHUB:=${ORG}/${ROSNAME}}
+MASTER_SITES= ${HOMEPAGE}/archive/
+COMMENT= ros_control package with torque sensors
+LICENSE= 2-clause-bsd
-ROS_METAPKG= yes
-USE_BOOST_LIBS= thread
+ROS_METAPKG= yes
+USE_BOOST_LIBS= thread
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
@@ -44,6 +50,7 @@ include ../../middleware/ros-comm/depend.mk
include ../../motion/ros-control-toolbox/depend.mk
include ../../net/ros-resource-retriever/depend.mk
include ../../sysutils/py-rospkg/depend.mk
+include ../../mk/sysdep/python.mk
include ../../mk/language/c++.mk
include ../../mk/language/c.mk
include ../../mk/robotpkg.mk
diff --git a/prf-ros-control/PLIST b/py-prf-ros-control/PLIST
similarity index 100%
rename from prf-ros-control/PLIST
rename to py-prf-ros-control/PLIST
diff --git a/prf-ros-control/depend.mk b/py-prf-ros-control/depend.mk
similarity index 89%
rename from prf-ros-control/depend.mk
rename to py-prf-ros-control/depend.mk
index e5d0dc7a..d75fd365 100644
--- a/prf-ros-control/depend.mk
+++ b/py-prf-ros-control/depend.mk
@@ -1,24 +1,24 @@
-# robotpkg depend.mk for: wip/prf-ros-control
+# robotpkg depend.mk for: wip/py-prf-ros-control
# Created: Olivier Stasse on Wed, 29 Mar 2017
#
DEPEND_DEPTH:= ${DEPEND_DEPTH}+
-ROS_CONTROL_DEPEND_MK:= ${ROS_CONTROL_DEPEND_MK}+
+PY_PRF_ROS_CONTROL_DEPEND_MK:= ${PY_PRF_ROS_CONTROL_DEPEND_MK}+
ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+= prf-ros-control
+DEPEND_PKG+= py-prf-ros-control
endif
-ifeq (+,$(ROS_CONTROL_DEPEND_MK)) # ----------------------------------
+ifeq (+,$(PY_PRF_ROS_CONTROL_DEPEND_MK)) # ----------------------------------
-PREFER.prf-ros-control?= robotpkg
+PREFER.py-prf-ros-control?= robotpkg
-DEPEND_USE+= prf-ros-control
+DEPEND_USE+= py-prf-ros-control
-DEPEND_ABI.prf-ros-control?= prf-ros-control>=0.2
-DEPEND_DIR.prf-ros-control?= ../../wip/prf-ros-control
+DEPEND_ABI.py-prf-ros-control?= py-prf-ros-control>=0.2
+DEPEND_DIR.py-prf-ros-control?= ../../wip/py-prf-ros-control
-SYSTEM_SEARCH.prf-ros-control=\
+SYSTEM_SEARCH.py-prf-ros-control=\
'include/controller_manager/controller_loader.h' \
'include/controller_interface/controller.h' \
'include/controller_interface/controller_base.h' \
@@ -93,6 +93,7 @@ SYSTEM_SEARCH.prf-ros-control=\
'lib/libtransmission_interface_loader_plugins.so' \
'lib/libtransmission_interface_parser.so' \
'share/ros_control/package.xml:/<version>/s/[^0-9.]//gp' \
+ '${PYTHON_SYSLIBSEARCH}/controller_manager/__init__.py \
$(foreach _, \
controller_interface \
rqt_controller_manager \
@@ -106,6 +107,6 @@ SYSTEM_SEARCH.prf-ros-control=\
'share/$_/cmake/$_Config.cmake' \
'lib/pkgconfig/$_.pc:/Version/s/[^0-9.]//gp')
-endif # ROS_CONTROL_DEPEND_MK ----------------------------------------
+endif # PY_PRF_ROS_CONTROL_DEPEND_MK ----------------------------------------
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
diff --git a/prf-ros-control/distinfo b/py-prf-ros-control/distinfo
similarity index 100%
rename from prf-ros-control/distinfo
rename to py-prf-ros-control/distinfo
diff --git a/py-roscontrol-sot/Makefile b/py-roscontrol-sot/Makefile
index b3a5932d..b9cf3ca5 100644
--- a/py-roscontrol-sot/Makefile
+++ b/py-roscontrol-sot/Makefile
@@ -60,12 +60,12 @@ ifeq (erbium,${PREFER.pal-distro})
PKG_CONFIG_DIRS=/opt/pal/erbium/lib/pkgconfig
else
include ../../wip/pal-hardware-interfaces/depend.mk
- include ../../wip/prf-ros-control/depend.mk
+ include ../../wip/py-prf-ros-control/depend.mk
include ../../wip/prf-ros-controllers/depend.mk
endif
else
include ../../wip/pal-hardware-interfaces/depend.mk
- include ../../wip/prf-ros-control/depend.mk
+ include ../../wip/py-prf-ros-control/depend.mk
include ../../wip/prf-ros-controllers/depend.mk
endif
diff --git a/talos-dev/Makefile b/talos-dev/Makefile
index 8105dbab..dba22e9f 100644
--- a/talos-dev/Makefile
+++ b/talos-dev/Makefile
@@ -12,7 +12,7 @@ META_PACKAGE= yes
include ../../interfaces/humanoid-nav-msgs/depend.mk
include ../../wip/py-sot-talos/depend.mk
-include ../../wip/prf-ros-control/depend.mk
+include ../../wip/py-prf-ros-control/depend.mk
include ../../wip/sysdep/ubuntu-distro.mk
ifeq (xenial,${UBUNTUDISTRO})
--
GitLab