diff --git a/Migration.md b/Migration.md
index 16ace68461..5262430525 100644
--- a/Migration.md
+++ b/Migration.md
@@ -34,6 +34,9 @@ release will remove the deprecated code.
* The `gazebo` command line verb is deprecated.
Use `sim` instead (e.g. `ign gazebo` -> `gz sim`).
+* The shared libraries have `gz` where there used to be `ignition`.
+ * Using the un-migrated version is still possible due to tick-tocks, but will be removed in future versions.
+
* **Breaking Changes**
* The project name has been changed to use the `gz-` prefix, you **must** use the `gz` prefix!
* This also means that any generated code that use the project name (e.g. CMake variables, in-source macros) would have to be migrated.
diff --git a/examples/plugin/custom_sensor_system/odometer.sdf b/examples/plugin/custom_sensor_system/odometer.sdf
index bc2c8554c5..d34cebe1ae 100644
--- a/examples/plugin/custom_sensor_system/odometer.sdf
+++ b/examples/plugin/custom_sensor_system/odometer.sdf
@@ -90,12 +90,12 @@
1
30
true
-
+
0.00001
0.00001
-
+
diff --git a/examples/scripts/log_video_recorder/log_video_recorder.sdf b/examples/scripts/log_video_recorder/log_video_recorder.sdf
index 66ef179246..5aa3f1a89b 100644
--- a/examples/scripts/log_video_recorder/log_video_recorder.sdf
+++ b/examples/scripts/log_video_recorder/log_video_recorder.sdf
@@ -10,15 +10,15 @@
-->
-
tmp_record
-
-5 -5 0.001
diff --git a/examples/worlds/buoyancy_engine.sdf b/examples/worlds/buoyancy_engine.sdf
index 498b024801..7f7dfae298 100644
--- a/examples/worlds/buoyancy_engine.sdf
+++ b/examples/worlds/buoyancy_engine.sdf
@@ -132,7 +132,7 @@ gz topic -t /model/buoyant_box/buoyancy_engine/current_volume -e
body
buoyant_box
@@ -172,7 +172,7 @@ gz topic -t /model/buoyant_box/buoyancy_engine/current_volume -e
body
buoyant_box
diff --git a/examples/worlds/conveyor.sdf b/examples/worlds/conveyor.sdf
index 5e0e792d31..85c1e69223 100644
--- a/examples/worlds/conveyor.sdf
+++ b/examples/worlds/conveyor.sdf
@@ -144,14 +144,14 @@
0
-
base_link
-
87
@@ -162,7 +162,7 @@
-
88
@@ -173,7 +173,7 @@
-
83
diff --git a/examples/worlds/joint_trajectory_controller.sdf b/examples/worlds/joint_trajectory_controller.sdf
index 6ee309c439..2f9508bd49 100644
--- a/examples/worlds/joint_trajectory_controller.sdf
+++ b/examples/worlds/joint_trajectory_controller.sdf
@@ -333,7 +333,7 @@
RR_position_control_joint1
0.7854
@@ -497,7 +497,7 @@
@@ -653,7 +653,7 @@
custom_topic_effort_control
diff --git a/examples/worlds/mecanum_drive.sdf b/examples/worlds/mecanum_drive.sdf
index 629dc10290..b1cc09f0ae 100644
--- a/examples/worlds/mecanum_drive.sdf
+++ b/examples/worlds/mecanum_drive.sdf
@@ -155,7 +155,7 @@
1.0
0.0
- 1 -1 0
+ 1 -1 0
@@ -199,7 +199,7 @@
1.0
0.0
- 1 1 0
+ 1 1 0
@@ -243,7 +243,7 @@
1.0
0.0
- 1 1 0
+ 1 1 0
@@ -287,7 +287,7 @@
1.0
0.0
- 1 -1 0
+ 1 -1 0
diff --git a/examples/worlds/nested_model.sdf b/examples/worlds/nested_model.sdf
index d79bb528bc..1ff1f267ba 100644
--- a/examples/worlds/nested_model.sdf
+++ b/examples/worlds/nested_model.sdf
@@ -6,16 +6,16 @@
1.0
- libignition-physics-tpe-plugin.so
+ gz-physics-tpe-plugin
diff --git a/examples/worlds/optical_tactile_sensor_plugin.sdf b/examples/worlds/optical_tactile_sensor_plugin.sdf
index e9539b9465..b5723bb2a2 100644
--- a/examples/worlds/optical_tactile_sensor_plugin.sdf
+++ b/examples/worlds/optical_tactile_sensor_plugin.sdf
@@ -16,23 +16,23 @@
ogre2
@@ -242,7 +242,7 @@
false
true
optical_tactile_plugin
diff --git a/examples/worlds/particle_emitter.sdf b/examples/worlds/particle_emitter.sdf
index c6deae378c..3e230d5773 100644
--- a/examples/worlds/particle_emitter.sdf
+++ b/examples/worlds/particle_emitter.sdf
@@ -31,7 +31,7 @@
filename="gz-sim-physics-system"
name="gz::sim::systems::Physics">
- libignition-physics-tpe-plugin.so
+ gz-physics-tpe-plugin
1.0
diff --git a/examples/worlds/plane_propeller_demo.sdf b/examples/worlds/plane_propeller_demo.sdf
index 7ca556f349..daa0d83d0e 100644
--- a/examples/worlds/plane_propeller_demo.sdf
+++ b/examples/worlds/plane_propeller_demo.sdf
@@ -25,7 +25,7 @@
name="gz::sim::systems::SceneBroadcaster">
diff --git a/examples/worlds/skid_steer_mecanum.sdf b/examples/worlds/skid_steer_mecanum.sdf
index 0ceae4cac2..637be5faa8 100644
--- a/examples/worlds/skid_steer_mecanum.sdf
+++ b/examples/worlds/skid_steer_mecanum.sdf
@@ -157,7 +157,7 @@
1.0
0.0
- 1 -1 0
+ 1 -1 0
@@ -201,7 +201,7 @@
1.0
0.0
- 1 1 0
+ 1 1 0
@@ -245,7 +245,7 @@
1.0
0.0
- 1 1 0
+ 1 1 0
@@ -289,7 +289,7 @@
1.0
0.0
- 1 -1 0
+ 1 -1 0
diff --git a/examples/worlds/tracked_vehicle_simple.sdf b/examples/worlds/tracked_vehicle_simple.sdf
index b815da03be..f1f4ac1b4d 100644
--- a/examples/worlds/tracked_vehicle_simple.sdf
+++ b/examples/worlds/tracked_vehicle_simple.sdf
@@ -11,9 +11,9 @@
0.004
1.0
-
-
-
+
+
+
1 1 1 1
0.8 0.8 0.8 1
@@ -1079,40 +1079,40 @@
0.5
-
+
left_track
-1.0
1.0
-
+
right_track
-1.0
1.0
-
+
front_left_flipper
-1.0
1.0
-
+
rear_left_flipper
-1.0
1.0
-
+
front_right_flipper
-1.0
1.0
-
+
rear_right_flipper
-1.0
1.0
-
87
@@ -1123,7 +1123,7 @@
-
88
@@ -1134,7 +1134,7 @@
-
83
@@ -1145,7 +1145,7 @@
-
65
@@ -1156,7 +1156,7 @@
-
68
@@ -1167,7 +1167,7 @@
-
81
@@ -1178,7 +1178,7 @@
-
69
@@ -1189,7 +1189,7 @@
-
90
@@ -1200,7 +1200,7 @@
-
67
diff --git a/examples/worlds/triggered_camera_sensor.sdf b/examples/worlds/triggered_camera_sensor.sdf
index 9c4194dc83..847c78b81d 100644
--- a/examples/worlds/triggered_camera_sensor.sdf
+++ b/examples/worlds/triggered_camera_sensor.sdf
@@ -16,20 +16,20 @@
+ name="gz::sim::systems::Physics">
+ name="gz::sim::systems::Sensors">
ogre
+ name="gz::sim::systems::UserCommands">
+ name="gz::sim::systems::SceneBroadcaster">
diff --git a/examples/worlds/trisphere_cycle_wheel_slip.sdf b/examples/worlds/trisphere_cycle_wheel_slip.sdf
index 66081a8924..3475dd1642 100644
--- a/examples/worlds/trisphere_cycle_wheel_slip.sdf
+++ b/examples/worlds/trisphere_cycle_wheel_slip.sdf
@@ -15,15 +15,15 @@
-2 0 -9.8
@@ -445,7 +445,7 @@
0.15
@@ -842,7 +842,7 @@
1
diff --git a/examples/worlds/tunnel.sdf b/examples/worlds/tunnel.sdf
index afecdfe0b1..23b72f88af 100644
--- a/examples/worlds/tunnel.sdf
+++ b/examples/worlds/tunnel.sdf
@@ -1625,7 +1625,7 @@
-
87
@@ -1636,7 +1636,7 @@
-
88
@@ -1647,7 +1647,7 @@
-
68
@@ -1658,7 +1658,7 @@
-
65
@@ -1669,7 +1669,7 @@
-
83
diff --git a/examples/worlds/visualize_contacts.sdf b/examples/worlds/visualize_contacts.sdf
index 651a6e001b..4e78353353 100644
--- a/examples/worlds/visualize_contacts.sdf
+++ b/examples/worlds/visualize_contacts.sdf
@@ -13,19 +13,19 @@ Contacts will be visualized as blue spheres and green cylinders.
diff --git a/examples/worlds/visualize_lidar.sdf b/examples/worlds/visualize_lidar.sdf
index baa9e81248..30eb5b3025 100644
--- a/examples/worlds/visualize_lidar.sdf
+++ b/examples/worlds/visualize_lidar.sdf
@@ -10,16 +10,16 @@
1.0
ogre2
@@ -502,7 +502,7 @@
left_wheel_joint
right_wheel_joint
diff --git a/python/src/gz/sim/Server.cc b/python/src/gz/sim/Server.cc
index e0f0330174..c148a08ff2 100644
--- a/python/src/gz/sim/Server.cc
+++ b/python/src/gz/sim/Server.cc
@@ -28,7 +28,7 @@ namespace sim
{
namespace python
{
-void defineGazeboServer(pybind11::object module)
+void defineSimServer(pybind11::object module)
{
pybind11::class_>(module, "Server")
diff --git a/python/src/gz/sim/Server.hh b/python/src/gz/sim/Server.hh
index a46c955cf2..a1dd426f89 100644
--- a/python/src/gz/sim/Server.hh
+++ b/python/src/gz/sim/Server.hh
@@ -31,7 +31,7 @@ namespace python
* \param[in] module a pybind11 module to add the definition to
*/
void
-defineGazeboServer(pybind11::object module);
+defineSimServer(pybind11::object module);
} // namespace python
} // namespace sim
} // namespace gz
diff --git a/python/src/gz/sim/ServerConfig.cc b/python/src/gz/sim/ServerConfig.cc
index c18d3b068d..c381c29a01 100644
--- a/python/src/gz/sim/ServerConfig.cc
+++ b/python/src/gz/sim/ServerConfig.cc
@@ -27,7 +27,7 @@ namespace sim
{
namespace python
{
-void defineGazeboServerConfig(pybind11::object module)
+void defineSimServerConfig(pybind11::object module)
{
pybind11::class_(module, "ServerConfig")
.def(pybind11::init<>())
diff --git a/python/src/gz/sim/ServerConfig.hh b/python/src/gz/sim/ServerConfig.hh
index 8a75fb2997..3b728ba78b 100644
--- a/python/src/gz/sim/ServerConfig.hh
+++ b/python/src/gz/sim/ServerConfig.hh
@@ -31,7 +31,7 @@ namespace python
* \param[in] module a pybind11 module to add the definition to
*/
void
-defineGazeboServerConfig(pybind11::object module);
+defineSimServerConfig(pybind11::object module);
} // namespace python
} // namespace sim
} // namespace gz
diff --git a/python/src/gz/sim/_gz_sim_pybind11.cc b/python/src/gz/sim/_gz_sim_pybind11.cc
index 8a5b62339b..edfc67112f 100644
--- a/python/src/gz/sim/_gz_sim_pybind11.cc
+++ b/python/src/gz/sim/_gz_sim_pybind11.cc
@@ -30,8 +30,8 @@ PYBIND11_MODULE(gazebo, m) {
gz::sim::python::defineGazeboEntityComponentManager(m);
gz::sim::python::defineGazeboEventManager(m);
- gz::sim::python::defineGazeboServer(m);
- gz::sim::python::defineGazeboServerConfig(m);
+ gz::sim::python::defineSimServer(m);
+ gz::sim::python::defineSimServerConfig(m);
gz::sim::python::defineGazeboTestFixture(m);
gz::sim::python::defineGazeboUpdateInfo(m);
gz::sim::python::defineGazeboWorld(m);
diff --git a/src/ServerConfig.cc b/src/ServerConfig.cc
index a6f71dfe0f..b82a254d86 100644
--- a/src/ServerConfig.cc
+++ b/src/ServerConfig.cc
@@ -596,7 +596,7 @@ ServerConfig::LogPlaybackPlugin() const
auto entityName = "*";
auto entityType = "world";
auto pluginName = "gz::sim::systems::LogPlayback";
- auto pluginFilename = "ignition-gazebo-log-system";
+ auto pluginFilename = "gz-sim-log-system";
sdf::ElementPtr playbackElem;
playbackElem = std::make_shared();
@@ -626,7 +626,7 @@ ServerConfig::LogRecordPlugin() const
auto entityName = "*";
auto entityType = "world";
auto pluginName = "gz::sim::systems::LogRecord";
- auto pluginFilename = "ignition-gazebo-log-system";
+ auto pluginFilename = "gz-sim-log-system";
sdf::ElementPtr recordElem;
diff --git a/src/SystemLoader_TEST.cc b/src/SystemLoader_TEST.cc
index 5b932eb82e..30c1b2ee68 100644
--- a/src/SystemLoader_TEST.cc
+++ b/src/SystemLoader_TEST.cc
@@ -41,7 +41,7 @@ TEST(SystemLoader, Constructor)
sdf::Root root;
root.LoadSdfString(std::string(""
""
- ""
"");
diff --git a/src/gz_TEST.cc b/src/gz_TEST.cc
index 9d748a27fe..f7c004d7c0 100644
--- a/src/gz_TEST.cc
+++ b/src/gz_TEST.cc
@@ -102,7 +102,7 @@ TEST(CmdLine, GZ_UTILS_TEST_DISABLED_ON_WIN32(CachedFuelWorld))
}
/////////////////////////////////////////////////
-TEST(CmdLine, GZ_UTILS_TEST_DISABLED_ON_WIN32(GazeboServer))
+TEST(CmdLine, GZ_UTILS_TEST_DISABLED_ON_WIN32(SimServer))
{
std::string cmd = kGzCommand + " -r -v 4 --iterations 5 " +
std::string(PROJECT_SOURCE_PATH) + "/test/worlds/plugins.sdf";
diff --git a/src/systems/CMakeLists.txt b/src/systems/CMakeLists.txt
index e1a4c16dac..305bb0fd44 100644
--- a/src/systems/CMakeLists.txt
+++ b/src/systems/CMakeLists.txt
@@ -77,6 +77,9 @@ function(gz_add_system system_name)
# The library created by `gz_add_component` includes the gz-sim version
# (i.e. libgz-gazebo1-name-system.so), but for portability of SDF
# files, we also install an unversioned symlink into the same versioned folder.
+ #
+ # NOTE(CH3): On migration of the CMake project name, ignition-gazebo -> gz-sim
+ # so the generated library target WILL CHANGE
set(versioned ${CMAKE_SHARED_LIBRARY_PREFIX}${system_target}${CMAKE_SHARED_LIBRARY_SUFFIX})
set(unversioned ${CMAKE_SHARED_LIBRARY_PREFIX}${PROJECT_NAME_NO_VERSION_LOWER}-${system_name}${CMAKE_SHARED_LIBRARY_SUFFIX})
if(WIN32)
diff --git a/test/integration/components.cc b/test/integration/components.cc
index 5a4a5aecf8..a66f2c4de1 100644
--- a/test/integration/components.cc
+++ b/test/integration/components.cc
@@ -1233,7 +1233,7 @@ TEST_F(ComponentsTest, ModelSdf)
<< " 1.0"
<< " "
<< " "
<< " "
<< " "
diff --git a/test/integration/nested_model_physics.cc b/test/integration/nested_model_physics.cc
index 78b951ea5d..66bc72c77a 100644
--- a/test/integration/nested_model_physics.cc
+++ b/test/integration/nested_model_physics.cc
@@ -52,7 +52,7 @@ TEST_F(NestedModelPhysicsTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(Movement))
std::string path = std::string(PROJECT_SOURCE_PATH) + "/test/worlds/models";
gz::common::setenv("GZ_SIM_RESOURCE_PATH", path.c_str());
serverConfig.SetResourceCache(path);
- serverConfig.SetPhysicsEngine("libignition-physics-dartsim-plugin.so");
+ serverConfig.SetPhysicsEngine("gz-physics-dartsim-plugin");
serverConfig.SetSdfFile(sdfFile);
Server server(serverConfig);
diff --git a/test/integration/network_handshake.cc b/test/integration/network_handshake.cc
index fe8f6096c3..bdad9812a5 100644
--- a/test/integration/network_handshake.cc
+++ b/test/integration/network_handshake.cc
@@ -137,7 +137,7 @@ TEST_F(NetworkHandshake, GZ_UTILS_TEST_DISABLED_ON_WIN32(Updates))
primaryPluginInfo.SetEntityName("default");
primaryPluginInfo.SetEntityType("world");
primaryPluginInfo.SetFilename(
- "libignition-sim-scene-broadcaster-system.so");
+ "gz-sim-scene-broadcaster-system");
primaryPluginInfo.SetName("gz::sim::systems::SceneBroadcaster");
primaryPluginInfo.SetSdf(pluginElem);
@@ -158,7 +158,7 @@ TEST_F(NetworkHandshake, GZ_UTILS_TEST_DISABLED_ON_WIN32(Updates))
ServerConfig::PluginInfo secondaryPluginInfo;
secondaryPluginInfo.SetEntityName("default");
secondaryPluginInfo.SetEntityType("world");
- secondaryPluginInfo.SetFilename("libignition-sim-physics-system.so");
+ secondaryPluginInfo.SetFilename("gz-sim-physics-system");
secondaryPluginInfo.SetName("gz::sim::systems::Physics");
secondaryPluginInfo.SetSdf(pluginElem);
diff --git a/test/integration/physics_system.cc b/test/integration/physics_system.cc
index efb27fa464..542335801f 100644
--- a/test/integration/physics_system.cc
+++ b/test/integration/physics_system.cc
@@ -1400,7 +1400,7 @@ TEST_F(PhysicsSystemFixture,
gz::common::setenv("GZ_SIM_RESOURCE_PATH", path.c_str());
gz::sim::ServerConfig serverConfig;
serverConfig.SetResourceCache(path);
- serverConfig.SetPhysicsEngine("libignition-physics-dartsim-plugin.so");
+ serverConfig.SetPhysicsEngine("gz-physics-dartsim-plugin");
const std::string sdfFile = std::string(PROJECT_SOURCE_PATH) +
"/test/worlds/include_nested_models.sdf";
@@ -1543,7 +1543,7 @@ TEST_F(PhysicsSystemFixture,
gz::common::setenv("GZ_SIM_RESOURCE_PATH", path.c_str());
gz::sim::ServerConfig serverConfig;
serverConfig.SetResourceCache(path);
- serverConfig.SetPhysicsEngine("libignition-physics-tpe-plugin.so");
+ serverConfig.SetPhysicsEngine("gz-physics-tpe-plugin");
const std::string sdfFile = std::string(PROJECT_SOURCE_PATH) +
"/test/worlds/include_nested_models.sdf";
diff --git a/test/integration/sdf_frame_semantics.cc b/test/integration/sdf_frame_semantics.cc
index d709472bf1..c73af32135 100644
--- a/test/integration/sdf_frame_semantics.cc
+++ b/test/integration/sdf_frame_semantics.cc
@@ -506,7 +506,7 @@ TEST_F(SdfFrameSemanticsTest,
gz::common::setenv("GZ_SIM_RESOURCE_PATH", path.c_str());
gz::sim::ServerConfig serverConfig;
serverConfig.SetResourceCache(path);
- serverConfig.SetPhysicsEngine("libignition-physics-tpe-plugin.so");
+ serverConfig.SetPhysicsEngine("gz-physics-tpe-plugin");
const std::string sdfFile = std::string(PROJECT_SOURCE_PATH) +
"/test/worlds/include_nested_models.sdf";
@@ -569,7 +569,7 @@ TEST_F(SdfFrameSemanticsTest,
gz::common::setenv("GZ_SIM_RESOURCE_PATH", path.c_str());
gz::sim::ServerConfig serverConfig;
serverConfig.SetResourceCache(path);
- serverConfig.SetPhysicsEngine("libignition-physics-dartsim-plugin.so");
+ serverConfig.SetPhysicsEngine("gz-physics-dartsim-plugin");
const std::string sdfFile = std::string(PROJECT_SOURCE_PATH) +
"/test/worlds/include_nested_models.sdf";
diff --git a/test/integration/touch_plugin.cc b/test/integration/touch_plugin.cc
index e058a8ab70..8e849943ca 100644
--- a/test/integration/touch_plugin.cc
+++ b/test/integration/touch_plugin.cc
@@ -248,7 +248,7 @@ TEST_F(TouchPluginTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(SpawnedEntities))
green_box_for_white
diff --git a/test/test_config.hh.in b/test/test_config.hh.in
index f6f37a04bb..4ccac6b3be 100644
--- a/test/test_config.hh.in
+++ b/test/test_config.hh.in
@@ -48,12 +48,12 @@ struct TestWorldSansPhysics
static std::string world = std::string(""
""
""
- ""
""
""
""
diff --git a/test/worlds/camera_sensor_scene_background.sdf b/test/worlds/camera_sensor_scene_background.sdf
index 86126467ed..b6357d6dec 100644
--- a/test/worlds/camera_sensor_scene_background.sdf
+++ b/test/worlds/camera_sensor_scene_background.sdf
@@ -6,11 +6,11 @@
0
ogre2
diff --git a/test/worlds/nested_model.sdf b/test/worlds/nested_model.sdf
index 1a54a6a1d6..1ff48366a2 100644
--- a/test/worlds/nested_model.sdf
+++ b/test/worlds/nested_model.sdf
@@ -8,7 +8,7 @@
- libignition-physics-tpe-plugin.so
+ ignition-physics-tpe-plugin
+ name="gz::sim::systems::AirPressure">
+ name="gz::sim::systems::Physics">
+ name="gz::sim::systems::SceneBroadcaster">
+ name="gz::sim::systems::Sensors">
ogre2
+ name="gz::sim::systems::UserCommands">
diff --git a/test/worlds/shininess.sdf b/test/worlds/shininess.sdf
index b2321a5864..faf159c6dd 100644
--- a/test/worlds/shininess.sdf
+++ b/test/worlds/shininess.sdf
@@ -6,20 +6,20 @@
0
+ filename="gz-sim-physics-system"
+ name="gz::sim::systems::Physics">
+ filename="gz-sim-user-commands-system"
+ name="gz::sim::systems::UserCommands">
+ filename="gz-sim-scene-broadcaster-system"
+ name="gz::sim::systems::SceneBroadcaster">
+ filename="gz-sim-contact-system"
+ name="gz::sim::systems::Contact">
diff --git a/tutorials/gui_config.md b/tutorials/gui_config.md
index ea83f603dd..a8ff5e98a2 100644
--- a/tutorials/gui_config.md
+++ b/tutorials/gui_config.md
@@ -80,7 +80,7 @@ favorite editor and save this file as `fuel_preview.sdf`:
diff --git a/tutorials/server_config.md b/tutorials/server_config.md
index 784da79450..08a649d946 100644
--- a/tutorials/server_config.md
+++ b/tutorials/server_config.md
@@ -90,7 +90,7 @@ favorite editor and save this file as `fuel_preview.sdf`:
diff --git a/tutorials/video_recorder.md b/tutorials/video_recorder.md
index 7d950aaa35..aee32d2bfd 100644
--- a/tutorials/video_recorder.md
+++ b/tutorials/video_recorder.md
@@ -97,7 +97,7 @@ going to the world SDF file, locate the
`` parameter:
```xml
-
25