Commit 089708f9 authored by Florent Lamiraux's avatar Florent Lamiraux Committed by Florent Lamiraux florent@laas.fr
Browse files

Merge branch 'devel' into future

parents 2b49d7b0 53651875
FROM eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/ubuntu:16.04
FROM memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/ubuntu:16.04
ENV DEVEL_HPP_DIR /workspace
FROM eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/ubuntu:18.04
FROM memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/ubuntu:18.04
ENV DEVEL_HPP_DIR /workspace
......@@ -73,97 +73,97 @@ variables:
paths:
- workspace
master-16.04-build:
image: eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/master-premade:16.04
master-18.04-build:
image: memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/master-premade:18.04
only:
- future
<<: *build_definition
master-18.04-build:
image: eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/master-premade:18.04
master-16.04-build:
image: memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/master-premade:16.04
allow_failure: true
only:
- future
<<: *build_definition
devel-16.04-build:
image: eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/devel-premade:16.04
devel-18.04-build:
image: memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/devel-premade:18.04
only:
- devel
<<: *build_definition
devel-18.04-build:
image: eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/devel-premade:18.04
devel-16.04-build:
image: memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/devel-premade:16.04
allow_failure: true
only:
- devel
<<: *build_definition
master-16.04-test:
image: eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/master-premade:16.04
master-18.04-test:
image: memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/master-premade:18.04
dependencies:
- master-16.04-build
- master-18.04-build
only:
- future
<<: *test_definition
master-18.04-test:
master-16.04-test:
allow_failure: true
image: eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/master-premade:18.04
image: memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/master-premade:16.04
dependencies:
- master-18.04-build
- master-16.04-build
only:
- future
<<: *test_definition
devel-16.04-test:
image: eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/devel-premade:16.04
devel-18.04-test:
image: memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/devel-premade:18.04
dependencies:
- devel-16.04-build
- devel-18.04-build
only:
- devel
<<: *test_definition
devel-18.04-test:
image: eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/devel-premade:18.04
devel-16.04-test:
image: memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/devel-premade:16.04
allow_failure: true
dependencies:
- devel-18.04-build
- devel-16.04-build
only:
- devel
<<: *test_definition
master-16.04-doc:
image: eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/master-premade:16.04
master-18.04-doc:
image: memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/master-premade:18.04
dependencies:
- master-16.04-build
- master-18.04-build
only:
- future
<<: *doc_definition
master-18.04-doc:
image: eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/master-premade:18.04
master-16.04-doc:
image: memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/master-premade:16.04
allow_failure: true
dependencies:
- master-18.04-build
- master-16.04-build
only:
- future
<<: *doc_definition
devel-16.04-doc:
image: eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/devel-premade:16.04
devel-18.04-doc:
image: memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/devel-premade:18.04
dependencies:
- devel-16.04-build
- devel-18.04-build
only:
- devel
<<: *doc_definition
devel-18.04-doc:
image: eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/devel-premade:18.04
devel-16.04-doc:
image: memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/devel-premade:16.04
allow_failure: true
dependencies:
- devel-18.04-build
- devel-16.04-build
only:
- devel
<<: *doc_definition
......@@ -45,7 +45,7 @@ pinocchio_branch=v2.2.1
pinocchio_repository=${SOT_REPO}
pinocchio_extra_flags= -DBUILD_PYTHON_INTERFACE=OFF -DBUILD_UNIT_TESTS=OFF -DBUILD_WITH_COLLISION_SUPPORT=ON
hpp-template-corba_branch=v4.5.0
hpp-template-corba_branch=devel
hpp-template-corba_repository=${HPP_REPO}
# }}}
......@@ -60,7 +60,7 @@ hpp-util_repository=${HPP_REPO}
hpp-fcl_branch=v1.2.0
hpp-fcl_repository=${HPP_REPO}
hpp-fcl_extra_flags= -DCMAKE_BUILD_TYPE=Release
hpp-fcl_extra_flags= -DCMAKE_BUILD_TYPE=Release -DBUILD_PYTHON_INTERFACE=OFF
hpp-statistics_branch=v4.8.0
hpp-statistics_repository=${HPP_REPO}
......@@ -79,6 +79,7 @@ hpp-core_extra_flags=${HPP_EXTRA_FLAGS}
hpp-corbaserver_branch=v4.8.0
hpp-corbaserver_repository=${HPP_REPO}
hpp-corbaserver_extra_flags= -DPYTHON_EXECUTABLE=/usr/bin/python3
hpp-walkgen_branch=v4.8.0
hpp-walkgen_repository=${HPP_REPO}
......@@ -98,6 +99,7 @@ hpp-manipulation-urdf_repository=${HPP_REPO}
hpp-manipulation-corba_branch=v4.8.0
hpp-manipulation-corba_repository=${HPP_REPO}
hpp-manipulation-corba_extra_flags= -DPYTHON_EXECUTABLE=/usr/bin/python3
ifeq (${HUMANOID}, TRUE)
hpp-manipulation_extra_flags=-DHPP_MANIPULATION_HAS_WHOLEBODY_STEP=TRUE
......@@ -107,15 +109,18 @@ endif
hpp_tutorial_branch=v4.8.0
hpp_tutorial_repository=${HPP_REPO}
hpp_tutorial_extra_flags= -DPYTHON_EXECUTABLE=/usr/bin/python3
hpp-gepetto-viewer_branch=v4.8.0
hpp-gepetto-viewer_repository=${HPP_REPO}
hpp-gepetto-viewer_extra_flags= -DPYTHON_EXECUTABLE=/usr/bin/python3
hpp-plot_branch=v4.8.0
hpp-plot_repository=${HPP_REPO}
hpp-gui_branch=v4.8.0
hpp-gui_repository=${HPP_REPO}
hpp-gui_extra_flags= -DPYTHON_EXECUTABLE=/usr/bin/python3
hpp-practicals_branch=v4.8.0
hpp-practicals_repository=${HPP_REPO}
......@@ -126,12 +131,14 @@ hpp-practicals_repository=${HPP_REPO}
example-robot-data_branch=devel
example-robot-data_repository=${GEPETTO_REPO}
example-robot-data_extra_flags= -DPYTHON_EXECUTABLE=/usr/bin/python3 -DBUILD_PYTHON_INTERFACE=OFF
hrp2-14-description_branch=master
hrp2-14-description_repository=${TRAC_REPO}
hpp-hrp2_branch=master
hpp-hrp2_repository=${HPP_REPO}
hpp-hrp2_extra_flags= -DPYTHON_EXECUTABLE=/usr/bin/python3
robot_capsule_urdf_branch=groovy
robot_capsule_urdf_repository=${LAAS_REPO}
......@@ -147,19 +154,22 @@ hpp_benchmark_repository=${HPP_REPO}
hpp-environments_branch=v4.4.0
hpp-environments_repository=${HPP_REPO}
hpp-environments_extra_flags= -DPYTHON_EXECUTABLE=/usr/bin/python3
universal_robot_branch=kinetic
universal_robot_repository=${HPP_REPO}
hpp-universal-robot_branch=v4.8.0
hpp-universal-robot_repository=${HPP_REPO}
hpp-universal-robot_extra_flags= -DPYTHON_EXECUTABLE=/usr/bin/python3
hpp-baxter_branch=v4.8.0
hpp-baxter_repository=${HPP_REPO}
hpp-baxter_extra_flags= -DPYTHON_EXECUTABLE=/usr/bin/python3
hpp_romeo_branch=v4.8.0
hpp_romeo_repository=${HPP_REPO}
hpp_romeo_extra_flags= -DPYTHON_EXECUTABLE=/usr/bin/python3
# }}}
##################################
......@@ -217,6 +227,7 @@ gepetto-viewer_extra_flags= -DPYTHON_EXECUTABLE=/usr/bin/python3
gepetto-viewer-corba_branch=v5.3.0
gepetto-viewer-corba_repository=${GEPETTO_REPO}
gepetto-viewer-corba_extra_flags= -DPYTHON_EXECUTABLE=/usr/bin/python3
pythonqt_branch=qt${QT_VERSION}
pythonqt_repository=${GEPETTO_REPO}
......@@ -241,13 +252,13 @@ all: hpp_tutorial.install hpp-gepetto-viewer.install hpp-plot.install hpp-gui.in
${MAKE} hpp-doc.install
# For test on gepgitlab, install robot packages first
test-ci: universal_robot.install hpp-environments.install
test-ci: example-robot-data.install hpp-environments.install
${MAKE} hpp_tutorial.install hpp-gepetto-viewer.install hpp-rbprm-corba.install \
hpp-universal-robot.install && \
${MAKE} hpp-doc.install
# For benchmark, install robot packages first
benchmark: universal_robot.install \
benchmark: example-robot-data.install \
hpp-environments.install hrp2-14-description.install
${MAKE} hpp_tutorial.install hpp-gepetto-viewer.install; \
${MAKE} hpp-baxter.install hpp_romeo.install \
......@@ -273,8 +284,8 @@ pinocchio.configure.dep: hpp-fcl.install pinocchio.checkout
hpp-pinocchio.configure.dep: pinocchio.install hpp-util.install \
hpp-pinocchio.checkout
hpp-statistics.configure.dep: hpp-util.install hpp-statistics.checkout
hpp-core.configure.dep: hpp-constraints.install hpp-statistics.install \
hpp-core.checkout
hpp-core.configure.dep: example-robot-data.install hpp-constraints.install \
hpp-statistics.install hpp-core.checkout
hpp-constraints.configure.dep: hpp-pinocchio.install hpp-statistics.install \
hpp-constraints.checkout
hpp-wholebody-step.configure.dep: hpp-constraints.install hpp-walkgen.install \
......
......@@ -2,23 +2,18 @@ export INSTALL_HPP_DIR=$DEVEL_HPP_DIR/install
export ROBOTPKG=/opt/openrobots
export ROS=/opt/ros/melodic
export PATH=$INSTALL_HPP_DIR/sbin:$INSTALL_HPP_DIR/bin:$ROS/bin:$PATH
export PATH=$INSTALL_HPP_DIR/sbin:$INSTALL_HPP_DIR/bin:$ROBOTPKG/bin:$ROBOTPKG/sbin:$ROS/bin:$PATH
export PKG_CONFIG_PATH=$INSTALL_HPP_DIR/lib/pkgconfig/:$ROS/lib/pkgconfig:$ROBOTPKG/lib/pkgconfig
export PYTHONPATH=$INSTALL_HPP_DIR/lib/python2.7/site-packages:$INSTALL_HPP_DIR/lib/python2.7/dist-packages:$ROS/lib/python2.7/dist-packages:$ROBOTPKG/lib/python2.7/site-packages:$PYTHONPATH
export PYTHONPATH=$INSTALL_HPP_DIR/lib/python3/dist-packages:$ROBOTPKG/lib/python3.6/site-packages:$INSTALL_HPP_DIR/lib/python2.7/site-packages:$INSTALL_HPP_DIR/lib/python2.7/dist-packages:$ROBOTPKG/lib/python2.7/site-packages:$ROS/lib/python2.7/dist-packages:$PYTHONPATH
export LD_LIBRARY_PATH=$INSTALL_HPP_DIR/lib:$INSTALL_HPP_DIR/lib64:$ROS/lib:$ROBOTPKG/lib:$LD_LIBRARY_PATH
if [ -f $INSTALL_HPP_DIR/setup.bash ]; then
source $INSTALL_HPP_DIR/setup.bash
else
source $ROS/setup.bash
fi
# Make sure that /opt/ros/melodic is in the ROS_PACKAGE_PATH,
# otherwise, you should add it by hand in the line below.
export ROS_PACKAGE_PATH=$INSTALL_HPP_DIR/share:$ROBOTPKG/share:$ROS_PACKAGE_PATH
export ROS_PACKAGE_PATH=$INSTALL_HPP_DIR/share:$ROBOTPKG/share:$ROS/share
export CMAKE_PREFIX_PATH=$INSTALL_HPP_DIR:$ROBOTPKG:$ROS:/usr
if [ -f "${INSTALL_HPP_DIR}/etc/hpp-tools/bashrc" ]; then
source "${INSTALL_HPP_DIR}/etc/hpp-tools/bashrc"
fi
export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:$ROBOTPKG
......@@ -29,10 +29,10 @@ You will find three files in the directory `${DEVEL_HPP_DIR}/tarball/`:
branch=$(git branch --no-color | grep \* | cut -d' ' -f2)
for ubuntu in 16.04 18.04
do
docker build -t eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/ubuntu:${ubuntu} -f .dockers/ubuntu-${ubuntu}/Dockerfile ./scripts
docker build -t eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/${branch}-premade:${ubuntu} -f .dockers/ubuntu-${ubuntu}/Dockerfile.premade ./scripts
docker push eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/ubuntu:${ubuntu}
docker push eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/${branch}-premade:${ubuntu}
docker build -t memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/ubuntu:${ubuntu} -f .dockers/ubuntu-${ubuntu}/Dockerfile ./scripts
docker build -t memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/${branch}-premade:${ubuntu} -f .dockers/ubuntu-${ubuntu}/Dockerfile.premade ./scripts
docker push memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/ubuntu:${ubuntu}
docker push memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/${branch}-premade:${ubuntu}
done
```
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment