diff --git a/Makefile b/Makefile index e004e19c677949abec4d7171eb16e388e0a27587..4df578ee973f68f404d23287c05c2859065bbf69 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,6 @@ SUBDIR+= hey5-description SUBDIR+= histodet SUBDIR+= hpp-affordance SUBDIR+= hpp-benchmark -SUBDIR+= hpp-environments SUBDIR+= hpp-hrp2 SUBDIR+= hpp-rbprm SUBDIR+= hpp-rbprm-robot-data @@ -93,6 +92,7 @@ SUBDIR+= py-hpp-affordance-corba SUBDIR+= py-hpp-baxter SUBDIR+= py-hpp-bezier-com-traj SUBDIR+= py-hpp-centroidal-dynamics +SUBDIR+= py-hpp-environments SUBDIR+= py-hpp-rbprm-corba SUBDIR+= py-mavlink SUBDIR+= py-morse diff --git a/hpp-environments/Makefile b/hpp-environments/Makefile deleted file mode 100644 index 551079f5f149d7cfa07eceabf5802b4084b8331b..0000000000000000000000000000000000000000 --- a/hpp-environments/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# robotpkg Makefile for: wip/hpp-environments -# Created: Guilhem Saurel on Fri, 10 Oct 2018 -# - -HPP_PACKAGE= hpp-environments -HPP_COMMENT= Environments and robot descriptions for HPP - -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-environments/depend.mk b/hpp-environments/depend.mk deleted file mode 100644 index 0bd6a950d6bee35566a12ccd5291bfa3c58821b4..0000000000000000000000000000000000000000 --- a/hpp-environments/depend.mk +++ /dev/null @@ -1,29 +0,0 @@ -# robotpkg depend.mk for: wip/hpp-environments -# Created: Guilhem Saurel on Fri, 19 Oct 2018 -# - -DEPEND_DEPTH:= ${DEPEND_DEPTH}+ -HPPENVIRONMENTS_DEPEND_MK:= ${HPPENVIRONMENTS_DEPEND_MK}+ - -ifeq (+,$(DEPEND_DEPTH)) -DEPEND_PKG+= hpp-environments -endif - -ifeq (+,$(HPPENVIRONMENTS_DEPEND_MK)) # -------------------------------------- - -include ../../mk/sysdep/python.mk - -PREFER.hpp-environments?= robotpkg - -DEPEND_USE+= hpp-environments - -DEPEND_ABI.hpp-environments?= ${PKGTAG.python-}hpp-environments>=4.7.0 -DEPEND_DIR.hpp-environments?= ../../wip/hpp-environments - -SYSTEM_SEARCH.hpp-environments=\ - include/hpp/environments/config.hh \ - 'lib/pkgconfig/hpp-environments.pc:/Version/s/[^0-9.]//gp' - -endif # HPPENVIRONMENTS_DEPEND_MK -------------------------------------------- - -DEPEND_DEPTH:= ${DEPEND_DEPTH:+=} diff --git a/hpp-rbprm/Makefile b/hpp-rbprm/Makefile index f5b49fd4b15129c05c7188cbba98a136591b1027..c81c60a72143f2c6713076cebb87dd35fdcaad83 100644 --- a/hpp-rbprm/Makefile +++ b/hpp-rbprm/Makefile @@ -12,7 +12,7 @@ USE_PYTHON= true include ../../meta-pkgs/hpp/Makefile.common include ../../wip/hpp-rbprm-robot-data/depend.mk -include ../../wip/hpp-environments/depend.mk +include ../../wip/py-hpp-environments/depend.mk include ../../path/hpp-core/depend.mk include ../../path/hpp-util/depend.mk diff --git a/hpp-environments/DESCR b/py-hpp-environments/DESCR similarity index 100% rename from hpp-environments/DESCR rename to py-hpp-environments/DESCR diff --git a/py-hpp-environments/Makefile b/py-hpp-environments/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..927ac5129534ed0e138e4641aee604e9de8bc1a6 --- /dev/null +++ b/py-hpp-environments/Makefile @@ -0,0 +1,17 @@ +# robotpkg Makefile for: wip/py-hpp-environments +# Created: Guilhem Saurel on Fri, 10 Oct 2018 +# + +HPP_PACKAGE= hpp-environments +HPP_COMMENT= Environments and robot descriptions for HPP + +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-environments/PLIST b/py-hpp-environments/PLIST similarity index 100% rename from hpp-environments/PLIST rename to py-hpp-environments/PLIST diff --git a/py-hpp-environments/depend.mk b/py-hpp-environments/depend.mk new file mode 100644 index 0000000000000000000000000000000000000000..e73b14012336b2803662a0178e43f0d07b40c360 --- /dev/null +++ b/py-hpp-environments/depend.mk @@ -0,0 +1,29 @@ +# robotpkg depend.mk for: wip/py-hpp-environments +# Created: Guilhem Saurel on Fri, 19 Oct 2018 +# + +DEPEND_DEPTH:= ${DEPEND_DEPTH}+ +PY_HPP_ENVIRONMENTS_DEPEND_MK:= ${PY_HPP_ENVIRONMENTS_DEPEND_MK}+ + +ifeq (+,$(DEPEND_DEPTH)) +DEPEND_PKG+= py-hpp-environments +endif + +ifeq (+,$(PY_HPP_ENVIRONMENTS_DEPEND_MK)) # -------------------------------------- + +include ../../mk/sysdep/python.mk + +PREFER.py-hpp-environments?= robotpkg + +DEPEND_USE+= py-hpp-environments + +DEPEND_ABI.py-hpp-environments?= ${PKGTAG.python-}hpp-environments>=4.7.0 +DEPEND_DIR.py-hpp-environments?= ../../wip/py-hpp-environments + +SYSTEM_SEARCH.py-hpp-environments=\ + include/hpp/environments/config.hh \ + 'lib/pkgconfig/hpp-environments.pc:/Version/s/[^0-9.]//gp' + +endif # PY_HPP_ENVIRONMENTS_DEPEND_MK -------------------------------------------- + +DEPEND_DEPTH:= ${DEPEND_DEPTH:+=} diff --git a/hpp-environments/distinfo b/py-hpp-environments/distinfo similarity index 100% rename from hpp-environments/distinfo rename to py-hpp-environments/distinfo