From 17ec1f7bfd4558a86eafbfd0bc479c3b34cf247e Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 5 Nov 2019 14:16:45 +0100
Subject: [PATCH] =?UTF-8?q?[wip/{=20=E2=86=92=20py-}hpp-centroidal-dynamic?=
=?UTF-8?q?s]=20add=20PYTHON=5FNOTAG=5FCONFLICT?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Makefile | 2 +-
hpp-centroidal-dynamics/depend.mk | 30 -------------------
hpp-rbprm/Makefile | 2 +-
py-hpp-bezier-com-traj/Makefile | 2 +-
.../DESCR | 0
.../Makefile | 9 +++---
.../PLIST | 0
py-hpp-centroidal-dynamics/depend.mk | 30 +++++++++++++++++++
.../distinfo | 0
9 files changed, 38 insertions(+), 37 deletions(-)
delete mode 100644 hpp-centroidal-dynamics/depend.mk
rename {hpp-centroidal-dynamics => py-hpp-centroidal-dynamics}/DESCR (100%)
rename {hpp-centroidal-dynamics => py-hpp-centroidal-dynamics}/Makefile (73%)
rename {hpp-centroidal-dynamics => py-hpp-centroidal-dynamics}/PLIST (100%)
create mode 100644 py-hpp-centroidal-dynamics/depend.mk
rename {hpp-centroidal-dynamics => py-hpp-centroidal-dynamics}/distinfo (100%)
diff --git a/Makefile b/Makefile
index fc8737ed..e004e19c 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,6 @@ SUBDIR+= hey5-description
SUBDIR+= histodet
SUBDIR+= hpp-affordance
SUBDIR+= hpp-benchmark
-SUBDIR+= hpp-centroidal-dynamics
SUBDIR+= hpp-environments
SUBDIR+= hpp-hrp2
SUBDIR+= hpp-rbprm
@@ -93,6 +92,7 @@ SUBDIR+= py-hqp
SUBDIR+= py-hpp-affordance-corba
SUBDIR+= py-hpp-baxter
SUBDIR+= py-hpp-bezier-com-traj
+SUBDIR+= py-hpp-centroidal-dynamics
SUBDIR+= py-hpp-rbprm-corba
SUBDIR+= py-mavlink
SUBDIR+= py-morse
diff --git a/hpp-centroidal-dynamics/depend.mk b/hpp-centroidal-dynamics/depend.mk
deleted file mode 100644
index 4f278f40..00000000
--- a/hpp-centroidal-dynamics/depend.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# robotpkg depend.mk for: wip/hpp-centroidal-dynamics
-# Created: Guilhem Saurel on Fri, 2 Jan 2019
-#
-
-DEPEND_DEPTH:= ${DEPEND_DEPTH}+
-HPP_CENTROIDAL_DYNAMICS_DEPEND_MK:= ${HPP_CENTROIDAL_DYNAMICS_DEPEND_MK}+
-
-ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+= hpp-centroidal-dynamics
-endif
-
-ifeq (+,$(HPP_CENTROIDAL_DYNAMICS_DEPEND_MK)) # --------------------------------------
-
-include ../../mk/sysdep/python.mk
-
-PREFER.hpp-centroidal-dynamics?= robotpkg
-
-DEPEND_USE+= hpp-centroidal-dynamics
-
-DEPEND_ABI.hpp-centroidal-dynamics?= ${PKGTAG.python-}hpp-centroidal-dynamics>=4.7.0
-DEPEND_DIR.hpp-centroidal-dynamics?= ../../wip/hpp-centroidal-dynamics
-
-SYSTEM_SEARCH.hpp-centroidal-dynamics=\
- include/hpp/centroidal-dynamics/config.hh \
- lib/libhpp-centroidal-dynamics.so \
- 'lib/pkgconfig/hpp-centroidal-dynamics.pc:/Version/s/[^0-9.]//gp'
-
-endif # HPP_CENTROIDAL_DYNAMICS_DEPEND_MK --------------------------------------------
-
-DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
diff --git a/hpp-rbprm/Makefile b/hpp-rbprm/Makefile
index f2976ae4..f5b49fd4 100644
--- a/hpp-rbprm/Makefile
+++ b/hpp-rbprm/Makefile
@@ -20,7 +20,7 @@ include ../../path/hpp-statistics/depend.mk
include ../../path/hpp-fcl/depend.mk
include ../../path/hpp-constraints/depend.mk
include ../../wip/py-hpp-bezier-com-traj/depend.mk
-include ../../wip/hpp-centroidal-dynamics/depend.mk
+include ../../wip/py-hpp-centroidal-dynamics/depend.mk
include ../../wip/hpp-affordance/depend.mk
include ../../wip/hpp-spline/depend.mk
include ../../math/pinocchio/depend.mk
diff --git a/py-hpp-bezier-com-traj/Makefile b/py-hpp-bezier-com-traj/Makefile
index e6e3b2e8..f2d1610f 100644
--- a/py-hpp-bezier-com-traj/Makefile
+++ b/py-hpp-bezier-com-traj/Makefile
@@ -14,7 +14,7 @@ PYTHON_NOTAG_CONFLICT= yes
include ../../meta-pkgs/hpp/Makefile.common
include ../../wip/hpp-spline/depend.mk
-include ../../wip/hpp-centroidal-dynamics/depend.mk
+include ../../wip/py-hpp-centroidal-dynamics/depend.mk
include ../../math/py-eigenpy/depend.mk
include ../../math/eigen3/depend.mk
diff --git a/hpp-centroidal-dynamics/DESCR b/py-hpp-centroidal-dynamics/DESCR
similarity index 100%
rename from hpp-centroidal-dynamics/DESCR
rename to py-hpp-centroidal-dynamics/DESCR
diff --git a/hpp-centroidal-dynamics/Makefile b/py-hpp-centroidal-dynamics/Makefile
similarity index 73%
rename from hpp-centroidal-dynamics/Makefile
rename to py-hpp-centroidal-dynamics/Makefile
index 5e0f81d8..f234628b 100644
--- a/hpp-centroidal-dynamics/Makefile
+++ b/py-hpp-centroidal-dynamics/Makefile
@@ -1,14 +1,15 @@
-# robotpkg Makefile for: wip/hpp-centroidal-dynamics
+# robotpkg Makefile for: wip/py-hpp-centroidal-dynamics
# Created: Guilhem Saurel on Thu, 3 Jan 2019
#
-HPP_PACKAGE= hpp-centroidal-dynamics
-HPP_COMMENT= testing equilibrium
+HPP_PACKAGE= hpp-centroidal-dynamics
+HPP_COMMENT= testing equilibrium
-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-centroidal-dynamics/PLIST b/py-hpp-centroidal-dynamics/PLIST
similarity index 100%
rename from hpp-centroidal-dynamics/PLIST
rename to py-hpp-centroidal-dynamics/PLIST
diff --git a/py-hpp-centroidal-dynamics/depend.mk b/py-hpp-centroidal-dynamics/depend.mk
new file mode 100644
index 00000000..05231121
--- /dev/null
+++ b/py-hpp-centroidal-dynamics/depend.mk
@@ -0,0 +1,30 @@
+# robotpkg depend.mk for: wip/py-hpp-centroidal-dynamics
+# Created: Guilhem Saurel on Fri, 2 Jan 2019
+#
+
+DEPEND_DEPTH:= ${DEPEND_DEPTH}+
+PY_HPP_CENTROIDAL_DYNAMICS_DEPEND_MK:= ${PY_HPP_CENTROIDAL_DYNAMICS_DEPEND_MK}+
+
+ifeq (+,$(DEPEND_DEPTH))
+DEPEND_PKG+= py-hpp-centroidal-dynamics
+endif
+
+ifeq (+,$(PY_HPP_CENTROIDAL_DYNAMICS_DEPEND_MK)) # --------------------------------------
+
+include ../../mk/sysdep/python.mk
+
+PREFER.py-hpp-centroidal-dynamics?= robotpkg
+
+DEPEND_USE+= py-hpp-centroidal-dynamics
+
+DEPEND_ABI.py-hpp-centroidal-dynamics?= ${PKGTAG.python-}hpp-centroidal-dynamics>=4.7.0
+DEPEND_DIR.py-hpp-centroidal-dynamics?= ../../wip/py-hpp-centroidal-dynamics
+
+SYSTEM_SEARCH.py-hpp-centroidal-dynamics=\
+ include/hpp/centroidal-dynamics/config.hh \
+ lib/libhpp-centroidal-dynamics.so \
+ 'lib/pkgconfig/hpp-centroidal-dynamics.pc:/Version/s/[^0-9.]//gp'
+
+endif # PY_HPP_CENTROIDAL_DYNAMICS_DEPEND_MK --------------------------------------------
+
+DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
diff --git a/hpp-centroidal-dynamics/distinfo b/py-hpp-centroidal-dynamics/distinfo
similarity index 100%
rename from hpp-centroidal-dynamics/distinfo
rename to py-hpp-centroidal-dynamics/distinfo
--
GitLab