diff --git a/Makefile b/Makefile index e392fbc8e9ee03c123cf4ab2b15064ad0c1c2c3e..fc8737ed4f7962b44bc05217dca0788e4f0134ef 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,6 @@ SUBDIR+= hey5-description SUBDIR+= histodet SUBDIR+= hpp-affordance SUBDIR+= hpp-benchmark -SUBDIR+= hpp-bezier-com-traj SUBDIR+= hpp-centroidal-dynamics SUBDIR+= hpp-environments SUBDIR+= hpp-hrp2 @@ -93,6 +92,7 @@ SUBDIR+= py-example-robot-data SUBDIR+= py-hqp SUBDIR+= py-hpp-affordance-corba SUBDIR+= py-hpp-baxter +SUBDIR+= py-hpp-bezier-com-traj SUBDIR+= py-hpp-rbprm-corba SUBDIR+= py-mavlink SUBDIR+= py-morse diff --git a/hpp-bezier-com-traj/depend.mk b/hpp-bezier-com-traj/depend.mk deleted file mode 100644 index 509d67e84d09741fd3cd057004c2430851375c6c..0000000000000000000000000000000000000000 --- a/hpp-bezier-com-traj/depend.mk +++ /dev/null @@ -1,30 +0,0 @@ -# robotpkg depend.mk for: wip/hpp-bezier-com-traj -# Created: Guilhem Saurel on Fri, 19 Oct 2018 -# - -DEPEND_DEPTH:= ${DEPEND_DEPTH}+ -HPP_BEZIER_COM_TRAJ_DEPEND_MK:= ${HPP_BEZIER_COM_TRAJ_DEPEND_MK}+ - -ifeq (+,$(DEPEND_DEPTH)) -DEPEND_PKG+= hpp-bezier-com-traj -endif - -ifeq (+,$(HPP_BEZIER_COM_TRAJ_DEPEND_MK)) # -------------------------------------- - -include ../../mk/sysdep/python.mk - -PREFER.hpp-bezier-com-traj?= robotpkg - -DEPEND_USE+= hpp-bezier-com-traj - -DEPEND_ABI.hpp-bezier-com-traj?= ${PKGTAG.python-}hpp-bezier-com-traj>=4.7.0 -DEPEND_DIR.hpp-bezier-com-traj?= ../../wip/hpp-bezier-com-traj - -SYSTEM_SEARCH.hpp-bezier-com-traj=\ - include/hpp/bezier-com-traj/config.hh \ - lib/libhpp-bezier-com-traj.so \ - 'lib/pkgconfig/hpp-bezier-com-traj.pc:/Version/s/[^0-9.]//gp' - -endif # HPP_BEZIER_COM_TRAJ_DEPEND_MK -------------------------------------------- - -DEPEND_DEPTH:= ${DEPEND_DEPTH:+=} diff --git a/hpp-rbprm/Makefile b/hpp-rbprm/Makefile index c7fb6fff3c203604dd4d01206e8dff7934803866..f2976ae48f024436b2ab76b05f2d5c89848274f5 100644 --- a/hpp-rbprm/Makefile +++ b/hpp-rbprm/Makefile @@ -19,7 +19,7 @@ include ../../path/hpp-util/depend.mk include ../../path/hpp-statistics/depend.mk include ../../path/hpp-fcl/depend.mk include ../../path/hpp-constraints/depend.mk -include ../../wip/hpp-bezier-com-traj/depend.mk +include ../../wip/py-hpp-bezier-com-traj/depend.mk include ../../wip/hpp-centroidal-dynamics/depend.mk include ../../wip/hpp-affordance/depend.mk include ../../wip/hpp-spline/depend.mk diff --git a/hpp-bezier-com-traj/DESCR b/py-hpp-bezier-com-traj/DESCR similarity index 100% rename from hpp-bezier-com-traj/DESCR rename to py-hpp-bezier-com-traj/DESCR diff --git a/hpp-bezier-com-traj/Makefile b/py-hpp-bezier-com-traj/Makefile similarity index 71% rename from hpp-bezier-com-traj/Makefile rename to py-hpp-bezier-com-traj/Makefile index d2cdedf2120aa04ef26f573caa1a1f2608832a27..e6e3b2e84f067e05e3a48ca01aa8b52ab8808ed4 100644 --- a/hpp-bezier-com-traj/Makefile +++ b/py-hpp-bezier-com-traj/Makefile @@ -1,14 +1,15 @@ -# robotpkg Makefile for: wip/hpp-bezier-com-traj +# robotpkg Makefile for: wip/py-hpp-bezier-com-traj # Created: Guilhem Saurel on Fri, 4 Jan 2019 # -HPP_PACKAGE= hpp-bezier-com-traj -HPP_COMMENT= trajectory generation for the COM with bezier curves +HPP_PACKAGE= hpp-bezier-com-traj +HPP_COMMENT= trajectory generation for the COM with bezier curves -CATEGORIES= wip +CATEGORIES= wip USE_BOOST_LIBS= python USE_PYTHON= true +PYTHON_NOTAG_CONFLICT= yes include ../../meta-pkgs/hpp/Makefile.common diff --git a/hpp-bezier-com-traj/PLIST b/py-hpp-bezier-com-traj/PLIST similarity index 100% rename from hpp-bezier-com-traj/PLIST rename to py-hpp-bezier-com-traj/PLIST diff --git a/py-hpp-bezier-com-traj/depend.mk b/py-hpp-bezier-com-traj/depend.mk new file mode 100644 index 0000000000000000000000000000000000000000..a4159356bd597c749adc17dff899273f7186a2d1 --- /dev/null +++ b/py-hpp-bezier-com-traj/depend.mk @@ -0,0 +1,30 @@ +# robotpkg depend.mk for: wip/py-hpp-bezier-com-traj +# Created: Guilhem Saurel on Fri, 19 Oct 2018 +# + +DEPEND_DEPTH:= ${DEPEND_DEPTH}+ +PY_HPP_BEZIER_COM_TRAJ_DEPEND_MK:= ${PY_HPP_BEZIER_COM_TRAJ_DEPEND_MK}+ + +ifeq (+,$(DEPEND_DEPTH)) +DEPEND_PKG+= py-hpp-bezier-com-traj +endif + +ifeq (+,$(PY_HPP_BEZIER_COM_TRAJ_DEPEND_MK)) # -------------------------------------- + +include ../../mk/sysdep/python.mk + +PREFER.py-hpp-bezier-com-traj?= robotpkg + +DEPEND_USE+= py-hpp-bezier-com-traj + +DEPEND_ABI.py-hpp-bezier-com-traj?= ${PKGTAG.python-}hpp-bezier-com-traj>=4.7.0 +DEPEND_DIR.py-hpp-bezier-com-traj?= ../../wip/py-hpp-bezier-com-traj + +SYSTEM_SEARCH.py-hpp-bezier-com-traj=\ + include/hpp/bezier-com-traj/config.hh \ + lib/libhpp-bezier-com-traj.so \ + 'lib/pkgconfig/hpp-bezier-com-traj.pc:/Version/s/[^0-9.]//gp' + +endif # PY_HPP_BEZIER_COM_TRAJ_DEPEND_MK -------------------------------------------- + +DEPEND_DEPTH:= ${DEPEND_DEPTH:+=} diff --git a/hpp-bezier-com-traj/distinfo b/py-hpp-bezier-com-traj/distinfo similarity index 100% rename from hpp-bezier-com-traj/distinfo rename to py-hpp-bezier-com-traj/distinfo