Merge branch 'fix/kill-gzserver' into feature/kill-gzserver

gazebo_dev/package.xml

@@ -6,15 +6,16 @@
     Provides a cmake config for the default version of Gazebo for the ROS distribution.
   </description>
 
-  <maintainer email="[email protected]">John Hsu</maintainer>
-  <maintainer email="[email protected]">Dave Coleman</maintainer>
+  <maintainer email="[email protected]">Alejandro Hernández Cordero</maintainer>
 
   <license>Apache 2.0</license>
 
   <url type="website">http://gazebosim.org/tutorials?cat=connect_ros</url>
   <url type="bugtracker">https://github.com/ros-simulation/gazebo_ros_pkgs/issues</url>
   <url type="repository">https://github.com/ros-simulation/gazebo_ros_pkgs</url>
 
+  <author>Dave Coleman</author>
+  <author>John Hsu</author>
   <author>Johannes Meyer</author>
 
   <buildtool_depend>catkin</buildtool_depend>

gazebo_msgs/package.xml

@@ -6,6 +6,7 @@
     Message and service data structures for interacting with Gazebo from ROS.
   </description>
 
+  <maintainer email="[email protected]">Alejandro Hernández Cordero</maintainer>
   <maintainer email="[email protected]">Jose Luis Rivero</maintainer>
 
   <license>BSD</license>

gazebo_plugins/CMakeLists.txt

@@ -313,7 +313,7 @@ add_library(gazebo_ros_skid_steer_drive src/gazebo_ros_skid_steer_drive.cpp)
 target_link_libraries(gazebo_ros_skid_steer_drive ${catkin_LIBRARIES} ${Boost_LIBRARIES})
 
 add_library(gazebo_ros_video src/gazebo_ros_video.cpp)
-target_link_libraries(gazebo_ros_video ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${OGRE_LIBRARIES} ${opencv_LIBRARIES})
+target_link_libraries(gazebo_ros_video ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${OGRE_LIBRARIES} ${OpenCV_LIBRARIES})
 
 add_library(gazebo_ros_planar_move src/gazebo_ros_planar_move.cpp)
 target_link_libraries(gazebo_ros_planar_move ${catkin_LIBRARIES} ${Boost_LIBRARIES})

gazebo_plugins/package.xml

@@ -6,6 +6,7 @@
     Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components.
   </description>
 
+  <maintainer email="[email protected]">Alejandro Hernández Cordero</maintainer>
   <maintainer email="[email protected]">Jose Luis Rivero</maintainer>
 
   <license>BSD, Apache 2.0</license>

gazebo_plugins/src/gazebo_ros_ft_sensor.cpp

@@ -95,7 +95,7 @@ void GazeboRosFT::Load( physics::ModelPtr _model, sdf::ElementPtr _sdf )
 
   if (!_sdf->HasElement("gaussianNoise"))
   {
-    ROS_INFO_NAMED("ft_sensor", "imu plugin missing <gaussianNoise>, defaults to 0.0");
+    ROS_INFO_NAMED("ft_sensor", "ft_sensor plugin missing <gaussianNoise>, defaults to 0.0");
     this->gaussian_noise_ = 0.0;
   }
   else

gazebo_ros/package.xml

@@ -7,6 +7,7 @@
     Formally simulator_gazebo/gazebo
   </description>
 
+  <maintainer email="[email protected]">Alejandro Hernández Cordero</maintainer>
   <maintainer email="[email protected]">Jose Luis Rivero</maintainer>
 
   <license>Apache 2.0</license>

gazebo_ros/scripts/debug

@@ -19,4 +19,4 @@ then
 fi
 
 setup_path=$(pkg-config --variable=prefix gazebo)/share/gazebo/
-. $setup_path/setup.sh && rosrun gazebo_ros gdbrun gzserver $final
+. $setup_path/setup.sh && exec rosrun gazebo_ros gdbrun gzserver $final

gazebo_ros/scripts/gazebo

@@ -49,7 +49,7 @@ if $(kill -0 $! 2> /dev/null); then
 fi
 
 # Kill the server if it is alive
-if $(kill -0 $! 2> /dev/null); then
+if $(kill -0 $gzserver_pid 2> /dev/null); then
   # -2 SIGINT valid for Linux and Mac
-  kill -2 $!
+  kill -2 $gzserver_pid
 fi

gazebo_ros/scripts/gzclient

@@ -17,12 +17,6 @@ then
     final="$final -g `catkin_find --first-only libgazebo_ros_paths_plugin.$EXT`"
 fi
 
-# add ros api plugin if it does not already exist in the passed in arguments
-if [ `expr "$final" : ".*libgazebo_ros_api_plugin\.$EXT.*"` -eq 0 ]
-then
-    final="$final -g `catkin_find --first-only libgazebo_ros_api_plugin.$EXT`"
-fi
-
 setup_path=$(pkg-config --variable=prefix gazebo)/share/gazebo/
 
 # source setup.sh, but keep local modifications to GAZEBO_MASTER_URI and GAZEBO_MODEL_DATABASE_URI
@@ -39,4 +33,4 @@ fi
 final=$(relocate_remappings "${final}")
 
 # Combine the commands
-GAZEBO_MASTER_URI="$desired_master_uri" GAZEBO_MODEL_DATABASE_URI="$desired_model_database_uri" gzclient $final
+GAZEBO_MASTER_URI="$desired_master_uri" GAZEBO_MODEL_DATABASE_URI="$desired_model_database_uri" exec gzclient $final

gazebo_ros/scripts/gzserver

@@ -38,4 +38,4 @@ fi
 
 final=$(relocate_remappings "${final}")
 
-GAZEBO_MASTER_URI="$desired_master_uri" GAZEBO_MODEL_DATABASE_URI="$desired_model_database_uri" gzserver $final
+GAZEBO_MASTER_URI="$desired_master_uri" GAZEBO_MODEL_DATABASE_URI="$desired_model_database_uri" exec gzserver $final

gazebo_ros/scripts/perf

@@ -18,4 +18,4 @@ then
 fi
 
 setup_path=$(pkg-config --variable=prefix gazebo)/share/gazebo/
-. $setup_path/setup.sh && /usr/bin/valgrind --tool=callgrind gzserver $final
+. $setup_path/setup.sh && exec /usr/bin/valgrind --tool=callgrind gzserver $final

gazebo_ros_control/package.xml

@@ -4,6 +4,7 @@
   <version>2.9.2</version>
   <description>gazebo_ros_control</description>
 
+  <maintainer email="[email protected]">Alejandro Hernández Cordero</maintainer>
   <maintainer email="[email protected]">Jose Luis Rivero</maintainer>
 
   <license>BSD</license>

gazebo_ros_pkgs/package.xml

@@ -4,6 +4,7 @@
   <version>2.9.2</version>
   <description>Interface for using ROS with the <a href="http://gazebosim.org/">Gazebo</a> simulator.</description>
 
+  <maintainer email="[email protected]">Alejandro Hernández Cordero</maintainer>
   <maintainer email="[email protected]">Jose Luis Rivero</maintainer>
 
   <license>BSD,LGPL,Apache 2.0</license>