diff --git a/Changelog.md b/Changelog.md index c41888cf..46c6eca4 100644 --- a/Changelog.md +++ b/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 diff --git a/plugins/joy_to_twist/JoyToTwist.cc b/plugins/joy_to_twist/JoyToTwist.cc index 17aa68c8..862d634a 100644 --- a/plugins/joy_to_twist/JoyToTwist.cc +++ b/plugins/joy_to_twist/JoyToTwist.cc @@ -19,10 +19,11 @@ #include #ifndef _WIN32 #include -#else - #endif +#include +#include + #include #include #include diff --git a/plugins/joy_to_twist/JoyToTwist.hh b/plugins/joy_to_twist/JoyToTwist.hh index 3081f097..5228916c 100644 --- a/plugins/joy_to_twist/JoyToTwist.hh +++ b/plugins/joy_to_twist/JoyToTwist.hh @@ -19,9 +19,11 @@ #include #include + +#include + #include #include -#include #include #include @@ -29,7 +31,7 @@ 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 /// /// + /// gz::msgs::Joy messages --> /// /joy /// /// diff --git a/plugins/joystick/Joystick.cc b/plugins/joystick/Joystick.cc index 3b8723f3..796db43c 100644 --- a/plugins/joystick/Joystick.cc +++ b/plugins/joystick/Joystick.cc @@ -19,10 +19,12 @@ #include #include #include + +#include + #include #include #include -#include #include #include "Joystick.hh" diff --git a/plugins/sim_factory/SimFactory.cc b/plugins/sim_factory/SimFactory.cc index d5ba18db..600a7df9 100644 --- a/plugins/sim_factory/SimFactory.cc +++ b/plugins/sim_factory/SimFactory.cc @@ -15,11 +15,13 @@ * */ -#include #include +#include +#include #include #include +#include #include "SimFactory.hh" using namespace gz; diff --git a/plugins/sim_server/SimServer.cc b/plugins/sim_server/SimServer.cc index 7a29d48a..f56bee37 100644 --- a/plugins/sim_server/SimServer.cc +++ b/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 diff --git a/plugins/websocket_server/WebsocketServer.cc b/plugins/websocket_server/WebsocketServer.cc index 53e4e919..ad67376e 100644 --- a/plugins/websocket_server/WebsocketServer.cc +++ b/plugins/websocket_server/WebsocketServer.cc @@ -16,6 +16,17 @@ */ #include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include #include diff --git a/src/cmd/gz_TEST.cc b/src/cmd/gz_TEST.cc index 635f48ce..f02f39ba 100644 --- a/src/cmd/gz_TEST.cc +++ b/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; } /////////////////////////////////////////////////