fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-27 08:53:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Improvements to SITL to make paths more flexible. (#5181)"

Browse Source 
This reverts commit 699b6a2cb3.
This commit is contained in:
Lorenz Meier
2016-08-05 21:29:49 +02:00
parent bbe3525377
commit 102f5b54d7
72 changed files with 672 additions and 643 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integrationtests/setup_gazebo_ros.bash
+7 -12
View File
@@ -4,24 +4,19 @@
#
# License: according to LICENSE.md in the root directory of the PX4 Firmware repository
if [ "$#" != 2 ]
if [ "$#" -lt 1 ]
then
echo usage: source setup_gazebo_ros.bash src_dir build_dir
echo usage: source setup_gazebo_ros.bash firmware_src_dir
echo ""
return 1
fi
SRC_DIR=$1
BUILD_DIR=$2
# setup Gazebo env and update package path
export GAZEBO_RESOURCE_PATH=${SRC_DIR}/Tools/sitl_gazebo:${GAZEBO_RESOURCE_PATH}
export GAZEBO_MODEL_PATH=${SRC_DIR}/Tools/sitl_gazebo/models:${GAZEBO_MODEL_PATH}
export GAZEBO_PLUGIN_PATH=${BUILD_DIR}/build_gazebo:${GAZEBO_PLUGIN_PATH}
export LD_LIBRARY_PATH=${SRC_DIR}/Tools/sitl_gazebo/Build/msgs/:${BUILD_DIR}/build_gazebo:${LD_LIBRARY_PATH}:
export GAZEBO_MODEL_PATH=${GAZEBO_MODEL_PATH}:${SRC_DIR}/Tools/sitl_gazebo/models
export GAZEBO_PLUGIN_PATH=${SRC_DIR}/build_gazebo:${GAZEBO_PLUGIN_PATH}
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${SRC_DIR}/Tools/sitl_gazebo/Build/msgs/
export ROS_PACKAGE_PATH=${ROS_PACKAGE_PATH}:${SRC_DIR}
export GAZEBO_MODEL_DATABASE_URI=""
echo -e "GAZEBO_RESOURCE_PATH $GAZEBO_RESOURCE_PATH"
echo -e "GAZEBO_MODEL_PATH $GAZEBO_MODEL_PATH"
echo -e "GAZEBO_PLUGIN_PATH $GAZEBO_PLUGIN_PATH"
echo -e "LD_LIBRARY_PATH $LD_LIBRARY_PATH"
export SITL_GAZEBO_PATH=$SRC_DIR/Tools/sitl_gazebo