[wip/{ → py-}hpp-baxter] add PYTHON_NOTAG_CONFLICT

Makefile

@@ -26,7 +26,6 @@ SUBDIR+=	head-action
 SUBDIR+=	hey5-description
 SUBDIR+=	histodet
 SUBDIR+=	hpp-affordance
-SUBDIR+=	hpp-baxter
 SUBDIR+=	hpp-benchmark
 SUBDIR+=	hpp-bezier-com-traj
 SUBDIR+=	hpp-centroidal-dynamics
@@ -93,6 +92,7 @@ SUBDIR+=	py-example-adder
 SUBDIR+=	py-example-robot-data
 SUBDIR+=	py-hqp
 SUBDIR+=	py-hpp-affordance-corba
+SUBDIR+=	py-hpp-baxter
 SUBDIR+=	py-hpp-rbprm-corba
 SUBDIR+=	py-mavlink
 SUBDIR+=	py-morse

hpp-benchmark/Makefile

@@ -20,7 +20,7 @@ DYNAMIC_PLIST_DIRS+=	share/doc/${ROSNAME}
 
 include ../../meta-pkgs/hpp/Makefile.common
 
-include ../../wip/hpp-baxter/depend.mk
+include ../../wip/py-hpp-baxter/depend.mk
 include ../../wip/hpp-romeo/depend.mk
 
 include ../../graphics/py-qt-gepetto-viewer/depend.mk

hpp-baxter/Makefile → py-hpp-baxter/Makefile

-# robotpkg Makefile for:	wip/hpp-baxter
+# robotpkg Makefile for:	wip/py-hpp-baxter
 # Created:			Guilhem Saurel on Mon, 28 Jan 2019
 #
 
-HPP_PACKAGE=	hpp-baxter
-HPP_COMMENT=	Wrappers for Baxter robot in HPP
+HPP_PACKAGE=		hpp-baxter
+HPP_COMMENT=		Wrappers for Baxter robot in HPP
 
-ROSNAME=	$(subst -,_,${HPP_PACKAGE})
+ROSNAME=		$(subst -,_,${HPP_PACKAGE})
 
-CATEGORIES=	wip
+CATEGORIES=		wip
 
 DYNAMIC_PLIST_DIRS+=	share/doc/${ROSNAME}
 
-USE_PYTHON=	true
+USE_PYTHON=		true
+PYTHON_NOTAG_CONFLICT=	yes
 
 include ../../meta-pkgs/hpp/Makefile.common
 

hpp-baxter/depend.mk → py-hpp-baxter/depend.mk

-# robotpkg depend.mk for:	wip/hpp-baxter
+# robotpkg depend.mk for:	wip/py-hpp-baxter
 # Created:			Guilhem Saurel on Mon, 28 Jan 2019
 #
 
 DEPEND_DEPTH:=		${DEPEND_DEPTH}+
-HPP_BAXTER_DEPEND_MK:=	${HPP_BAXTER_DEPEND_MK}+
+PY_HPP_BAXTER_DEPEND_MK:=	${PY_HPP_BAXTER_DEPEND_MK}+
 
 ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+=		hpp-baxter
+DEPEND_PKG+=		py-hpp-baxter
 endif
 
-ifeq (+,$(HPP_BAXTER_DEPEND_MK)) # --------------------------------------
+ifeq (+,$(PY_HPP_BAXTER_DEPEND_MK)) # --------------------------------------
 
 include ../../mk/sysdep/python.mk
 
-PREFER.hpp-baxter?=	robotpkg
+PREFER.py-hpp-baxter?=	robotpkg
 
-DEPEND_USE+=		hpp-baxter
+DEPEND_USE+=		py-hpp-baxter
 
-DEPEND_ABI.hpp-baxter?=	${PKGTAG.python-}hpp-baxter>=4.7.0
-DEPEND_DIR.hpp-baxter?=	../../wip/hpp-baxter
+DEPEND_ABI.py-hpp-baxter?=	${PKGTAG.python-}hpp-baxter>=4.7.0
+DEPEND_DIR.py-hpp-baxter?=	../../wip/py-hpp-baxter
 
-SYSTEM_SEARCH.hpp-baxter=\
+SYSTEM_SEARCH.py-hpp-baxter=\
 	include/hpp/baxter/config.hh	\
 	'lib/pkgconfig/hpp-baxter.pc:/Version/s/[^0-9.]//gp'
 
-endif # HPP_BAXTER_DEPEND_MK --------------------------------------------
+endif # PY_HPP_BAXTER_DEPEND_MK --------------------------------------------
 
 DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}