diff --git a/Makefile b/Makefile index 8e657b5d4164fce8179ae08ade231d8ee26900f5..5522970f9f5ecdff78ac3d7c08b6167663fa5e26 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,6 @@ SUBDIR+= hpp-centroidal-dynamics SUBDIR+= hpp-environments SUBDIR+= hpp-hrp2 SUBDIR+= hpp-rbprm -SUBDIR+= hpp-rbprm-corba SUBDIR+= hpp-rbprm-robot-data SUBDIR+= hpp-romeo SUBDIR+= hpp-spline @@ -94,6 +93,7 @@ SUBDIR+= py-dynamic-graph-v3 SUBDIR+= py-example-adder SUBDIR+= py-example-robot-data SUBDIR+= py-hqp +SUBDIR+= py-hpp-rbprm-corba SUBDIR+= py-mavlink SUBDIR+= py-morse SUBDIR+= py-mraa diff --git a/hpp-rbprm-corba/depend.mk b/hpp-rbprm-corba/depend.mk deleted file mode 100644 index 22e950124198568e28066a07b2e6fd61b097d3f8..0000000000000000000000000000000000000000 --- a/hpp-rbprm-corba/depend.mk +++ /dev/null @@ -1,28 +0,0 @@ -# robotpkg depend.mk for: wip/hpp-rbprm-corba -# Created: Guilhem Saurel on Wed, 30 Jan 2019 -# - -DEPEND_DEPTH:= ${DEPEND_DEPTH}+ -HPP_RBPRM_CORBA_DEPEND_MK:= ${HPP_RBPRM_CORBA_DEPEND_MK}+ - -ifeq (+,$(DEPEND_DEPTH)) -DEPEND_PKG+= hpp-rbprm-corba -endif - -ifeq (+,$(HPP_RBPRM_DEPEND_MK)) # -------------------------------------- - -PREFER.hpp-rbprm-corba?= robotpkg - -DEPEND_USE+= hpp-rbprm-corba - -DEPEND_ABI.hpp-rbprm-corba?= hpp-rbprm-corba>=4.6.0 -DEPEND_DIR.hpp-rbprm-corba?= ../../wip/hpp-rbprm-corba - -SYSTEM_SEARCH.hpp-rbprm-corba=\ - include/hpp/corbaserver/rbprm/config.hh i \ - lib/hppPlugins/rbprm-corba.so \ - 'lib/pkgconfig/hpp-rbprm-corba.pc:/Version/s/[^0-9.]//gp' - -endif # HPP_RBPRM_CORBA_DEPEND_MK -------------------------------------------- - -DEPEND_DEPTH:= ${DEPEND_DEPTH:+=} diff --git a/hpp-rbprm-corba/DESCR b/py-hpp-rbprm-corba/DESCR similarity index 100% rename from hpp-rbprm-corba/DESCR rename to py-hpp-rbprm-corba/DESCR diff --git a/hpp-rbprm-corba/Makefile b/py-hpp-rbprm-corba/Makefile similarity index 92% rename from hpp-rbprm-corba/Makefile rename to py-hpp-rbprm-corba/Makefile index e45847130304b6bf22d367f74826f7abcaac414a..dae6b170e0059fe21c17acbb04ff50acdead97d3 100644 --- a/hpp-rbprm-corba/Makefile +++ b/py-hpp-rbprm-corba/Makefile @@ -1,4 +1,4 @@ -# robotpkg Makefile for: wip/hpp-rbprm-corba +# robotpkg Makefile for: wip/py37-hpp-rbprm-corba # Created: Guilhem Saurel on Wed, 30 Jan 2019 # @@ -32,7 +32,6 @@ include ../../middleware/omniORB/depend.mk include ../../middleware/py-omniORBpy/depend.mk include ../../devel/boost-headers/depend.mk -include ../../mk/sysdep/python.mk include ../../mk/language/c.mk include ../../mk/language/c++.mk include ../../mk/robotpkg.mk diff --git a/hpp-rbprm-corba/PLIST b/py-hpp-rbprm-corba/PLIST similarity index 100% rename from hpp-rbprm-corba/PLIST rename to py-hpp-rbprm-corba/PLIST diff --git a/py-hpp-rbprm-corba/depend.mk b/py-hpp-rbprm-corba/depend.mk new file mode 100644 index 0000000000000000000000000000000000000000..9e075cc8c773faa699a89383f1ceaa69c66c84bf --- /dev/null +++ b/py-hpp-rbprm-corba/depend.mk @@ -0,0 +1,30 @@ +# robotpkg depend.mk for: wip/py37-hpp-rbprm-corba +# Created: Guilhem Saurel on Wed, 30 Jan 2019 +# + +DEPEND_DEPTH:= ${DEPEND_DEPTH}+ +PY_HPP_RBPRM_CORBA_DEPEND_MK:= ${PY_HPP_RBPRM_CORBA_DEPEND_MK}+ + +ifeq (+,$(DEPEND_DEPTH)) +DEPEND_PKG+= py-hpp-rbprm-corba +endif + +ifeq (+,$(PY_HPP_RBPRM_CORBA_DEPEND_MK)) # -------------------------------------- + +include ../../mk/sysdep/python.mk + +PREFER.py-hpp-rbprm-corba?= robotpkg + +DEPEND_USE+= py-hpp-rbprm-corba + +DEPEND_ABI.py-hpp-rbprm-corba?= ${PKGTAG.python-}hpp-rbprm-corba>=4.7.1 +DEPEND_DIR.py-hpp-rbprm-corba?= ../../wip/py-hpp-rbprm-corba + +SYSTEM_SEARCH.py-hpp-rbprm-corba=\ + include/hpp/corbaserver/rbprm/config.hh \ + lib/hppPlugins/rbprm-corba.so \ + 'lib/pkgconfig/hpp-rbprm-corba.pc:/Version/s/[^0-9.]//gp' + +endif # PY_HPP_RBPRM_CORBA_DEPEND_MK -------------------------------------------- + +DEPEND_DEPTH:= ${DEPEND_DEPTH:+=} diff --git a/hpp-rbprm-corba/distinfo b/py-hpp-rbprm-corba/distinfo similarity index 100% rename from hpp-rbprm-corba/distinfo rename to py-hpp-rbprm-corba/distinfo