diff --git a/Makefile b/Makefile index 1dadc837901cc64415ba83ace087d66a712fac49..334af12b8456fe3d6e15ee7f3581993d53416606 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,6 @@ SUBDIR+= hey5-description SUBDIR+= histodet SUBDIR+= hpp-affordance SUBDIR+= hpp-benchmark -SUBDIR+= hpp-universal-robot SUBDIR+= hrp2-14-description SUBDIR+= hrp2-dev SUBDIR+= infuse-asn1-conversions @@ -94,6 +93,7 @@ SUBDIR+= py-hpp-rbprm-corba SUBDIR+= py-hpp-rbprm-robot-data SUBDIR+= py-hpp-romeo SUBDIR+= py-hpp-spline +SUBDIR+= py-hpp-universal-robot SUBDIR+= py-mavlink SUBDIR+= py-morse SUBDIR+= py-mraa diff --git a/hpp-universal-robot/depend.mk b/hpp-universal-robot/depend.mk deleted file mode 100644 index be36616c239e6df2c4dcb207962d28de8993f1b2..0000000000000000000000000000000000000000 --- a/hpp-universal-robot/depend.mk +++ /dev/null @@ -1,29 +0,0 @@ -# robotpkg depend.mk for: wip/hpp-universal-robot -# Created: Guilhem Saurel on Fri, 19 Oct 2018 -# - -DEPEND_DEPTH:= ${DEPEND_DEPTH}+ -HPP_UNIVERSAL_ROBOT_DEPEND_MK:= ${HPP_UNIVERSAL_ROBOT_DEPEND_MK}+ - -ifeq (+,$(DEPEND_DEPTH)) -DEPEND_PKG+= hpp-universal-robot -endif - -ifeq (+,$(HPP_UNIVERSAL_ROBOT_DEPEND_MK)) # -------------------------------------- - -include ../../mk/sysdep/python.mk - -PREFER.hpp-universal-robot?= robotpkg - -DEPEND_USE+= hpp-universal-robot - -DEPEND_ABI.hpp-universal-robot?= ${PKGTAG.python-}hpp-universal-robot>=4.7.0 -DEPEND_DIR.hpp-universal-robot?= ../../wip/hpp-universal-robot - -SYSTEM_SEARCH.hpp-universal-robot=\ - include/hpp/universal/robot/config.hh \ - 'lib/pkgconfig/hpp-universal-robot.pc:/Version/s/[^0-9.]//gp' - -endif # HPP_UNIVERSAL_ROBOT_DEPEND_MK -------------------------------------------- - -DEPEND_DEPTH:= ${DEPEND_DEPTH:+=} diff --git a/hpp-universal-robot/DESCR b/py-hpp-universal-robot/DESCR similarity index 100% rename from hpp-universal-robot/DESCR rename to py-hpp-universal-robot/DESCR diff --git a/hpp-universal-robot/Makefile b/py-hpp-universal-robot/Makefile similarity index 50% rename from hpp-universal-robot/Makefile rename to py-hpp-universal-robot/Makefile index a3b9315333f8517752796ff53fbc401c17f09705..386a136c6dcbe23c46f97e1ae6fec753f329ca03 100644 --- a/hpp-universal-robot/Makefile +++ b/py-hpp-universal-robot/Makefile @@ -1,13 +1,14 @@ -# robotpkg Makefile for: wip/hpp-universal-robot +# robotpkg Makefile for: wip/py-hpp-universal-robot # Created: Guilhem Saurel on Fri, 10 Oct 2018 # -HPP_PACKAGE= hpp-universal-robot -HPP_COMMENT= Data specific to robots ur5 and ur10 for hpp-corbaserver -HPP_VERSION= 4.7.1 +HPP_PACKAGE= hpp-universal-robot +HPP_COMMENT= Data specific to robots ur5 and ur10 for hpp-corbaserver +HPP_VERSION= 4.7.1 -CATEGORIES= wip -USE_PYTHON= true +CATEGORIES= wip +USE_PYTHON= true +PYTHON_NOTAG_CONFLICT= yes include ../../meta-pkgs/hpp/Makefile.common diff --git a/hpp-universal-robot/PLIST b/py-hpp-universal-robot/PLIST similarity index 100% rename from hpp-universal-robot/PLIST rename to py-hpp-universal-robot/PLIST diff --git a/py-hpp-universal-robot/depend.mk b/py-hpp-universal-robot/depend.mk new file mode 100644 index 0000000000000000000000000000000000000000..e1db4185c8bcc66733a987adde08be0a2843899f --- /dev/null +++ b/py-hpp-universal-robot/depend.mk @@ -0,0 +1,29 @@ +# robotpkg depend.mk for: wip/py-hpp-universal-robot +# Created: Guilhem Saurel on Fri, 19 Oct 2018 +# + +DEPEND_DEPTH:= ${DEPEND_DEPTH}+ +PY_HPP_UNIVERSAL_ROBOT_DEPEND_MK:= ${PY_HPP_UNIVERSAL_ROBOT_DEPEND_MK}+ + +ifeq (+,$(DEPEND_DEPTH)) +DEPEND_PKG+= py-hpp-universal-robot +endif + +ifeq (+,$(PY_HPP_UNIVERSAL_ROBOT_DEPEND_MK)) # -------------------------------------- + +include ../../mk/sysdep/python.mk + +PREFER.py-hpp-universal-robot?= robotpkg + +DEPEND_USE+= py-hpp-universal-robot + +DEPEND_ABI.py-hpp-universal-robot?= ${PKGTAG.python-}hpp-universal-robot>=4.7.0 +DEPEND_DIR.py-hpp-universal-robot?= ../../wip/py-hpp-universal-robot + +SYSTEM_SEARCH.py-hpp-universal-robot=\ + include/hpp/universal/robot/config.hh \ + 'lib/pkgconfig/hpp-universal-robot.pc:/Version/s/[^0-9.]//gp' + +endif # PY_HPP_UNIVERSAL_ROBOT_DEPEND_MK -------------------------------------------- + +DEPEND_DEPTH:= ${DEPEND_DEPTH:+=} diff --git a/hpp-universal-robot/distinfo b/py-hpp-universal-robot/distinfo similarity index 100% rename from hpp-universal-robot/distinfo rename to py-hpp-universal-robot/distinfo