Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Guilhem Saurel
hpp-doc
Commits
28ba5296
Commit
28ba5296
authored
Mar 15, 2019
by
Guilhem Saurel
Browse files
use robotpkg binaries for osg-dae, baxter-common & romeo
parent
581f6773
Changes
5
Hide whitespace changes
Inline
Side-by-side
.dockers/ubuntu-14.04/Dockerfile
View file @
28ba5296
...
...
@@ -6,7 +6,8 @@ RUN apt-get update -qqy && apt-get install -qqy \
RUN
echo
"deb http://packages.ros.org/ros/ubuntu trusty main"
>
/etc/apt/sources.list.d/ros-latest.list
RUN
apt-key adv
--keyserver
hkp://ha.pool.sks-keyservers.net:80
--recv-key
421C365BD9FF1F717815A3895523BAEEB01FA116
RUN
echo
"deb [arch=amd64] http://robotpkg.openrobots.org/packages/debian/pub trusty robotpkg"
>
/etc/apt/sources.list.d/robotpkg.list
RUN
echo
"deb [arch=amd64] http://robotpkg.openrobots.org/wip/packages/debian/pub trusty robotpkg"
>
/etc/apt/sources.list.d/robotpkg.list
RUN
echo
"deb [arch=amd64] http://robotpkg.openrobots.org/packages/debian/pub trusty robotpkg"
>>
/etc/apt/sources.list.d/robotpkg.list
RUN
curl http://robotpkg.openrobots.org/packages/debian/robotpkg.key | apt-key add -
RUN
apt-get update
-qqy
&&
apt-get
install
-qqy
\
...
...
@@ -36,10 +37,12 @@ RUN apt-get update -qqy && apt-get install -qqy \
oxygen-icon-theme
\
python-matplotlib
\
qt4-dev-tools
\
robotpkg-osg-dae
\
robotpkg-qpoases+doc
\
robotpkg-roboptim-core
\
robotpkg-roboptim-trajectory
\
robotpkg-romeo-description
\
robotpkg-ros-baxter-common
\
ros-indigo-xacro
\
ros-indigo-kdl-parser
\
ros-indigo-common-msgs
\
...
...
.dockers/ubuntu-14.04/Dockerfile.premade
View file @
28ba5296
...
...
@@ -4,5 +4,4 @@ ENV DEVEL_DIR /workspace
RUN /auto-install-hpp.sh --branch ubuntu-14.04 --target \
"doxygen-1.8.10.install \
osg-dae.install \
eigen3.install"
.dockers/ubuntu-16.04/Dockerfile
View file @
28ba5296
...
...
@@ -6,7 +6,8 @@ RUN apt-get update -qqy && apt-get install -qqy \
RUN
echo
"deb http://packages.ros.org/ros/ubuntu xenial main"
>
/etc/apt/sources.list.d/ros-latest.list
RUN
apt-key adv
--keyserver
hkp://ha.pool.sks-keyservers.net:80
--recv-key
421C365BD9FF1F717815A3895523BAEEB01FA116
RUN
echo
"deb [arch=amd64] http://robotpkg.openrobots.org/packages/debian/pub xenial robotpkg"
>
/etc/apt/sources.list.d/robotpkg.list
RUN
echo
"deb [arch=amd64] http://robotpkg.openrobots.org/wip/packages/debian/pub xenial robotpkg"
>
/etc/apt/sources.list.d/robotpkg.list
RUN
echo
"deb [arch=amd64] http://robotpkg.openrobots.org/packages/debian/pub xenial robotpkg"
>>
/etc/apt/sources.list.d/robotpkg.list
RUN
curl http://robotpkg.openrobots.org/packages/debian/robotpkg.key | apt-key add -
RUN
apt-get update
-qqy
&&
apt-get
install
-qqy
\
...
...
@@ -19,10 +20,12 @@ RUN apt-get update -qqy && apt-get install -qqy \
libcdd-dev
\
libglpk-dev
\
liburdfdom-dev
\
robotpkg-osg-dae
\
robotpkg-qpoases+doc
\
robotpkg-roboptim-core
\
robotpkg-roboptim-trajectory
\
robotpkg-romeo-description
\
robotpkg-ros-baxter-common
\
ros-kinetic-xacro
\
ros-kinetic-kdl-parser
\
ros-kinetic-common-msgs
\
...
...
.dockers/ubuntu-16.04/Dockerfile.premade
View file @
28ba5296
FROM eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/ubuntu:16.04
ENV DEVEL_HPP_DIR /workspace
RUN /auto-install-hpp.sh --branch devel --target osg-dae.install
doc/Makefile
View file @
28ba5296
...
...
@@ -8,7 +8,6 @@ LAAS_REPO=https://github.com/laas
HPP_REPO
=
https://github.com/humanoid-path-planner
SOT_REPO
=
https://github.com/stack-of-tasks
GEPETTO_REPO
=
https://github.com/Gepetto
RETHINK_ROBOTICS_REPO
=
https://github.com/RethinkRobotics
TRAC_REPO
=
ssh://trac.laas.fr/git/jrl/robots/ros-hrp2
SRC_DIR
=
${DEVEL_HPP_DIR}
/src
...
...
@@ -149,18 +148,12 @@ universal_robot_repository=${HPP_REPO}
hpp_universal_robot_branch
=
devel
hpp_universal_robot_repository
=
${HPP_REPO}
baxter_common_branch
=
master
baxter_common_repository
=
${RETHINK_ROBOTICS_REPO}
hpp-baxter_branch
=
master
hpp-baxter_repository
=
${HPP_REPO}
hpp_romeo_branch
=
master
hpp_romeo_repository
=
${HPP_REPO}
romeo_branch
=
master
romeo_repository
=
${HPP_REPO}
# }}}
##################################
...
...
@@ -243,14 +236,13 @@ all: hpp_tutorial.install hpp-gepetto-viewer.install
${MAKE}
hpp-doc.install
# For test on gepgitlab, install robot packages first
test-ci
:
baxter_common.install romeo.install universal_robot.install
\
hpp-environments.install
test-ci
:
universal_robot.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
:
baxter_common.install romeo.install
universal_robot.install
\
benchmark
:
universal_robot.install
\
hpp-environments.install hrp2-14-description.install
${MAKE}
hpp_tutorial.install hpp-gepetto-viewer.install
;
\
${MAKE}
hpp-baxter.install hpp_romeo.install
\
...
...
@@ -323,8 +315,7 @@ osg-dae.configure.dep: collada-dom.install \
osg-dae.checkout
OpenSceneGraph-3.4.0.configure.dep
:
collada-dom.install
\
OpenSceneGraph-3.4.0.checkout
gepetto-viewer.configure.dep
:
${OSG_PACKAGE}.install
\
gepetto-viewer.checkout
gepetto-viewer.configure.dep
:
gepetto-viewer.checkout
gepetto-viewer-corba.configure.dep
:
gepetto-viewer.install
\
pythonqt.install gepetto-viewer-corba.checkout
hpp-gepetto-viewer.configure.dep
:
gepetto-viewer-corba.install
\
...
...
@@ -335,10 +326,8 @@ universal_robot.configure.dep: universal_robot.checkout
hpp_universal_robot.configure.dep
:
universal_robot.install
\
hpp_universal_robot.checkout
hpp-environments.configure.dep
:
hpp-environments.checkout
baxter_common.configure.dep
:
baxter_common.checkout
hpp-baxter.configure.dep
:
baxter_common.install hpp-baxter.checkout
hpp_romeo.configure.dep
:
romeo.install hpp_romeo.checkout
romeo.configure.dep
:
romeo.checkout
hpp-baxter.configure.dep
:
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-corba.configure.dep
:
hpp-affordance.install hpp-template-corba.install
\
hpp-corbaserver.install hpp-affordance-corba.checkout
...
...
@@ -475,36 +464,6 @@ universal_robot.install:universal_robot.configure
cd
${SRC_DIR}
/
$
(
@:.install
=)
/ur_description/
${BUILD_FOLDER}
;
\
make
install
baxter_common.configure_nodep
:
mkdir
-p
${SRC_DIR}
/
$
(
@:.configure_nodep
=)
/baxter_description/
${BUILD_FOLDER}
;
\
cd
${SRC_DIR}
/
$
(
@:.configure_nodep
=)
/baxter_description/
${BUILD_FOLDER}
;
\
cmake
-DCMAKE_INSTALL_PREFIX
=
${DEVEL_HPP_DIR}
/install
-DCMAKE_INSTALL_LIBDIR
=
lib
-DCMAKE_BUILD_TYPE
=
${BUILD_TYPE}
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO
=
"-g -O3 -DNDEBUG"
${
$
(@
:.configure_nodep
=)_extra_flags
}
..
;
\
mkdir
-p
${SRC_DIR}
/
$
(
@:.configure_nodep
=)
/rethink_ee_description/
${BUILD_FOLDER}
;
\
cd
${SRC_DIR}
/
$
(
@:.configure_nodep
=)
/rethink_ee_description/
${BUILD_FOLDER}
;
\
cmake
-DCMAKE_INSTALL_PREFIX
=
${DEVEL_HPP_DIR}
/install
-DCMAKE_INSTALL_LIBDIR
=
lib
-DCMAKE_BUILD_TYPE
=
${BUILD_TYPE}
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO
=
"-g -O3 -DNDEBUG"
${
$
(@
:.configure_nodep
=)_extra_flags
}
..
baxter_common.install_nodep
:
baxter_common.configure_nodep
cd
${SRC_DIR}
/
$
(
@:.install_nodep
=)
/baxter_description/
${BUILD_FOLDER}
;
\
make
install
;
\
cd
${SRC_DIR}
/
$
(
@:.install_nodep
=)
/rethink_ee_description/
${BUILD_FOLDER}
;
\
make
install
baxter_common.install
:
baxter_common.configure
cd
${SRC_DIR}
/
$
(
@:.install
=)
/baxter_description/
${BUILD_FOLDER}
;
\
make
install
;
\
cd
${SRC_DIR}
/
$
(
@:.install
=)
/rethink_ee_description/
${BUILD_FOLDER}
;
\
make
install
romeo.configure
:
romeo.configure.dep
.
${INSTALL_HPP_DIR}
/setup.sh
;
\
cd
${SRC_DIR}
/romeo/romeo_description
;
\
mkdir
-p
${BUILD_FOLDER}
;
\
cd
${SRC_DIR}
/romeo/romeo_description/
${BUILD_FOLDER}
;
\
cmake
-DCMAKE_INSTALL_PREFIX
=
${INSTALL_HPP_DIR}
-DCMAKE_INSTALL_LIBDIR
=
lib
-DCMAKE_BUILD_TYPE
=
${BUILD_TYPE}
..
romeo.install
:
romeo.configure
${MAKE}
-C
${SRC_DIR}
/romeo/romeo_description/
${BUILD_FOLDER}
install
# }}}
# vim: foldmethod=marker foldlevel=0
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment