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

Merge branch 'devel' into future

parents 6f7b430b 3b3c0968
...@@ -406,6 +406,7 @@ update: ...@@ -406,6 +406,7 @@ update:
else \ else \
cd ${SRC_DIR}/$(@:.fetch=);\ cd ${SRC_DIR}/$(@:.fetch=);\
git fetch ${GIT_QUIET} origin; \ git fetch ${GIT_QUIET} origin; \
git fetch ${GIT_QUIET} origin --tags; \
fi fi
%.update: %.update:
...@@ -416,6 +417,7 @@ update: ...@@ -416,6 +417,7 @@ update:
git remote rm origin;\ git remote rm origin;\
git remote add origin ${$(@:.update=)_repository}/$(@:.update=);\ git remote add origin ${$(@:.update=)_repository}/$(@:.update=);\
git fetch origin;\ git fetch origin;\
git fetch origin --tags;\
git checkout -q --detach;\ git checkout -q --detach;\
git branch -f ${$(@:.update=)_branch} origin/${$(@:.update=)_branch};\ git branch -f ${$(@:.update=)_branch} origin/${$(@:.update=)_branch};\
git checkout -q ${$(@:.update=)_branch};\ git checkout -q ${$(@:.update=)_branch};\
......
...@@ -6,12 +6,35 @@ To install all the packages on ubuntu 18.04 LTS 64 bit, you should do the follow ...@@ -6,12 +6,35 @@ To install all the packages on ubuntu 18.04 LTS 64 bit, you should do the follow
2. install robotpkg: follow [the robotpkg installation website](http://robotpkg.openrobots.org/debian.html). 2. install robotpkg: follow [the robotpkg installation website](http://robotpkg.openrobots.org/debian.html).
3. install HPP: `sudo apt-get install robotpkg-hpp-tutorial robotpkg-osg-dae` 3. install HPP:
```bash
#pyver=27
pyver=36
sudo apt-get install robotpkg-py${pyver}-hpp-manipulation-corba robotpkg-py${pyver}-qt5-hpp-gepetto-viewer
```
4. install (optionnal) extra packages for demonstrations: 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-romeo-description
5. setup your environment variables by adding the following lines to your `.bashrc`: - Tutorials (binary release of the tutorial is only available for Python 2.7):
```bash
sudo apt-get install robotpkg-py27-hpp-tutorial
```
- GUI:
```bash
sudo apt-get install robotpkg-py${pyver}-qt5-hpp-gui robotpkg-py${pyver}-qt5-hpp-manipulation
```
- Some robot descriptions:
```bash
sudo apt-get install ros-melodic-pr2-description robotpkg-py${pyver}-hpp-environments robotpkg-romeo-description
```
5. setup your environment variables by adding the following lines (fix Python version if necessary) to your `.bashrc`:
```bash ```bash
source /opt/ros/melodic/setup.bash source /opt/ros/melodic/setup.bash
......
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