Merge 6 to main

Signed-off-by: Ian Chen <[email protected]>

Changelog.md

@@ -4,11 +4,68 @@
 
 ## Gazebo Launch 6.x
 
-### Gazebo Launch 6.X.X (202X-XX-XX)
+### Gazebo Launch 6.0.0
+
+1. Fix macOs compiler error.
+    * [Pull request #161](https://github.com/gazebosim/gz-launch/pull/161)
+
+1. Update to latest gtest.
+    * [Pull request #174](https://github.com/gazebosim/gz-launch/pull/174)
+
+1. Ignition to Gazebo renaming
+    * [Pull request #162](https://github.com/gazebosim/gz-launch/pull/162)
+    * [Pull request #163](https://github.com/gazebosim/gz-launch/pull/163)
+    * [Pull request #165](https://github.com/gazebosim/gz-launch/pull/165)
+    * [Pull request #166](https://github.com/gazebosim/gz-launch/pull/166)
+    * [Pull request #168](https://github.com/gazebosim/gz-launch/pull/168)
+    * [Pull request #169](https://github.com/gazebosim/gz-launch/pull/169)
+    * [Pull request #170](https://github.com/gazebosim/gz-launch/pull/170)
+    * [Pull request #171](https://github.com/gazebosim/gz-launch/pull/171)
+    * [Pull request #172](https://github.com/gazebosim/gz-launch/pull/172)
+    * [Pull request #173](https://github.com/gazebosim/gz-launch/pull/173)
+    * [Pull request #176](https://github.com/gazebosim/gz-launch/pull/176)
+    * [Pull request #188](https://github.com/gazebosim/gz-launch/pull/188)
+
+1. Fix `msgs` header usage.
+    * [Pull request #196](https://github.com/gazebosim/gz-launch/pull/196)
+
+1. Version bumps and removal of deprecations
+    * [Pull request #144](https://github.com/gazebosim/gz-launch/pull/144)
+    * [Pull request #145](https://github.com/gazebosim/gz-launch/pull/145)
+    * [Pull request #150](https://github.com/gazebosim/gz-launch/pull/150)
+    * [Pull request #156](https://github.com/gazebosim/gz-launch/pull/156)
+
+## Gazebo Launch 5.x
+
+### Gazebo Launch 5.2.0 (2022-08-16)
+
+1. Add code coverage ignore file
+    * [Pull request #179](https://github.com/gazebosim/gz-launch/pull/179)
+
+1. Change `IGN_DESIGNATION` to `GZ_DESIGNATION`
+    * [Pull request #181](https://github.com/gazebosim/gz-launch/pull/181)
+    * [Pull request #182](https://github.com/gazebosim/gz-launch/pull/182)
+
+1. fix `ign_TEST` for Fortress
+    * [Pull request #180](https://github.com/gazebosim/gz-launch/pull/180)
+
+1. Ignition -> Gazebo
+    * [Pull request #178](https://github.com/gazebosim/gz-launch/pull/178)
+
+1. Bash completion for flags
+    * [Pull request #167](https://github.com/gazebosim/gz-launch/pull/167)
+
+1. Adds ability to get a file from a running Gazebo instance
+    * [Pull request #164](https://github.com/gazebosim/gz-launch/pull/164)
+
+1. Add Ubuntu Jammy CI
+    * [Pull request #154](https://github.com/gazebosim/gz-launch/pull/154)
+
+1. Depend on `python3-yaml` instead of `python-yaml`
+    * [Pull request #153](https://github.com/gazebosim/gz-launch/pull/153)
 
 ## Gazebo Launch 5.x
 
-### Gazebo Launch 5.X.X (20XX-XX-XX)
 
 ### Gazebo Launch 5.1.0 (2022-03-21)
 1. Use exec instead of popen to run gz-launch binary

plugins/joy_to_twist/JoyToTwist.cc

@@ -19,10 +19,11 @@
 #include <sys/stat.h>
 #ifndef _WIN32
   #include <unistd.h>
-#else
-
 #endif
 
+#include <gz/msgs/joy.pb.h>
+#include <gz/msgs/twist.pb.h>
+
 #include <gz/common/Console.hh>
 #include <gz/common/Util.hh>
 #include <gz/math/Helpers.hh>

plugins/joy_to_twist/JoyToTwist.hh

@@ -19,17 +19,19 @@
 
 #include <string>
 #include <thread>
+
+#include <gz/msgs/joy.pb.h>
+
 #include <gz/launch/Plugin.hh>
 #include <gz/math/Vector3.hh>
-#include <gz/msgs.hh>
 #include <gz/plugin/Register.hh>
 #include <gz/transport/Node.hh>
 
 namespace gz
 {
   namespace launch
   {
-    /// \brief Converts gz::msgs::Joystick messages to
+    /// \brief Converts gz::msgs::Joy messages to
     /// gz::msgs::Twist.
     ///
     /// # Example usage
@@ -38,7 +40,7 @@ namespace gz
     /// <plugin name="gz::launch::JoyToTwist"
     ///         filename=gz-launch-joytotwist0">
     ///   <!-- Incoming topic that publishes
-    ///         gz::msgs::Joystick messages -->
+    ///         gz::msgs::Joy messages -->
     ///   <input_topic>/joy</input_topic>
     ///
     ///   <!-- Outgoing topic that publishes gz::msgs::Twist messages -->

plugins/joystick/Joystick.cc

@@ -19,10 +19,12 @@
 #include <linux/joystick.h>
 #include <sys/stat.h>
 #include <unistd.h>
+
+#include <gz/msgs/joy.pb.h>
+
 #include <gz/common/Console.hh>
 #include <gz/common/Util.hh>
 #include <gz/math/Helpers.hh>
-#include <gz/msgs.hh>
 #include <gz/transport/Node.hh>
 
 #include "Joystick.hh"

plugins/sim_factory/SimFactory.cc

@@ -15,11 +15,13 @@
  *
 */
 
-#include <gz/msgs/entity_factory.pb.h>
 #include <gz/msgs/boolean.pb.h>
+#include <gz/msgs/entity_factory.pb.h>
+#include <gz/msgs/stringmsg.pb.h>
 
 #include <gz/common/Util.hh>
 #include <gz/common/Console.hh>
+#include <gz/msgs/Utility.hh>
 #include "SimFactory.hh"
 
 using namespace gz;

plugins/sim_server/SimServer.cc

@@ -327,11 +327,16 @@ bool SimServer::Load(const tinyxml2::XMLElement *_elem)
     }
 
     // Create an SDF element of the plugin
+    sdf::Plugin plugin;
+    plugin.SetFilename(file);
+    plugin.SetName(name);
+
     sdf::ElementPtr sdf(new sdf::Element);
     copyElement(sdf, elem);
+    plugin.InsertContent(sdf);
 
     // Add the plugin to the server config
-    serverConfig.AddPlugin({entityName, entityType, file, name, sdf});
+    serverConfig.AddPlugin({entityName, entityType, plugin});
   }
 
   // Set headless rendering

plugins/websocket_server/WebsocketServer.cc

@@ -16,6 +16,17 @@
 */
 
 #include <algorithm>
+
+#include <gz/msgs/bytes.pb.h>
+#include <gz/msgs/empty.pb.h>
+#include <gz/msgs/image.pb.h>
+#include <gz/msgs/particle_emitter_v.pb.h>
+#include <gz/msgs/publish.pb.h>
+#include <gz/msgs/publishers.pb.h>
+#include <gz/msgs/scene.pb.h>
+#include <gz/msgs/stringmsg.pb.h>
+#include <gz/msgs/stringmsg_v.pb.h>
+
 #include <gz/common/Console.hh>
 #include <gz/common/Image.hh>
 #include <gz/common/Util.hh>

src/cmd/gz_TEST.cc

@@ -68,7 +68,8 @@ TEST(CmdLine, Ls)
   std::string cmd = "gz launch " + get_config_path("ls.gzlaunch");
   std::string output = customExecStr(cmd);
   EXPECT_TRUE(output.find("CMakeFiles") != std::string::npos) << output;
-  EXPECT_TRUE(output.find("Makefile") != std::string::npos) << output;
+  EXPECT_TRUE(output.find("cmake_install.cmake") != std::string::npos)
+    << output;
 }
 
 /////////////////////////////////////////////////