Skip to content
Snippets Groups Projects
Commit 4ca515fc authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

[wip/py-crocoddyl] Update to v1.0.0

parent c105bb2f
No related branches found
No related tags found
No related merge requests found
......@@ -4,15 +4,7 @@
ORG= loco-3d
NAME= crocoddyl
VERSION= 0.9.0
PKGREVISION= 4
DISTNAME= ${NAME}-${VERSION}
PKGNAME= ${PKGTAG.python-}${DISTNAME}
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=${NAME}/}
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}/${ORG}/${NAME}.git
CHECKOUT_VCS_OPTS+= --recursive
VERSION= 1.0.0
CATEGORIES= wip
COMMENT= Contact RObot COntrol by Differential DYnamic programming Library
......@@ -21,10 +13,9 @@ MAINTAINER= gepetto-soft@laas.fr
CONFLICTS+= py[0-9][0-9]-crocoddyl
CMAKE_ARGS+= -DCMAKE_INSTALL_LIBDIR=lib
DYNAMIC_PLIST_DIRS+= share/doc/${NAME}
USE_PYTHON= true
include ../../devel/jrl-cmakemodules/Makefile.common
include ../../wip/mk/sysdep/py-scipy.mk
include ../../wip/example-robot-data/depend.mk
include ../../wip/py-example-robot-data/depend.mk
......@@ -44,6 +35,6 @@ include ../../devel/boost-libs/depend.mk
include ../../pkgtools/pkg-config/depend.mk
include ../../mk/sysdep/cmake.mk
include ../../mk/language/c.mk
include ../../mk/language/c++.mk
include ../../mk/language/c++11.mk
include ../../mk/robotpkg.mk
......@@ -5,21 +5,25 @@ include/crocoddyl/core/actions/diff-lqr.hpp
include/crocoddyl/core/actions/lqr.hpp
include/crocoddyl/core/actions/unicycle.hpp
include/crocoddyl/core/activation-base.hpp
include/crocoddyl/core/activations/inequality.hpp
include/crocoddyl/core/activations/quadratic-barrier.hpp
include/crocoddyl/core/activations/quadratic.hpp
include/crocoddyl/core/activations/smooth-abs.hpp
include/crocoddyl/core/activations/weighted-quadratic.hpp
include/crocoddyl/core/actuation-base.hpp
include/crocoddyl/core/data-collector-base.hpp
include/crocoddyl/core/data/actuation.hpp
include/crocoddyl/core/diff-action-base.hpp
include/crocoddyl/core/integrator/euler.hpp
include/crocoddyl/core/integrator/rk4.hpp
include/crocoddyl/core/numdiff/action.hpp
include/crocoddyl/core/numdiff/activation.hpp
include/crocoddyl/core/numdiff/diff-action.hpp
include/crocoddyl/core/numdiff/state.hpp
include/crocoddyl/core/optctrl/shooting.hpp
include/crocoddyl/core/solver-base.hpp
include/crocoddyl/core/solvers/box-ddp.hpp
include/crocoddyl/core/solvers/box-kkt.hpp
include/crocoddyl/core/solvers/box-qp.hpp
include/crocoddyl/core/solvers/ddp.hpp
include/crocoddyl/core/solvers/fddp.hpp
include/crocoddyl/core/solvers/kkt.hpp
......@@ -28,10 +32,12 @@ include/crocoddyl/core/state-base.hpp
include/crocoddyl/core/states/euclidean.hpp
include/crocoddyl/core/states/unicycle.hpp
include/crocoddyl/core/utils/callbacks.hpp
include/crocoddyl/core/utils/exception.hpp
include/crocoddyl/core/utils/math.hpp
include/crocoddyl/core/utils/motion-display.hpp
include/crocoddyl/core/utils/robot-loader.hpp
include/crocoddyl/core/utils/solution-plot.hpp
include/crocoddyl/core/utils/to-string.hpp
include/crocoddyl/core/utils/version.hpp
include/crocoddyl/deprecated.hh
include/crocoddyl/multibody/actions/contact-fwddyn.hpp
......@@ -42,25 +48,37 @@ include/crocoddyl/multibody/actuations/full.hpp
include/crocoddyl/multibody/contact-base.hpp
include/crocoddyl/multibody/contacts/contact-3d.hpp
include/crocoddyl/multibody/contacts/contact-6d.hpp
include/crocoddyl/multibody/contacts/impulse-3d.hpp
include/crocoddyl/multibody/contacts/impulse-6d.hpp
include/crocoddyl/multibody/contacts/multiple-contacts.hpp
include/crocoddyl/multibody/contacts/multiple-impulses.hpp
include/crocoddyl/multibody/cost-base.hpp
include/crocoddyl/multibody/costs/centroidal-momentum.hpp
include/crocoddyl/multibody/costs/com-position.hpp
include/crocoddyl/multibody/costs/contact-force.hpp
include/crocoddyl/multibody/costs/control.hpp
include/crocoddyl/multibody/costs/cost-sum.hpp
include/crocoddyl/multibody/costs/frame-force.hpp
include/crocoddyl/multibody/costs/frame-placement.hpp
include/crocoddyl/multibody/costs/frame-rotation.hpp
include/crocoddyl/multibody/costs/frame-translation.hpp
include/crocoddyl/multibody/costs/frame-velocity.hpp
include/crocoddyl/multibody/costs/impulse.hpp
include/crocoddyl/multibody/costs/state.hpp
include/crocoddyl/multibody/data/contacts.hpp
include/crocoddyl/multibody/data/impulses.hpp
include/crocoddyl/multibody/data/multibody.hpp
include/crocoddyl/multibody/frames.hpp
include/crocoddyl/multibody/impulse-base.hpp
include/crocoddyl/multibody/impulses/impulse-3d.hpp
include/crocoddyl/multibody/impulses/impulse-6d.hpp
include/crocoddyl/multibody/impulses/multiple-impulses.hpp
include/crocoddyl/multibody/states/multibody.hpp
include/crocoddyl/multibody/utils/quadruped-gaits.hpp
include/crocoddyl/warning.hh
lib/libcrocoddyl.so
lib/pkgconfig/crocoddyl.pc
${PYTHON_SITELIB}/crocoddyl/__init__.py
${PYTHON_SITELIB}/crocoddyl/libcrocoddyl_pywrap.so
${PYTHON_SITELIB}/crocoddyl/libcrocoddyl_pywrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/crocoddyl/utils/__init__.py
${PYTHON_SITELIB}/crocoddyl/utils/biped.py
${PYTHON_SITELIB}/crocoddyl/utils/pendulum.py
${PYTHON_SITELIB}/crocoddyl/utils/quadrotor.py
${PYTHON_SITELIB}/crocoddyl/utils/quadruped.py
SHA1 (crocoddyl-0.9.0.tar.gz) = 07709cdd8b984c80ea8ba89192242071aa3f72f9
RMD160 (crocoddyl-0.9.0.tar.gz) = dcd3982f7e07d52208d3cf398c1532a326c0391d
Size (crocoddyl-0.9.0.tar.gz) = 2129419 bytes
SHA1 (patch-aa) = ed6dc24b8dbe6064193963ba585b3e86023cd985
SHA1 (crocoddyl-1.0.0.tar.gz) = da7dd4f749eb743ca1752e061c5e57129810e06c
RMD160 (crocoddyl-1.0.0.tar.gz) = 59cf7a0d505695b009b100dab78d48c97b80d1cb
Size (crocoddyl-1.0.0.tar.gz) = 1786392 bytes
revert https://github.com/jrl-umi3218/jrl-cmakemodules/pull/214
to comply with robotpkg PYTHON_SITELIB instead of Debian / Ubuntu
--- cmake/python.cmake.orig 2019-07-28 11:15:53.000000000 +0200
+++ cmake/python.cmake 2019-08-31 18:28:52.847614739 +0200
@@ -84,7 +84,7 @@
EXECUTE_PROCESS(
COMMAND "${PYTHON_EXECUTABLE}" "-c"
- "from distutils import sysconfig; print(sysconfig.get_python_lib(prefix='', plat_specific=False))"
+ "import sys, os; print(os.sep.join(['lib', 'python' + sys.version[:3], 'site-packages']))"
OUTPUT_VARIABLE PYTHON_SITELIB
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment