Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DONE]Feature multiple repo #10

Merged
merged 2 commits into from
Oct 28, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
143 changes: 143 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
env/
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
*.egg-info/
.installed.cfg
*.egg

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*,cover
.hypothesis/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# IPython Notebook
.ipynb_checkpoints

# pyenv
.python-version

# celery beat schedule file
celerybeat-schedule

# dotenv
.env

# virtualenv
venv/
ENV/

# Spyder project settings
.spyderproject

# Rope project settings
.ropeproject

# Those goddamn temp files
*~

# Those goddamn IDE guys use vim please
.idea/

build/
bin/
lib/
msg_gen/
srv_gen/
msg/*Action.msg
msg/*ActionFeedback.msg
msg/*ActionGoal.msg
msg/*ActionResult.msg
msg/*Feedback.msg
msg/*Goal.msg
msg/*Result.msg
msg/_*.py

# Generated by dynamic reconfigure
*.cfgc
/cfg/cpp/
/cfg/*.py

# Ignore generated docs
*.dox
*.wikidoc

# eclipse stuff
.project
.cproject

# qcreator stuff
CMakeLists.txt.user

srv/_*.py
*.pcd
*.pyc
qtcreator-*
*.user

/planning/cfg
/planning/docs
/planning/src

*~

# Emacs
.#*

# Catkin custom files
CATKIN_IGNORE
12 changes: 0 additions & 12 deletions rosinstall/sara_full.rosinstall

This file was deleted.

4 changes: 2 additions & 2 deletions rosinstall/sara_robot.rosinstall
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- git: {local-name: sara_commun, uri: 'https://github.com/WalkingMachine/sara_commun.git', version: master}
- git: {local-name: sara_robot, uri: 'https://github.com/WalkingMachine/sara_robot.git', version: master}
- git: {local-name: sara_commun, uri: 'https://github.com/WalkingMachine/sara_commun.git', version: feature_multipleRepo}
- git: {local-name: sara_robot, uri: 'https://github.com/WalkingMachine/sara_robot.git', version: feature_multipleRepo}

- git: {local-name: robotiq, uri: 'https://github.com/ros-industrial/robotiq.git', version: indigo-devel}

Expand Down
6 changes: 3 additions & 3 deletions rosinstall/sara_simulation.rosinstall
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- git: {local-name: sara_simultaion, uri: 'https://github.com/WalkingMachine/sara_simulation.git', version: master}
- git: {local-name: sara_commun, uri: 'https://github.com/WalkingMachine/sara_commun.git', version: master}
- git: {local-name: sara_desktop, uri: 'https://github.com/WalkingMachine/sara_desktop.git', version: master}
- git: {local-name: sara_simultaion, uri: 'https://github.com/WalkingMachine/sara_simulation.git', master}
- git: {local-name: sara_commun, uri: 'https://github.com/WalkingMachine/sara_commun.git', version: feature_multiRepo}
- git: {local-name: sara_desktop, uri: 'https://github.com/WalkingMachine/sara_desktop.git', version: feature_multiRepo}

- git: {local-name: robotiq, uri: 'https://github.com/ros-industrial/robotiq.git', version: indigo-devel}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ echo "Creating Workspace"

mkdir -p ~/sara_ws
cd ~/sara_ws
wstool init src ~/sara_install/rosinstall/sara_full.rosinstall
wstool init src ~/sara_install/rosinstall/sara_robot.rosinstall
wstool update -t src

echo "source /opt/ros/indigo/setup.bash" >> ~/.bashrc
Expand Down
88 changes: 88 additions & 0 deletions script/sara_simulation_installer.bash
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
#!/bin/sh

echo "S.A.R.A. Installation beginning"

# Adding source and key
echo "Adding source and key"

sudo sh -c 'echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros-latest.list'
sudo apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-key 0xB01FA116

# To get the latest package lists
echo "Getting latest package lists and upgrading system"

sudo apt update -y
sudo apt upgrade -y

# ROS installation
echo "Installing ROS"

sudo apt install -y ros-indigo-desktop-full -y
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This wont work since the setup will be done on a server without a GUI


# Install tools
echo "Installing tools"

sudo apt install git python-pip python-wstool -y

# Package installation
echo "Installing package"

sudo apt install ros-indigo-openni2-launch ros-indigo-urg-node ros-indigo-xsens-driver \
ros-indigo-joystick-drivers ros-indigo-navigation ros-indigo-pocketsphinx ros-indigo-rosserial \
ros-indigo-roboteq-diagnostics ros-indigo-roboteq-msgs ros-indigo-smach \
ros-indigo-rtabmap-ros ros-indigo-gazebo-ros ros-indigo-slam-gmapping ros-indigo-map-laser \
ros-indigo-moveit-full ros-indigo-geographic-info \
ros-indigo-zbar-ros ros-indigo-dynamixel-motor couchdb python-rosinstall libyaml-dev \
ros-indigo-soem espeak ros-indigo-object-recognition-core ros-indigo-object-recognition-renderer -y

# Utility installation
echo "Installing Utility"

sudo apt install htop lm-sensors tig -y

# Interface graphic couchapp
echo "Installing graphic for couchapp"

sudo pip install -U couchapp

# pyttsx
echo "Installing pyttsx"

sudo pip install pyttsx

# workspace creation
echo "Creating Workspace"

mkdir -p ~/sara_ws
cd ~/sara_ws
wstool init src ~/sara_install/rosinstall/sara_simulation.rosinstall
wstool update -t src

echo "source /opt/ros/indigo/setup.bash" >> ~/.bashrc
source ~/.bashrc

# rosdep
echo "ros dep"

sudo rosdep init
rosdep update
rosdep install --from-paths src --ignore-src --rosdistro indigo -y

# catkin_make to build all the packages
echo "Building packages"

catkin_make -DCATKIN_WHITELIST_PACKAGES="wm_arm_msgs"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wasn't there a fix for this? I believe @maximest-pierre had solved the issue


catkin_make -DCATKIN_WHITELIST_PACKAGES="wm_arm_driver"

catkin_make -DCATKIN_WHITELIST_PACKAGES=""

catkin_make

#enable database online viewer
rosrun object_recognition_core push.sh

echo "source ~/sara_ws/devel/setup.bash" >> ~/.bashrc

echo "Continue with remote_setup.md"
echo "Installation done go get a beer and code"