From e2ea0ecabfb23842b7cdd7870cdf6528544c58f5 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 5 Nov 2019 14:26:21 +0100
Subject: [PATCH] =?UTF-8?q?[wip/{=20=E2=86=92=20py-}hpp-rbprm-robot-data]?=
=?UTF-8?q?=20add=20PYTHON=5FNOTAG=5FCONFLICT?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Makefile | 2 +-
hpp-rbprm-robot-data/Makefile | 17 -----------
hpp-rbprm-robot-data/depend.mk | 29 -------------------
.../DESCR | 0
py-hpp-rbprm-robot-data/Makefile | 18 ++++++++++++
.../PLIST | 0
py-hpp-rbprm-robot-data/depend.mk | 29 +++++++++++++++++++
.../distinfo | 0
.../patches/patch-aa | 0
py-hpp-rbprm/Makefile | 2 +-
10 files changed, 49 insertions(+), 48 deletions(-)
delete mode 100644 hpp-rbprm-robot-data/Makefile
delete mode 100644 hpp-rbprm-robot-data/depend.mk
rename {hpp-rbprm-robot-data => py-hpp-rbprm-robot-data}/DESCR (100%)
create mode 100644 py-hpp-rbprm-robot-data/Makefile
rename {hpp-rbprm-robot-data => py-hpp-rbprm-robot-data}/PLIST (100%)
create mode 100644 py-hpp-rbprm-robot-data/depend.mk
rename {hpp-rbprm-robot-data => py-hpp-rbprm-robot-data}/distinfo (100%)
rename {hpp-rbprm-robot-data => py-hpp-rbprm-robot-data}/patches/patch-aa (100%)
diff --git a/Makefile b/Makefile
index e9a38a49..add99b2a 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,6 @@ SUBDIR+= hey5-description
SUBDIR+= histodet
SUBDIR+= hpp-affordance
SUBDIR+= hpp-benchmark
-SUBDIR+= hpp-rbprm-robot-data
SUBDIR+= hpp-romeo
SUBDIR+= hpp-spline
SUBDIR+= hpp-universal-robot
@@ -94,6 +93,7 @@ SUBDIR+= py-hpp-environments
SUBDIR+= py-hpp-hrp2
SUBDIR+= py-hpp-rbprm
SUBDIR+= py-hpp-rbprm-corba
+SUBDIR+= py-hpp-rbprm-robot-data
SUBDIR+= py-mavlink
SUBDIR+= py-morse
SUBDIR+= py-mraa
diff --git a/hpp-rbprm-robot-data/Makefile b/hpp-rbprm-robot-data/Makefile
deleted file mode 100644
index 4837e1ee..00000000
--- a/hpp-rbprm-robot-data/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# robotpkg Makefile for: wip/hpp-rbprm-robot-data
-# Created: Guilhem Saurel on fri, 4 Jan 2019
-#
-
-HPP_PACKAGE= hpp-rbprm-robot-data
-HPP_COMMENT= file database
-PKGREVISION= 2
-
-CATEGORIES= wip
-
-USE_PYTHON= true
-
-include ../../meta-pkgs/hpp/Makefile.common
-
-include ../../mk/language/c.mk
-include ../../mk/language/c++11.mk
-include ../../mk/robotpkg.mk
diff --git a/hpp-rbprm-robot-data/depend.mk b/hpp-rbprm-robot-data/depend.mk
deleted file mode 100644
index 44ce24f2..00000000
--- a/hpp-rbprm-robot-data/depend.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# robotpkg depend.mk for: wip/hpp-rbprm-robot-data
-# Created: Guilhem Saurel on Fri, 4 Jan 2019
-#
-
-DEPEND_DEPTH:= ${DEPEND_DEPTH}+
-HPP_RBPRM_ROBOT_DATA_DEPEND_MK:= ${HPP_RBPRM_ROBOT_DATA_DEPEND_MK}+
-
-ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+= hpp-rbprm-robot-data
-endif
-
-ifeq (+,$(HPP_RBPRM_ROBOT_DATA_DEPEND_MK)) # --------------------------------------
-
-include ../../mk/sysdep/python.mk
-
-PREFER.hpp-rbprm-robot-data?= robotpkg
-
-DEPEND_USE+= hpp-rbprm-robot-data
-
-DEPEND_ABI.hpp-rbprm-robot-data?= ${PKGTAG.python-}hpp-rbprm-robot-data>=4.7.0
-DEPEND_DIR.hpp-rbprm-robot-data?= ../../wip/hpp-rbprm-robot-data
-
-SYSTEM_SEARCH.hpp-rbprm-robot-data=\
- include/hpp/rbprm-robot-data/config.hh \
- 'lib/pkgconfig/hpp-rbprm-robot-data.pc:/Version/s/[^0-9.]//gp'
-
-endif # HPP_RBPRM_ROBOT_DATA_DEPEND_MK --------------------------------------------
-
-DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
diff --git a/hpp-rbprm-robot-data/DESCR b/py-hpp-rbprm-robot-data/DESCR
similarity index 100%
rename from hpp-rbprm-robot-data/DESCR
rename to py-hpp-rbprm-robot-data/DESCR
diff --git a/py-hpp-rbprm-robot-data/Makefile b/py-hpp-rbprm-robot-data/Makefile
new file mode 100644
index 00000000..f7a6147f
--- /dev/null
+++ b/py-hpp-rbprm-robot-data/Makefile
@@ -0,0 +1,18 @@
+# robotpkg Makefile for: wip/py-hpp-rbprm-robot-data
+# Created: Guilhem Saurel on fri, 4 Jan 2019
+#
+
+HPP_PACKAGE= hpp-rbprm-robot-data
+HPP_COMMENT= file database
+PKGREVISION= 2
+
+CATEGORIES= wip
+
+USE_PYTHON= true
+PYTHON_NOTAG_CONFLICT= yes
+
+include ../../meta-pkgs/hpp/Makefile.common
+
+include ../../mk/language/c.mk
+include ../../mk/language/c++11.mk
+include ../../mk/robotpkg.mk
diff --git a/hpp-rbprm-robot-data/PLIST b/py-hpp-rbprm-robot-data/PLIST
similarity index 100%
rename from hpp-rbprm-robot-data/PLIST
rename to py-hpp-rbprm-robot-data/PLIST
diff --git a/py-hpp-rbprm-robot-data/depend.mk b/py-hpp-rbprm-robot-data/depend.mk
new file mode 100644
index 00000000..869b43f6
--- /dev/null
+++ b/py-hpp-rbprm-robot-data/depend.mk
@@ -0,0 +1,29 @@
+# robotpkg depend.mk for: wip/py-hpp-rbprm-robot-data
+# Created: Guilhem Saurel on Fri, 4 Jan 2019
+#
+
+DEPEND_DEPTH:= ${DEPEND_DEPTH}+
+PY_HPP_RBPRM_ROBOT_DATA_DEPEND_MK:= ${PY_HPP_RBPRM_ROBOT_DATA_DEPEND_MK}+
+
+ifeq (+,$(DEPEND_DEPTH))
+DEPEND_PKG+= py-hpp-rbprm-robot-data
+endif
+
+ifeq (+,$(PY_HPP_RBPRM_ROBOT_DATA_DEPEND_MK)) # --------------------------------------
+
+include ../../mk/sysdep/python.mk
+
+PREFER.py-hpp-rbprm-robot-data?= robotpkg
+
+DEPEND_USE+= py-hpp-rbprm-robot-data
+
+DEPEND_ABI.py-hpp-rbprm-robot-data?= ${PKGTAG.python-}hpp-rbprm-robot-data>=4.7.0
+DEPEND_DIR.py-hpp-rbprm-robot-data?= ../../wip/py-hpp-rbprm-robot-data
+
+SYSTEM_SEARCH.py-hpp-rbprm-robot-data=\
+ include/hpp/rbprm-robot-data/config.hh \
+ 'lib/pkgconfig/hpp-rbprm-robot-data.pc:/Version/s/[^0-9.]//gp'
+
+endif # PY_HPP_RBPRM_ROBOT_DATA_DEPEND_MK --------------------------------------------
+
+DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
diff --git a/hpp-rbprm-robot-data/distinfo b/py-hpp-rbprm-robot-data/distinfo
similarity index 100%
rename from hpp-rbprm-robot-data/distinfo
rename to py-hpp-rbprm-robot-data/distinfo
diff --git a/hpp-rbprm-robot-data/patches/patch-aa b/py-hpp-rbprm-robot-data/patches/patch-aa
similarity index 100%
rename from hpp-rbprm-robot-data/patches/patch-aa
rename to py-hpp-rbprm-robot-data/patches/patch-aa
diff --git a/py-hpp-rbprm/Makefile b/py-hpp-rbprm/Makefile
index eefd48e4..5bebb5f6 100644
--- a/py-hpp-rbprm/Makefile
+++ b/py-hpp-rbprm/Makefile
@@ -12,7 +12,7 @@ PYTHON_NOTAG_CONFLICT= yes
include ../../meta-pkgs/hpp/Makefile.common
-include ../../wip/hpp-rbprm-robot-data/depend.mk
+include ../../wip/py-hpp-rbprm-robot-data/depend.mk
include ../../wip/py-hpp-environments/depend.mk
include ../../path/hpp-core/depend.mk
--
GitLab