Leave ignition as primary in headers to fix ABI

Signed-off-by: methylDragon <methylDragon@gmail.com>
gazebosim · Sep 5, 2022 · f5f5a68 · f5f5a68
1 parent 6c71217
commit f5f5a68
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 33 deletions.
diff --git a/include/gz/launch/Plugin.hh b/include/gz/launch/Plugin.hh
@@ -21,7 +21,7 @@
 #include <gz/plugin/SpecializedPluginPtr.hh>
 #include <gz/launch/Export.hh>
 
-namespace gz
+namespace ignition
 {
   namespace launch
   {

diff --git a/include/gz/launch/config.hh.in b/include/gz/launch/config.hh.in
@@ -17,3 +17,12 @@
 #cmakedefine BUILD_TYPE_PROFILE 1
 #cmakedefine BUILD_TYPE_DEBUG 1
 #cmakedefine BUILD_TYPE_RELEASE 1
+
+namespace ignition
+{
+}
+
+namespace gz
+{
+  using namespace ignition;
+}
diff --git a/include/ignition/launch/config.hh b/include/ignition/launch/config.hh
@@ -38,14 +38,4 @@
 /* #undef BUILD_TYPE_DEBUG */
 /* #undef BUILD_TYPE_RELEASE */
 
-namespace gz
-{
-}
-
-namespace ignition
-{
-  using namespace gz;
-}
-
-
 #endif
diff --git a/plugins/gazebo_factory/GazeboFactory.hh b/plugins/gazebo_factory/GazeboFactory.hh
@@ -22,7 +22,7 @@
 #include <gz/transport/Node.hh>
 #include "gz/launch/Plugin.hh"
 
-namespace gz
+namespace ignition
 {
   namespace launch
   {

diff --git a/plugins/gazebo_gui/GazeboGui.hh b/plugins/gazebo_gui/GazeboGui.hh
@@ -22,7 +22,7 @@
 #include <gz/plugin/Register.hh>
 #include <gz/launch/Plugin.hh>
 
-namespace gz
+namespace ignition
 {
   namespace launch
   {

diff --git a/plugins/gazebo_server/GazeboServer.hh b/plugins/gazebo_server/GazeboServer.hh
@@ -22,7 +22,7 @@
 #include <gz/sim/Server.hh>
 #include "gz/launch/Plugin.hh"
 
-namespace gz
+namespace ignition
 {
   namespace launch
   {

diff --git a/plugins/joy_to_twist/JoyToTwist.hh b/plugins/joy_to_twist/JoyToTwist.hh
@@ -21,11 +21,11 @@
 #include <thread>
 #include <gz/launch/Plugin.hh>
 #include <gz/math/Vector3.hh>
-#include <gz/msgs.hh>
+#include <ignition/msgs.hh>
 #include <gz/plugin/Register.hh>
 #include <gz/transport/Node.hh>
 
-namespace gz
+namespace ignition
 {
   namespace launch
   {

diff --git a/plugins/joystick/Joystick.cc b/plugins/joystick/Joystick.cc
@@ -22,7 +22,7 @@
 #include <gz/common/Console.hh>
 #include <gz/common/Util.hh>
 #include <gz/math/Helpers.hh>
-#include <gz/msgs.hh>
+#include <ignition/msgs.hh>
 #include <gz/transport/Node.hh>
 
 #include "Joystick.hh"

diff --git a/plugins/joystick/Joystick.hh b/plugins/joystick/Joystick.hh
@@ -22,7 +22,7 @@
 #include <gz/plugin/Register.hh>
 #include <gz/transport/Node.hh>
 
-namespace gz
+namespace ignition
 {
   namespace launch
   {

diff --git a/plugins/websocket_server/MessageDefinitions.hh.in b/plugins/websocket_server/MessageDefinitions.hh.in
@@ -17,7 +17,7 @@
 #ifndef GZ_LAUNCH_WEBSOCKETSERVER_MESSAGEDEFINITIONS_HH_
 #define GZ_LAUNCH_WEBSOCKETSERVER_MESSAGEDEFINITIONS_HH_
 
-namespace gz
+namespace ignition
 {
   namespace launch
   {

diff --git a/plugins/websocket_server/WebsocketServer.cc b/plugins/websocket_server/WebsocketServer.cc
@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <gz/common/Console.hh>
 #include <gz/common/Util.hh>
-#include <gz/msgs.hh>
+#include <ignition/msgs.hh>
 
 #include "MessageDefinitions.hh"
 #include "WebsocketServer.hh"
@@ -650,7 +650,7 @@ void WebsocketServer::OnMessage(int _socketId, const std::string &_msg)
     igndbg << "Protos request received\n";
 
     std::string allProtos = "syntax = \"proto3\";\n";
-    allProtos += "package gz.msgs;\n";
+    allProtos += "package ignition.msgs;\n";
 
     std::vector<std::string> types;
     gz::msgs::Factory::Types(types);
@@ -694,7 +694,7 @@ void WebsocketServer::OnMessage(int _socketId, const std::string &_msg)
       msg.add_data(topic);
 
     std::string data = BUILD_MSG(this->operations[PUBLISH], frameParts[0],
-        std::string("gz.msgs.StringMsg_V"), msg.SerializeAsString());
+        std::string("ignition.msgs.StringMsg_V"), msg.SerializeAsString());
 
     // Queue the message for delivery.
     this->QueueMessage(this->connections[_socketId].get(),
@@ -714,7 +714,7 @@ void WebsocketServer::OnMessage(int _socketId, const std::string &_msg)
         req, timeout, rep, result);
 
     std::string data = BUILD_MSG(this->operations[PUBLISH], frameParts[0],
-        std::string("gz.msgs.StringMsg_V"), rep.SerializeAsString());
+        std::string("ignition.msgs.StringMsg_V"), rep.SerializeAsString());
 
     // Queue the message for delivery.
     this->QueueMessage(this->connections[_socketId].get(),
@@ -742,7 +742,7 @@ void WebsocketServer::OnMessage(int _socketId, const std::string &_msg)
     }
 
     std::string data = BUILD_MSG(this->operations[PUBLISH], frameParts[0],
-        std::string("gz.msgs.Scene"), rep.SerializeAsString());
+        std::string("ignition.msgs.Scene"), rep.SerializeAsString());
 
     // Queue the message for delivery.
     this->QueueMessage(this->connections[_socketId].get(),

diff --git a/plugins/websocket_server/WebsocketServer.hh b/plugins/websocket_server/WebsocketServer.hh
@@ -28,7 +28,7 @@
 #include <gz/common/Util.hh>
 #include <libwebsockets.h>
 
-namespace gz
+namespace ignition
 {
   namespace launch
   {
@@ -95,7 +95,7 @@ namespace gz
     ///
     /// The `message_type` component is mandatory for the "pub" operation. If
     /// present it names the Ignition Message type, such as
-    /// "gz.msgs.Clock".
+    /// "ignition.msgs.Clock".
     ///
     /// The `payload` component is mandatory for the "pub" operation. If
     /// present, it contains a serialized string of an Ignition Message.
@@ -109,7 +109,7 @@ namespace gz
     /// 3. Subscribe to the "/clock" topic: `sub,/clock,,`
     ///
     /// 4. Websocket server publishing data on the "/clock" topic:
-    ///    `pub,/clock,gz.msgs.Clock,<serialized_data>`
+    ///    `pub,/clock,ignition.msgs.Clock,<serialized_data>`
     ///
     /// # Example usage
     ///

diff --git a/plugins/websocket_server/combined.proto b/plugins/websocket_server/combined.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package gz.msgs;
+package ignition.msgs;
 
 message Time {
   int64 sec = 1;

diff --git a/plugins/websocket_server/index-old.html b/plugins/websocket_server/index-old.html
@@ -9,7 +9,7 @@
 var wsUri = "ws://localhost:9002";
 var output;
 var proto = "syntax = \"proto3\";\
-  package gz.msgs;\
+  package ignition.msgs;\
   message Time {\
     int64 sec = 1;\
     int32 nsec = 2;\

diff --git a/plugins/websocket_server/index.html b/plugins/websocket_server/index.html
@@ -43,7 +43,7 @@
     var clockSub = new Topic({
       ign: ign,
       name: '/clock',
-      messageType : 'gz.msgs.Clock',
+      messageType : 'ignition.msgs.Clock',
       callback: function(msg) {
         var output = document.getElementById('output');
         output.innerHTML = 'Clock: ' + msg.sim.sec + '.' + msg.sim.nsec;
@@ -54,7 +54,7 @@
     var poseSub = new Topic({
       ign: ign,
       name: '/world/shapes/dynamic_pose/info',
-      messageType : 'gz.msgs.Pose_V',
+      messageType : 'ignition.msgs.Pose_V',
       callback: function(msg) {
         for (var i = 0; i < msg.pose.length; ++i) {
           var entity = scene.getByName(msg.pose[i].name);

diff --git a/src/Manager.hh b/src/Manager.hh
@@ -21,7 +21,7 @@
 #include <string>
 #include <gz/launch/Export.hh>
 
-namespace gz
+namespace ignition
 {
   namespace launch
   {

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories (
 )
 
 configure_file (test_config.hh.in ${PROJECT_BINARY_DIR}/include/ignition/launch/test_config.hh)
-configure_file (test_config.hh.in ${PROJECT_BINARY_DIR}/include/ignition/launch/test_config.hh)
+configure_file (test_config.hh.in ${PROJECT_BINARY_DIR}/include/gz/launch/test_config.hh)
 
 # Build gtest
 add_library(gtest STATIC gtest/src/gtest-all.cc)