Remove major version from plugin name references

Signed-off-by: Steve Peters <[email protected]>
gazebosim · Jan 23, 2025 · 9cfe829 · 9cfe829
1 parent 5529406
commit 9cfe829
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/src/ServerPrivate.cc b/src/ServerPrivate.cc
@@ -47,9 +47,7 @@ struct LoggingPlugin
   /// \return A string that contains the record plugin file name.
   public: static std::string &LoggingPluginFileName()
   {
-    static std::string recordPluginFileName =
-      std::string("gz-sim") +
-      GZ_SIM_MAJOR_VERSION_STR + "-log-system";
+    static std::string recordPluginFileName = "gz-sim-log-system";
     return recordPluginFileName;
   }
 

diff --git a/src/SystemLoader_TEST.cc b/src/SystemLoader_TEST.cc
@@ -44,11 +44,9 @@ TEST(SystemLoader, Constructor)
   sdf::Root root;
   root.LoadSdfString(std::string("<?xml version='1.0'?><sdf version='1.6'>"
       "<world name='default'>") +
-      "<plugin filename='libgz-sim" +
-      GZ_SIM_MAJOR_VERSION_STR + "-user-commands-system.so' "
+      "<plugin filename='libgz-sim-user-commands-system.so' "
       "name='gz::sim::systems::UserCommands'></plugin>"
-      "<plugin filename='gz-sim" +
-      GZ_SIM_MAJOR_VERSION_STR + "-user-commands-system' "
+      "<plugin filename='gz-sim-user-commands-system' "
       "name='gz::sim::systems::UserCommands'></plugin>"
       "<plugin filename='gz-sim-user-commands-system' "
       "name='gz::sim::systems::UserCommands'></plugin>"
@@ -198,10 +196,9 @@ TEST(SystemLoader, BadPluginName)
   sdf::Root root;
   root.LoadSdfString(std::string("<?xml version='1.0'?><sdf version='1.6'>"
       "<world name='default'>"
-      "<plugin filename='libgz-sim") +
-      GZ_SIM_MAJOR_VERSION_STR + "-physics-system.so' "
+      "<plugin filename='libgz-sim-physics-system.so' "
       "name='gz::sim::systems::Foo'></plugin>"
-      "</world></sdf>");
+      "</world></sdf>"));
 
   auto worldElem = root.WorldByIndex(0)->Element();
   if (worldElem->HasElement("plugin")) {

diff --git a/test/test_config.hh.in b/test/test_config.hh.in
@@ -51,17 +51,15 @@ struct TestWorldSansPhysics
         "<gz:policies>"
         "  <include_server_config_plugins>false</include_server_config_plugins>"
         "</gz:policies>"
-        "<plugin filename='libgz-sim") +
-        GZ_SIM_MAJOR_VERSION_STR + "-scene-broadcaster-system.so'"
+        "<plugin filename='libgz-sim-scene-broadcaster-system.so'"
         "  name='gz::sim::systems::SceneBroadcaster'>"
         "</plugin>"
         "<plugin"
-        "  filename='libgz-sim" +
-        GZ_SIM_MAJOR_VERSION_STR + "-user-commands-system.so'"
+        "  filename='libgz-sim-user-commands-system.so'"
         "  name='gz::sim::systems::UserCommands'>"
         "</plugin>"
       "</world>"
-    "</sdf>";
+    "</sdf>");
     return world;
   }
 };