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.

Sign up for GitHub

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

Fix/gazebo with colcon #2109

Merged
merged 11 commits into from
Mar 13, 2019
Merged

Fix/gazebo with colcon #2109

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
86785ed
fixed gazebo bug with colcon
yukkysaito Mar 10, 2019
a72ef1b
update car_demo submodule to fixed bug
yukkysaito Mar 10, 2019
8b5add6
add gitignore for gazebo model dir
yukkysaito Mar 11, 2019
e5ec9ff
enable writable_source in travis
yukkysaito Mar 11, 2019
cb019a2
enable writable source in travis
yukkysaito Mar 11, 2019
9f027dd
remove gitignore
yukkysaito Mar 12, 2019
fdf9888
remove copy script and use symlink
yukkysaito Mar 12, 2019
d2a2e68
remove writable source
yukkysaito Mar 12, 2019
791677a
remove controller manager in CMakeLists.txt
yukkysaito Mar 12, 2019
71c3f64
Add exec permission to shell scripts in runtime manager
yukkysaito Mar 13, 2019
02dfc8e
Merge remote-tracking branch 'origin/fix/gazebo_with_colcon' into fix…
yukkysaito Mar 13, 2019
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
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ cache:
env:
global:
- CCACHE_DIR=$HOME/.ccache
- WRITABLE_SOURCE=true
matrix:
- ROS_DISTRO="kinetic" _GUARD_INTERVAL=10 CATKIN_PARALLEL_JOBS='-p2' ROS_PARALLEL_JOBS='-j2' NOT_TEST_BUILD='true' NOT_TEST_INSTALL='true'
- ROS_DISTRO="melodic" _GUARD_INTERVAL=10 CATKIN_PARALLEL_JOBS='-p2' ROS_PARALLEL_JOBS='-j2' NOT_TEST_BUILD='true' NOT_TEST_INSTALL='true'
Expand Down
3 changes: 2 additions & 1 deletion ...rc/simulation/gazebo_simulator/launcher/vehicle_gazebo_simulation_launcher/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ catkin_package(
install(DIRECTORY launch
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
install(DIRECTORY scripts
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
USE_SOURCE_PERMISSIONS)
21 changes: 9 additions & 12 deletions ...on/gazebo_simulator/launcher/vehicle_gazebo_simulation_launcher/scripts/download_model.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,22 @@
#!/bin/sh

mkdir -p ~/.gazebo/models
amc-nu marked this conversation as resolved.
Show resolved Hide resolved
echo "Download generic gazebo models"
echo "---- Download generic gazebo models ----"
if [ -e /tmp/gazebo_models ]; then
echo "Already exist /tmp/gazebo_models"
echo "removing /tmp/gazebo_models"
echo "---- Already exist /tmp/gazebo_models ----"
echo "---- removing /tmp/gazebo_models ----"
rm -r /tmp/gazebo_models
fi
hg clone https://bitbucket.org/osrf/gazebo_models /tmp/gazebo_models

if [ -e /tmp/gazebo_models ]; then
echo "Install generic gazebo models"
echo "---- Install generic gazebo models ----"
mv -n /tmp/gazebo_models/* ~/.gazebo/models/
echo "Completed"
echo "---- Completed ----"
else
echo "Error"
echo "---- Error ----"
fi

echo "Install osrf_citysim models"
SCRIPT_DIR=$(cd $(dirname $0); pwd)
cp -rn $SCRIPT_DIR/../../../worlds/external/osrf_citysim/models/* ~/.gazebo/models/

echo "Install car_demo models"
cp -rn $SCRIPT_DIR/../../../worlds/external/car_demo/car_demo/models/* ~/.gazebo/models/
echo "---- Install models ----"
cp -rn $(rospack find gazebo_world_description)/models/* ~/.gazebo/models/
amc-nu marked this conversation as resolved.
Show resolved Hide resolved
echo "---- Completed ----"
8 changes: 0 additions & 8 deletions ...bo_simulator/launcher/vehicle_gazebo_simulation_launcher/scripts/integrate_world_files.sh
View file
Open in desktop

This file was deleted.

6 changes: 2 additions & 4 deletions .../simulation/gazebo_simulator/launcher/vehicle_gazebo_simulation_launcher/scripts/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#!/bin/sh

SCRIPT_DIR=$(cd $(dirname $0); pwd)
$SCRIPT_DIR/download_model.sh
$SCRIPT_DIR/upgrade_gazebo_stable_version.sh
$SCRIPT_DIR/integrate_world_files.sh
rosrun vehicle_gazebo_simulation_launcher download_model.sh
rosrun vehicle_gazebo_simulation_launcher upgrade_gazebo_stable_version.sh
2 changes: 1 addition & 1 deletion ros/src/simulation/gazebo_simulator/worlds/external/car_demo
Open in desktop
Submodule car_demo updated 3 files
+0 −0 car_demo/CATKIN_IGNORE
+0 −0 prius_description/CATKIN_IGNORE
+0 −0 prius_msgs/CATKIN_IGNORE
5 changes: 5 additions & 0 deletions ros/src/simulation/gazebo_simulator/worlds/gazebo_world_description/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ project(gazebo_world_description)
find_package(catkin REQUIRED)

catkin_package()
add_custom_target(integrate_model ALL /bin/bash ${CMAKE_CURRENT_SOURCE_DIR}/scripts/integrate_model_files.sh)
amc-nu marked this conversation as resolved.
Show resolved Hide resolved
add_custom_target(integrate_world ALL /bin/bash ${CMAKE_CURRENT_SOURCE_DIR}/scripts/integrate_world_files.sh)

install(DIRECTORY worlds
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})

install(DIRECTORY models
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
2 changes: 2 additions & 0 deletions ros/src/simulation/gazebo_simulator/worlds/gazebo_world_description/models/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*
!.gitignore
8 changes: 8 additions & 0 deletions ...ulation/gazebo_simulator/worlds/gazebo_world_description/scripts/integrate_model_files.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/sh

SCRIPT_DIR=$(cd $(dirname $0); pwd)
echo "Copy world file to gazebo_world_description"
cp -rn $SCRIPT_DIR/../../external/osrf_citysim/models/actor $SCRIPT_DIR/../models/
cp -rn $SCRIPT_DIR/../../external/osrf_citysim/models/city_terrain $SCRIPT_DIR/../models/
cp -rn $SCRIPT_DIR/../../external/osrf_citysim/models/ocean $SCRIPT_DIR/../models/
cp -rn $SCRIPT_DIR/../../external/car_demo/car_demo/models/* $SCRIPT_DIR/../models/
8 changes: 8 additions & 0 deletions ...ulation/gazebo_simulator/worlds/gazebo_world_description/scripts/integrate_world_files.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/sh

SCRIPT_DIR=$(cd $(dirname $0); pwd)
echo "Copy world file to gazebo_world_description"
cp -n $SCRIPT_DIR/../../external/osrf_citysim/worlds/citysim_gazebo7.world $SCRIPT_DIR/../worlds/
cp -n $SCRIPT_DIR/../../external/osrf_citysim/worlds/citysim_gazebo9.world $SCRIPT_DIR/../worlds/
cp -n $SCRIPT_DIR/../../external/car_demo/car_demo/worlds/mcity.world $SCRIPT_DIR/../worlds/
cp -n $SCRIPT_DIR/../../external/car_demo/car_demo/worlds/mcity_r1.world $SCRIPT_DIR/../worlds/