diff --git a/Makefile b/Makefile index add99b2a7f09ea89ecbcf01ed3790f096750f816..6a22ae73d51e5d194603f47267089934846d5a47 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,6 @@ SUBDIR+= hey5-description SUBDIR+= histodet SUBDIR+= hpp-affordance SUBDIR+= hpp-benchmark -SUBDIR+= hpp-romeo SUBDIR+= hpp-spline SUBDIR+= hpp-universal-robot SUBDIR+= hrp2-14-description @@ -94,6 +93,7 @@ SUBDIR+= py-hpp-hrp2 SUBDIR+= py-hpp-rbprm SUBDIR+= py-hpp-rbprm-corba SUBDIR+= py-hpp-rbprm-robot-data +SUBDIR+= py-hpp-romeo SUBDIR+= py-mavlink SUBDIR+= py-morse SUBDIR+= py-mraa diff --git a/hpp-benchmark/Makefile b/hpp-benchmark/Makefile index fd327ac9a9fa1c0d0a563ee1edf9a9eddac52785..5fcbf999e30810b2ddff5d28209bba2a5018e301 100644 --- a/hpp-benchmark/Makefile +++ b/hpp-benchmark/Makefile @@ -21,7 +21,7 @@ DYNAMIC_PLIST_DIRS+= share/doc/${ROSNAME} include ../../meta-pkgs/hpp/Makefile.common include ../../wip/py-hpp-baxter/depend.mk -include ../../wip/hpp-romeo/depend.mk +include ../../wip/py-hpp-romeo/depend.mk include ../../graphics/py-qt-gepetto-viewer/depend.mk include ../../graphics/py-qt-gepetto-viewer-corba/depend.mk diff --git a/hpp-romeo/depend.mk b/hpp-romeo/depend.mk deleted file mode 100644 index aca851c25a92e464edbbae65363fb393853c6a99..0000000000000000000000000000000000000000 --- a/hpp-romeo/depend.mk +++ /dev/null @@ -1,29 +0,0 @@ -# robotpkg depend.mk for: wip/hpp-romeo -# Created: Guilhem Saurel on Fri, 19 Oct 2018 -# - -DEPEND_DEPTH:= ${DEPEND_DEPTH}+ -HPPROMEO_DEPEND_MK:= ${HPPROMEO_DEPEND_MK}+ - -ifeq (+,$(DEPEND_DEPTH)) -DEPEND_PKG+= hpp-romeo -endif - -ifeq (+,$(HPPROMEO_DEPEND_MK)) # -------------------------------------- - -include ../../mk/sysdep/python.mk - -PREFER.hpp-romeo?= robotpkg - -DEPEND_USE+= hpp-romeo - -DEPEND_ABI.hpp-romeo?= ${PKGTAG.python-}hpp-romeo>=4.7.0 -DEPEND_DIR.hpp-romeo?= ../../wip/hpp-romeo - -SYSTEM_SEARCH.hpp-romeo=\ - include/hpp/romeo/config.hh \ - 'lib/pkgconfig/hpp_romeo.pc:/Version/s/[^0-9.]//gp' - -endif # HPPROMEO_DEPEND_MK -------------------------------------------- - -DEPEND_DEPTH:= ${DEPEND_DEPTH:+=} diff --git a/hpp-romeo/DESCR b/py-hpp-romeo/DESCR similarity index 100% rename from hpp-romeo/DESCR rename to py-hpp-romeo/DESCR diff --git a/hpp-romeo/Makefile b/py-hpp-romeo/Makefile similarity index 66% rename from hpp-romeo/Makefile rename to py-hpp-romeo/Makefile index fe2d256f74319dba09ad72d4a16173a284588055..7f944d3f758fa2c1efe4035e506417b07b444120 100644 --- a/hpp-romeo/Makefile +++ b/py-hpp-romeo/Makefile @@ -1,18 +1,19 @@ -# robotpkg Makefile for: wip/hpp-romeo +# robotpkg Makefile for: wip/py-hpp-romeo # Created: Guilhem Saurel on Fri, 10 Oct 2018 # -HPP_PACKAGE= hpp-romeo -HPP_COMMENT= Python and ros launch files for Romeo robot in hpp. +HPP_PACKAGE= hpp-romeo +HPP_COMMENT= Python and ros launch files for Romeo robot in hpp. -ROSNAME= $(subst -,_,${HPP_PACKAGE}) -DISTNAME= ${ROSNAME}-${HPP_VERSION} +ROSNAME= $(subst -,_,${HPP_PACKAGE}) +DISTNAME= ${ROSNAME}-${HPP_VERSION} -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 include ../../math/hpp-pinocchio/depend.mk diff --git a/hpp-romeo/PLIST b/py-hpp-romeo/PLIST similarity index 100% rename from hpp-romeo/PLIST rename to py-hpp-romeo/PLIST diff --git a/py-hpp-romeo/depend.mk b/py-hpp-romeo/depend.mk new file mode 100644 index 0000000000000000000000000000000000000000..e3c0cafc19358ffeeafba63658931063327364f3 --- /dev/null +++ b/py-hpp-romeo/depend.mk @@ -0,0 +1,29 @@ +# robotpkg depend.mk for: wip/py-hpp-romeo +# Created: Guilhem Saurel on Fri, 19 Oct 2018 +# + +DEPEND_DEPTH:= ${DEPEND_DEPTH}+ +PY_HPP_ROMEO_DEPEND_MK:= ${PY_HPP_ROMEO_DEPEND_MK}+ + +ifeq (+,$(DEPEND_DEPTH)) +DEPEND_PKG+= py-hpp-romeo +endif + +ifeq (+,$(PY_HPP_ROMEO_DEPEND_MK)) # -------------------------------------- + +include ../../mk/sysdep/python.mk + +PREFER.py-hpp-romeo?= robotpkg + +DEPEND_USE+= py-hpp-romeo + +DEPEND_ABI.py-hpp-romeo?= ${PKGTAG.python-}hpp-romeo>=4.7.0 +DEPEND_DIR.py-hpp-romeo?= ../../wip/py-hpp-romeo + +SYSTEM_SEARCH.py-hpp-romeo=\ + include/hpp/romeo/config.hh \ + 'lib/pkgconfig/hpp_romeo.pc:/Version/s/[^0-9.]//gp' + +endif # PY_HPP_ROMEO_DEPEND_MK -------------------------------------------- + +DEPEND_DEPTH:= ${DEPEND_DEPTH:+=} diff --git a/hpp-romeo/distinfo b/py-hpp-romeo/distinfo similarity index 100% rename from hpp-romeo/distinfo rename to py-hpp-romeo/distinfo