From 088953bc6141ca12f4543949775433b4c7ab0f5c Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 5 Nov 2019 14:24:33 +0100
Subject: [PATCH] =?UTF-8?q?[wip/{=20=E2=86=92=20py-}hpp-rbprm]=20add=20PYT?=
=?UTF-8?q?HON=5FNOTAG=5FCONFLICT?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Makefile | 2 +-
hpp-rbprm/depend.mk | 30 ----------------------------
py-hpp-rbprm-corba/Makefile | 2 +-
{hpp-rbprm => py-hpp-rbprm}/DESCR | 0
{hpp-rbprm => py-hpp-rbprm}/Makefile | 11 +++++-----
{hpp-rbprm => py-hpp-rbprm}/PLIST | 0
py-hpp-rbprm/depend.mk | 30 ++++++++++++++++++++++++++++
{hpp-rbprm => py-hpp-rbprm}/distinfo | 0
8 files changed, 38 insertions(+), 37 deletions(-)
delete mode 100644 hpp-rbprm/depend.mk
rename {hpp-rbprm => py-hpp-rbprm}/DESCR (100%)
rename {hpp-rbprm => py-hpp-rbprm}/Makefile (84%)
rename {hpp-rbprm => py-hpp-rbprm}/PLIST (100%)
create mode 100644 py-hpp-rbprm/depend.mk
rename {hpp-rbprm => py-hpp-rbprm}/distinfo (100%)
diff --git a/Makefile b/Makefile
index faa49732..e9a38a49 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,6 @@ SUBDIR+= hey5-description
SUBDIR+= histodet
SUBDIR+= hpp-affordance
SUBDIR+= hpp-benchmark
-SUBDIR+= hpp-rbprm
SUBDIR+= hpp-rbprm-robot-data
SUBDIR+= hpp-romeo
SUBDIR+= hpp-spline
@@ -93,6 +92,7 @@ SUBDIR+= py-hpp-bezier-com-traj
SUBDIR+= py-hpp-centroidal-dynamics
SUBDIR+= py-hpp-environments
SUBDIR+= py-hpp-hrp2
+SUBDIR+= py-hpp-rbprm
SUBDIR+= py-hpp-rbprm-corba
SUBDIR+= py-mavlink
SUBDIR+= py-morse
diff --git a/hpp-rbprm/depend.mk b/hpp-rbprm/depend.mk
deleted file mode 100644
index 3cbf4e5a..00000000
--- a/hpp-rbprm/depend.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# robotpkg depend.mk for: wip/hpp-rbprm
-# Created: Guilhem Saurel on Wed, 30 Jan 2019
-#
-
-DEPEND_DEPTH:= ${DEPEND_DEPTH}+
-HPP_RBPRM_DEPEND_MK:= ${HPP_RBPRM_DEPEND_MK}+
-
-ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+= hpp-rbprm
-endif
-
-ifeq (+,$(HPP_RBPRM_DEPEND_MK)) # --------------------------------------
-
-include ../../mk/sysdep/python.mk
-
-PREFER.hpp-rbprm?= robotpkg
-
-DEPEND_USE+= hpp-rbprm
-
-DEPEND_ABI.hpp-rbprm?= ${PKGTAG.python-}hpp-rbprm>=4.7.0
-DEPEND_DIR.hpp-rbprm?= ../../wip/hpp-rbprm
-
-SYSTEM_SEARCH.hpp-rbprm=\
- include/hpp/rbprm/config.hh \
- lib/libhpp-rbprm.so \
- 'lib/pkgconfig/hpp-rbprm.pc:/Version/s/[^0-9.]//gp'
-
-endif # HPP_RBPRM_DEPEND_MK --------------------------------------------
-
-DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
diff --git a/py-hpp-rbprm-corba/Makefile b/py-hpp-rbprm-corba/Makefile
index b6b1d395..285d9fc8 100644
--- a/py-hpp-rbprm-corba/Makefile
+++ b/py-hpp-rbprm-corba/Makefile
@@ -19,7 +19,7 @@ USE_PYTHON= true
include ../../meta-pkgs/hpp/Makefile.common
-include ../../wip/hpp-rbprm/depend.mk
+include ../../wip/py-hpp-rbprm/depend.mk
include ../../wip/py-hpp-affordance-corba/depend.mk
include ../../math/eigen3/depend.mk
diff --git a/hpp-rbprm/DESCR b/py-hpp-rbprm/DESCR
similarity index 100%
rename from hpp-rbprm/DESCR
rename to py-hpp-rbprm/DESCR
diff --git a/hpp-rbprm/Makefile b/py-hpp-rbprm/Makefile
similarity index 84%
rename from hpp-rbprm/Makefile
rename to py-hpp-rbprm/Makefile
index c81c60a7..eefd48e4 100644
--- a/hpp-rbprm/Makefile
+++ b/py-hpp-rbprm/Makefile
@@ -1,13 +1,14 @@
-# robotpkg Makefile for: wip/hpp-rbprm
+# robotpkg Makefile for: wip/py-hpp-rbprm
# Created: Guilhem Saurel on Wed, 30 Jan 2019
#
-HPP_PACKAGE= hpp-rbprm
-HPP_COMMENT= RB-PRM planner in HPP
+HPP_PACKAGE= hpp-rbprm
+HPP_COMMENT= RB-PRM planner in HPP
-CATEGORIES= wip
+CATEGORIES= wip
-USE_PYTHON= true
+USE_PYTHON= true
+PYTHON_NOTAG_CONFLICT= yes
include ../../meta-pkgs/hpp/Makefile.common
diff --git a/hpp-rbprm/PLIST b/py-hpp-rbprm/PLIST
similarity index 100%
rename from hpp-rbprm/PLIST
rename to py-hpp-rbprm/PLIST
diff --git a/py-hpp-rbprm/depend.mk b/py-hpp-rbprm/depend.mk
new file mode 100644
index 00000000..5bbc6ed7
--- /dev/null
+++ b/py-hpp-rbprm/depend.mk
@@ -0,0 +1,30 @@
+# robotpkg depend.mk for: wip/py-hpp-rbprm
+# Created: Guilhem Saurel on Wed, 30 Jan 2019
+#
+
+DEPEND_DEPTH:= ${DEPEND_DEPTH}+
+PY_HPP_RBPRM_DEPEND_MK:= ${PY_HPP_RBPRM_DEPEND_MK}+
+
+ifeq (+,$(DEPEND_DEPTH))
+DEPEND_PKG+= py-hpp-rbprm
+endif
+
+ifeq (+,$(PY_HPP_RBPRM_DEPEND_MK)) # --------------------------------------
+
+include ../../mk/sysdep/python.mk
+
+PREFER.py-hpp-rbprm?= robotpkg
+
+DEPEND_USE+= py-hpp-rbprm
+
+DEPEND_ABI.py-hpp-rbprm?= ${PKGTAG.python-}hpp-rbprm>=4.7.0
+DEPEND_DIR.py-hpp-rbprm?= ../../wip/py-hpp-rbprm
+
+SYSTEM_SEARCH.py-hpp-rbprm=\
+ include/hpp/rbprm/config.hh \
+ lib/libhpp-rbprm.so \
+ 'lib/pkgconfig/hpp-rbprm.pc:/Version/s/[^0-9.]//gp'
+
+endif # PY_HPP_RBPRM_DEPEND_MK --------------------------------------------
+
+DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
diff --git a/hpp-rbprm/distinfo b/py-hpp-rbprm/distinfo
similarity index 100%
rename from hpp-rbprm/distinfo
rename to py-hpp-rbprm/distinfo
--
GitLab