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

Merge branch 'devel' into future

parents 1c54e158 ce6a2f4e
......@@ -26,8 +26,6 @@ RUN apt-get update -y && apt-get install -y \
robotpkg-roboptim-core \
robotpkg-roboptim-trajectory \
robotpkg-romeo-description \
robotpkg-ros-baxter-common \
robotpkg-ros-universal-robot \
robotpkg-py36-omniorbpy \
ros-melodic-xacro \
libccd-dev \
......@@ -42,6 +40,7 @@ RUN apt-get update -y && apt-get install -y \
omniidl-python \
libltdl-dev \
python-matplotlib \
python-omniorb \
libxml2 \
libtinyxml2-dev \
qt4-dev-tools \
......
......@@ -3,11 +3,11 @@ export ROBOTPKG=/opt/openrobots
export ROS=/opt/ros/melodic
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 PKG_CONFIG_PATH=$INSTALL_HPP_DIR/lib/pkgconfig/:$ROBOTPKG/lib/pkgconfig:$ROS/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/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
export LD_LIBRARY_PATH=$INSTALL_HPP_DIR/lib:$ROBOTPKG/lib:$INSTALL_HPP_DIR/lib64:$ROS/lib:$LD_LIBRARY_PATH
# Make sure that /opt/ros/melodic is in the ROS_PACKAGE_PATH,
# otherwise, you should add it by hand in the line below.
......
......@@ -9,7 +9,7 @@ To install all the packages on ubuntu 18.04 LTS 64 bit, you should do the follow
3. install HPP: `sudo apt-get install robotpkg-hpp-tutorial robotpkg-osg-dae`
4. install (optionnal) extra packages for demonstrations:
`sudo apt-get install robotpkg-hpp-tutorial robotpkg-osg-dae ros-melodic-pr2-description robotpkg-hpp-environments robotpkg-hpp-universal-robot robotpkg-romeo-description robotpkg-ros-baxter-common`
`sudo apt-get install robotpkg-hpp-tutorial robotpkg-osg-dae ros-melodic-pr2-description robotpkg-hpp-environments robotpkg-romeo-description
5. setup your environment variables by adding the following lines to your `.bashrc`:
......@@ -51,8 +51,6 @@ To install all the packages on ubuntu 18.04 LTS 64 bit, you should do the follow
robotpkg-roboptim-core \
robotpkg-roboptim-trajectory \
robotpkg-romeo-description \
robotpkg-ros-baxter-common \
robotpkg-ros-universal-robot \
robotpkg-py36-omniorbpy \
ros-melodic-xacro \
libccd-dev \
......@@ -66,6 +64,7 @@ To install all the packages on ubuntu 18.04 LTS 64 bit, you should do the follow
omniidl \
omniidl-python \
libltdl-dev \
python-omniorb \
python-matplotlib \
libxml2 \
libtinyxml2-dev \
......
......@@ -17,16 +17,15 @@ case $HOST_DIST in
CONFIG_FILE="ubuntu-16.04-kinetic.sh"
;;
bionic)
APT_DEP=
"g++ cmake doxygen libboost-dev liburdfdom-dev libassimp-dev \
APT_DEP="g++ cmake doxygen libboost-dev liburdfdom-dev libassimp-dev \
libeigen3-dev libgraphviz-dev robotpkg-qpoases+doc \
robotpkg-roboptim-core robotpkg-roboptim-trajectory
robotpkg-romeo-description robotpkg-ros-baxter-common \
robotpkg-ros-universal-robot robotpkg-py36-omniorbpy \
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 libxml2 \
omniidl omniidl-python libltdl-dev python-matplotlib python-omniorb \
libxml2 \
libtinyxml2-dev qt4-dev-tools libqt4-opengl-dev libqtgui4 \
libqtwebkit-dev oxygen-icon-theme libopenscenegraph-dev \
openscenegraph libpcre3-dev libcdd-dev wget"
......
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