Skip to content

Commit

Permalink
hpp-fcl -> coal
Browse files Browse the repository at this point in the history
  • Loading branch information
nim65s committed Dec 5, 2024
1 parent 3469817 commit 136180c
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 41 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ endmacro(ADD_HPP_PKG)

set(SETUP_DOC_PKG)

add_hpp_pkg(hpp-fcl)
add_hpp_pkg(coal)
add_hpp_pkg(hpp-util)
add_hpp_pkg(hpp-statistics)
add_hpp_pkg(pinocchio)
Expand Down
2 changes: 1 addition & 1 deletion doc/figures/archi.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion doc/main.dox.in
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ how to use this project.
\section hpp_doc_algorithms_motion_planning Motion planning

\par Kinematic chain with geometry
- @hpp-fcl_LINK@: Modified version of Flexible collision library, for collision detection and distance computation,
- @coal_LINK@: Modified version of Flexible collision library, for collision detection and distance computation,
- @pinocchio_LINK@: implementation of kinematic chain with dynamic computations,
- @hpp-pinocchio_LINK@: Interface between pinocchio and hpp-core,

Expand Down
8 changes: 4 additions & 4 deletions doc/packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ fi


# Package database.
pkg "hpp-fcl" \
"hpp-fcl" \
"[email protected]:humanoid-path-planner/fcl" \
"path/hpp-fcl"
pkg "coal" \
"coal" \
"[email protected]:coal-library/coal" \
"path/coal"

pkg "hpp-corbaserver" \
"hpp-corbaserver" \
Expand Down
14 changes: 7 additions & 7 deletions makefiles/devel.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Author: Florent Lamiraux
#

FCL_REPO=https://github.com/flexible-collision-library
COAL_REPO=https://github.com/coal-library
LAAS_REPO=https://github.com/laas
HPP_REPO=https://github.com/humanoid-path-planner
SOT_REPO=https://github.com/stack-of-tasks
Expand Down Expand Up @@ -37,9 +37,9 @@ PYTHON_FLAGS=-DPYTHON_STANDARD_LAYOUT=ON
##################################
# {{{ Dependencies

hpp-fcl_branch=devel
hpp-fcl_repository=${HPP_REPO}
hpp-fcl_extra_flags= -DBUILD_PYTHON_INTERFACE=ON -DHPP_FCL_HAS_QHULL=ON ${PYTHON_FLAGS}
coal_branch=devel
coal_repository=${COAL_REPO}
coal_extra_flags= -DBUILD_PYTHON_INTERFACE=ON -DCOAL_HAS_QHULL=ON ${PYTHON_FLAGS} -DCOAL_BACKWARD_COMPATIBILITY_WITH_HPP_FCL=ON

eigenpy_branch=devel
eigenpy_repository=${SOT_REPO}
Expand Down Expand Up @@ -250,10 +250,10 @@ rbprm: hpp-affordance-corba.install hpp-gepetto-viewer.install
# {{{ Dependencies declaration

hpp-doc.configure.dep: hpp-doc.checkout
hpp-fcl.configure.dep: hpp-fcl.checkout
coal.configure.dep: coal.checkout
hpp-util.configure.dep: hpp-util.checkout
eigenpy.configure.dep: eigenpy.checkout
pinocchio.configure.dep: eigenpy.install hpp-fcl.install pinocchio.checkout
pinocchio.configure.dep: eigenpy.install coal.install pinocchio.checkout
hpp-pinocchio.configure.dep: pinocchio.install hpp-util.install hpp-environments.install\
hpp-pinocchio.checkout
hpp-statistics.configure.dep: hpp-util.install hpp-statistics.checkout
Expand Down Expand Up @@ -298,7 +298,7 @@ example-robot-data.configure.dep: pinocchio.install example-robot-data.checkout
hpp-environments.configure.dep: hpp-environments.checkout
hpp-baxter.configure.dep: example-robot-data.install hpp-baxter.checkout
hpp_romeo.configure.dep: hpp_romeo.checkout
hpp-affordance.configure.dep: hpp-core.install hpp-fcl.install hpp-affordance.checkout
hpp-affordance.configure.dep: hpp-core.install coal.install hpp-affordance.checkout
hpp-affordance-corba.configure.dep: hpp-affordance.install hpp-template-corba.install \
hpp-corbaserver.install hpp-affordance-corba.checkout
anymal-rbprm.configure.dep: anymal-rbprm.checkout
Expand Down
18 changes: 9 additions & 9 deletions makefiles/stable.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Author: Florent Lamiraux
#

FCL_REPO=https://github.com/flexible-collision-library
COAL_REPO=https://github.com/coal-library
LAAS_REPO=https://github.com/laas
HPP_REPO=https://github.com/humanoid-path-planner
SOT_REPO=https://github.com/stack-of-tasks
Expand Down Expand Up @@ -37,15 +37,15 @@ PYTHON_FLAGS=-DPYTHON_STANDARD_LAYOUT=ON
##################################
# {{{ Dependencies

hpp-fcl_branch=v2.4.5
hpp-fcl_repository=${HPP_REPO}
hpp-fcl_extra_flags= -DBUILD_PYTHON_INTERFACE=ON -DHPP_FCL_HAS_QHULL=ON ${PYTHON_FLAGS}
coal_branch=v3.0.0
coal_repository=${COAL_REPO}
coal_extra_flags= -DBUILD_PYTHON_INTERFACE=ON -DCOAL_HAS_QHULL=ON ${PYTHON_FLAGS} -DCOAL_BACKWARD_COMPATIBILITY_WITH_HPP_FCL=ON

eigenpy_branch=v3.10.0
eigenpy_branch=v3.10.1
eigenpy_repository=${SOT_REPO}
eigenpy_extra_flags=${PYTHON_FLAGS}

pinocchio_branch=v3.2.0
pinocchio_branch=v3.3.0
pinocchio_repository=${SOT_REPO}
pinocchio_extra_flags= -DBUILD_PYTHON_INTERFACE=ON -DBUILD_UNIT_TESTS=OFF -DBUILD_WITH_COLLISION_SUPPORT=ON -DINSTALL_DOCUMENTATION=OFF ${PYTHON_FLAGS}

Expand Down Expand Up @@ -250,10 +250,10 @@ rbprm: hpp-affordance-corba.install hpp-gepetto-viewer.install
# {{{ Dependencies declaration

hpp-doc.configure.dep: hpp-doc.checkout
hpp-fcl.configure.dep: hpp-fcl.checkout
coal.configure.dep: coal.checkout
hpp-util.configure.dep: hpp-util.checkout
eigenpy.configure.dep: eigenpy.checkout
pinocchio.configure.dep: eigenpy.install hpp-fcl.install pinocchio.checkout
pinocchio.configure.dep: eigenpy.install coal.install pinocchio.checkout
hpp-pinocchio.configure.dep: pinocchio.install hpp-util.install hpp-environments.install\
hpp-pinocchio.checkout
hpp-statistics.configure.dep: hpp-util.install hpp-statistics.checkout
Expand Down Expand Up @@ -298,7 +298,7 @@ example-robot-data.configure.dep: pinocchio.install example-robot-data.checkout
hpp-environments.configure.dep: hpp-environments.checkout
hpp-baxter.configure.dep: example-robot-data.install hpp-baxter.checkout
hpp_romeo.configure.dep: hpp_romeo.checkout
hpp-affordance.configure.dep: hpp-core.install hpp-fcl.install hpp-affordance.checkout
hpp-affordance.configure.dep: hpp-core.install coal.install hpp-affordance.checkout
hpp-affordance-corba.configure.dep: hpp-affordance.install hpp-template-corba.install \
hpp-corbaserver.install hpp-affordance-corba.checkout
anymal-rbprm.configure.dep: anymal-rbprm.checkout
Expand Down
17 changes: 0 additions & 17 deletions releases/versions

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/create-tags.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ version=$1

# Packages to tag
# pinocchio
pkg_main="hpp-util hpp-statistics hpp-fcl hpp-pinocchio \
pkg_main="hpp-util hpp-statistics hpp-pinocchio \
hpp-constraints hpp-corbaserver hpp-core hpp_tutorial hpp-doc \
hpp-manipulation hpp-manipulation-corba hpp-manipulation-urdf \
hpp-gepetto-viewer hpp-gui hpp-plot"
Expand Down

0 comments on commit 136180c

Please sign in to comment.