Skip to content

GitLab

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

Merge branch 'devel' into future

parents 1e433616 37ecf74d
Hide whitespace changes
Inline Side-by-side
.dockers/ubuntu-16.04/Dockerfile
View file @ 2f7542ce
......@@ -20,7 +20,6 @@ RUN apt-get update -y && apt-get install -y \
libcdd-dev \
libglpk-dev \
liburdfdom-dev \
robotpkg-osg-dae \
robotpkg-qpoases+doc \
robotpkg-roboptim-core \
robotpkg-roboptim-trajectory \
......
.dockers/ubuntu-16.04/Dockerfile.premade
View file @ 2f7542ce
FROM memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/ubuntu:16.04
FROM gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/ubuntu:16.04
ENV DEVEL_HPP_DIR /workspace
.dockers/ubuntu-18.04/Dockerfile
View file @ 2f7542ce
......@@ -22,6 +22,7 @@ RUN apt-get update -y && apt-get install -y \
libassimp-dev \
libeigen3-dev \
libgraphviz-dev \
robotpkg-omniorb \
robotpkg-qpoases+doc \
robotpkg-roboptim-core \
robotpkg-roboptim-trajectory \
......@@ -36,8 +37,6 @@ RUN apt-get update -y && apt-get install -y \
git \
libomniorb4-dev \
omniorb-nameserver \
omniidl \
omniidl-python \
libltdl-dev \
python-matplotlib \
python-omniorb \
......
.dockers/ubuntu-18.04/Dockerfile.premade
View file @ 2f7542ce
FROM memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/ubuntu:18.04
FROM gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/ubuntu:18.04
ENV DEVEL_HPP_DIR /workspace
.gitlab-ci.yml
View file @ 2f7542ce
......@@ -74,33 +74,33 @@ variables:
- workspace
master-18.04-build:
image: memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/master-premade:18.04
image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/master-premade:18.04
only:
- future
<<: *build_definition
master-16.04-build:
image: memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/master-premade:16.04
image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/master-premade:16.04
allow_failure: true
only:
- future
<<: *build_definition
devel-18.04-build:
image: memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/devel-premade:18.04
image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/devel-premade:18.04
only:
- devel
<<: *build_definition
devel-16.04-build:
image: memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/devel-premade:16.04
image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/devel-premade:16.04
allow_failure: true
only:
- devel
<<: *build_definition
master-18.04-test:
image: memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/master-premade:18.04
image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/master-premade:18.04
dependencies:
- master-18.04-build
only:
......@@ -109,7 +109,7 @@ master-18.04-test:
master-16.04-test:
allow_failure: true
image: memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/master-premade:16.04
image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/master-premade:16.04
dependencies:
- master-16.04-build
only:
......@@ -118,7 +118,7 @@ master-16.04-test:
devel-18.04-test:
image: memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/devel-premade:18.04
image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/devel-premade:18.04
dependencies:
- devel-18.04-build
only:
......@@ -126,7 +126,7 @@ devel-18.04-test:
<<: *test_definition
devel-16.04-test:
image: memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/devel-premade:16.04
image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/devel-premade:16.04
allow_failure: true
dependencies:
- devel-16.04-build
......@@ -135,7 +135,7 @@ devel-16.04-test:
<<: *test_definition
master-18.04-doc:
image: memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/master-premade:18.04
image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/master-premade:18.04
dependencies:
- master-18.04-build
only:
......@@ -143,7 +143,7 @@ master-18.04-doc:
<<: *doc_definition
master-16.04-doc:
image: memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/master-premade:16.04
image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/master-premade:16.04
allow_failure: true
dependencies:
- master-16.04-build
......@@ -152,7 +152,7 @@ master-16.04-doc:
<<: *doc_definition
devel-18.04-doc:
image: memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/devel-premade:18.04
image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/devel-premade:18.04
dependencies:
- devel-18.04-build
only:
......@@ -160,7 +160,7 @@ devel-18.04-doc:
<<: *doc_definition
devel-16.04-doc:
image: memmos.laas.fr:5000/humanoid-path-planner/hpp-doc/devel-premade:16.04
image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/devel-premade:16.04
allow_failure: true
dependencies:
- devel-16.04-build
......
doc/Makefile
View file @ 2f7542ce
......@@ -17,16 +17,14 @@ INSTALL_HPP_DIR=${DEVEL_HPP_DIR}/install
endif
# Whether to compute humanoid specific part
HUMANOID=TRUE
HUMANOID?=TRUE
BUILD_TYPE=Release
DISABLE_TESTS=OFF
BUILD_TESTING=ON
BUILD_TYPE?=Release
BUILD_TESTING?=ON
ifeq (${BUILD_TYPE},Debug)
BUILD_FOLDER=build
else
BUILD_FOLDER=build-rel
DISABLE_TESTS=ON
BUILD_TESTING=OFF
endif
......@@ -44,7 +42,7 @@ INSTALL_DOCUMENTATION=ON
##################################
# {{{ Dependencies
pinocchio_branch=v2.4.4
pinocchio_branch=v2.4.5
pinocchio_repository=${SOT_REPO}
pinocchio_extra_flags= -DBUILD_PYTHON_INTERFACE=OFF -DBUILD_UNIT_TESTS=OFF -DBUILD_WITH_COLLISION_SUPPORT=ON
......@@ -56,8 +54,7 @@ hpp-template-corba_repository=${HPP_REPO}
# {{{ Packages supporting HPP_VERSION
# Either a version tag (e.g. v4.3.0), master or devel
HPP_EXTRA_FLAGS=-DDISABLE_TESTS=${DISABLE_TESTS} \
-DBUILD_TESTING=${BUILD_TESTING}$
HPP_EXTRA_FLAGS= -DBUILD_TESTING=${BUILD_TESTING}$
hpp-util_branch=v4.9.0
hpp-util_repository=${HPP_REPO}
......@@ -75,7 +72,7 @@ hpp-pinocchio_extra_flags=${HPP_EXTRA_FLAGS}
hpp-constraints_branch=v4.9.1
hpp-constraints_repository=${HPP_REPO}
hpp-constraints_extra_flags=${HPP_EXTRA_FLAGS} -DUSE_QPOASES=OFF -DRUN_TESTS=OFF
hpp-constraints_extra_flags=${HPP_EXTRA_FLAGS} -DUSE_QPOASES=OFF
hpp-core_branch=v4.9.0
hpp-core_repository=${HPP_REPO}
......@@ -254,7 +251,8 @@ 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: example-robot-data.install hpp-environments.install
test-ci: example-robot-data.install hpp-environments.install \
hpp-baxter.install
${MAKE} hpp_tutorial.install hpp-gepetto-viewer.install hpp-rbprm-corba.install \
hpp-universal-robot.install && \
${MAKE} hpp-doc.install
......
doc/instructions.md
View file @ 2f7542ce
......@@ -47,6 +47,7 @@ To install all the packages on ubuntu 18.04 LTS 64 bit, you should do the follow
libassimp-dev \
libeigen3-dev \
libgraphviz-dev \
robotpkg-omniorb \
robotpkg-qpoases+doc \
robotpkg-roboptim-core \
robotpkg-roboptim-trajectory \
......@@ -61,8 +62,6 @@ To install all the packages on ubuntu 18.04 LTS 64 bit, you should do the follow
git \
libomniorb4-dev \
omniorb-nameserver \
omniidl \
omniidl-python \
libltdl-dev \
python-omniorb \
python-matplotlib \
......
scripts/README.md
View file @ 2f7542ce
......@@ -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 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}
docker build -t gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/ubuntu:${ubuntu} -f .dockers/ubuntu-${ubuntu}/Dockerfile ./scripts
docker build -t gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/${branch}-premade:${ubuntu} -f .dockers/ubuntu-${ubuntu}/Dockerfile.premade ./scripts
docker push gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/ubuntu:${ubuntu}
docker push gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/${branch}-premade:${ubuntu}
done
```
......
scripts/auto-install-hpp.sh
View file @ 2f7542ce
......@@ -18,13 +18,13 @@ case $HOST_DIST in
;;
bionic)
APT_DEP="g++ cmake doxygen libboost-dev liburdfdom-dev libassimp-dev \
libeigen3-dev libgraphviz-dev robotpkg-qpoases+doc \
libeigen3-dev libgraphviz-dev robotpkg-omniorb robotpkg-qpoases+doc \
robotpkg-roboptim-core robotpkg-roboptim-trajectory
robotpkg-romeo-description robotpkg-py36-omniorbpy \
ros-melodic-xacro libccd-dev ros-melodic-octomap \
ros-melodic-resource-retriever ros-melodic-srdfdom \
ros-melodic-pr2-description git libomniorb4-dev omniorb-nameserver \
omniidl omniidl-python libltdl-dev python-matplotlib python-omniorb \
libltdl-dev python-matplotlib python-omniorb \
libxml2 \
libtinyxml2-dev qt4-dev-tools libqt4-opengl-dev libqtgui4 \
libqtwebkit-dev oxygen-icon-theme libopenscenegraph-dev \
......
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