Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ign -> gz Shared Lib Migration : gz-sim #1535

Merged
merged 5 commits into from
Jul 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions examples/plugin/custom_sensor_system/odometer.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,12 @@
<always_on>1</always_on>
<update_rate>30</update_rate>
<visualize>true</visualize>
<ignition:odometer>
<gz:odometer>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<noise type="gaussian">
<mean>0.00001</mean>
<stddev>0.00001</stddev>
</noise>
</ignition:odometer>
</gz:odometer>
</sensor>
</link>

Expand Down
6 changes: 3 additions & 3 deletions examples/scripts/log_video_recorder/log_video_recorder.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
-->
<sdf version='1.6'>
<world name='default'>
<plugin filename='ignition-gazebo-scene-broadcaster-system'
<plugin filename='gz-sim-scene-broadcaster-system'
name='gz::sim::systems::SceneBroadcaster'>
</plugin>
<plugin
filename='ignition-gazebo-log-system'
filename='gz-sim-log-system'
name='gz::sim::systems::LogPlayback'>
<path>tmp_record</path>
</plugin>
<plugin filename='ignition-gazebo-log-video-recorder-system'
<plugin filename='gz-sim-log-video-recorder-system'
name='gz::sim::systems::LogVideoRecorder'>
<region>
<min>-5 -5 0.001</min>
Expand Down
4 changes: 2 additions & 2 deletions examples/worlds/buoyancy_engine.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ gz topic -t /model/buoyant_box/buoyancy_engine/current_volume -e
</collision>
</link>
<plugin
filename="libignition-gazebo-buoyancy-engine-system.so"
filename="gz-sim-buoyancy-engine-system"
name="gz::sim::systems::BuoyancyEngine">
<link_name>body</link_name>
<namespace>buoyant_box</namespace>
Expand Down Expand Up @@ -172,7 +172,7 @@ gz topic -t /model/buoyant_box/buoyancy_engine/current_volume -e
</collision>
</link>
<plugin
filename="libignition-gazebo-buoyancy-engine-system.so"
filename="gz-sim-buoyancy-engine-system"
name="gz::sim::systems::BuoyancyEngine">
<link_name>body</link_name>
<namespace>buoyant_box</namespace>
Expand Down
8 changes: 4 additions & 4 deletions examples/worlds/conveyor.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,14 @@
<kinematic>0</kinematic>
</link>

<plugin filename="libignition-gazebo-track-controller-system.so"
<plugin filename="gz-sim-track-controller-system"
name="gz::sim::systems::TrackController">
<link>base_link</link>
<!--debug>true</debug-->
</plugin>

<!-- Moving Forward: W -->
<plugin filename="libignition-gazebo-triggered-publisher-system.so"
<plugin filename="gz-sim-triggered-publisher-system"
name="gz::sim::systems::TriggeredPublisher">
<input type="gz.msgs.Int32" topic="/keyboard/keypress">
<match field="data">87</match>
Expand All @@ -162,7 +162,7 @@
</plugin>

<!-- Moving Backward: X -->
<plugin filename="libignition-gazebo-triggered-publisher-system.so"
<plugin filename="gz-sim-triggered-publisher-system"
name="gz::sim::systems::TriggeredPublisher">
<input type="gz.msgs.Int32" topic="/keyboard/keypress">
<match field="data">88</match>
Expand All @@ -173,7 +173,7 @@
</plugin>

<!-- Stop: S -->
<plugin filename="libignition-gazebo-triggered-publisher-system.so"
<plugin filename="gz-sim-triggered-publisher-system"
name="gz::sim::systems::TriggeredPublisher">
<input type="gz.msgs.Int32" topic="/keyboard/keypress">
<match field="data">83</match>
Expand Down
6 changes: 3 additions & 3 deletions examples/worlds/joint_trajectory_controller.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@
</joint>
<!-- Controller -->
<plugin
filename="libignition-gazebo-joint-trajectory-controller-system.so"
filename="gz-sim-joint-trajectory-controller-system"
name="gz::sim::systems::JointTrajectoryController">
<joint_name>RR_position_control_joint1</joint_name>
<initial_position>0.7854</initial_position>
Expand Down Expand Up @@ -497,7 +497,7 @@
</joint>
<!-- Controller -->
<plugin
filename="libignition-gazebo-joint-trajectory-controller-system.so"
filename="gz-sim-joint-trajectory-controller-system"
name="gz::sim::systems::JointTrajectoryController">
<!-- Note: If joint names are omitted, their respective order from model will be preserved
when applying other parameters during configuration -->
Expand Down Expand Up @@ -653,7 +653,7 @@
</joint>
<!-- Controller -->
<plugin
filename="libignition-gazebo-joint-trajectory-controller-system.so"
filename="gz-sim-joint-trajectory-controller-system"
name="gz::sim::systems::JointTrajectoryController">
<!-- Note: You can also specify a custom topic for the joint trajectory commands -->
<topic>custom_topic_effort_control</topic>
Expand Down
8 changes: 4 additions & 4 deletions examples/worlds/mecanum_drive.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
<ode>
<mu>1.0</mu>
<mu2>0.0</mu2>
<fdir1 ignition:expressed_in="chassis">1 -1 0</fdir1>
<fdir1 gz:expressed_in="chassis">1 -1 0</fdir1>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

</ode>
</friction>
</surface>
Expand Down Expand Up @@ -199,7 +199,7 @@
<ode>
<mu>1.0</mu>
<mu2>0.0</mu2>
<fdir1 ignition:expressed_in="chassis">1 1 0</fdir1>
<fdir1 gz:expressed_in="chassis">1 1 0</fdir1>
</ode>
</friction>
</surface>
Expand Down Expand Up @@ -243,7 +243,7 @@
<ode>
<mu>1.0</mu>
<mu2>0.0</mu2>
<fdir1 ignition:expressed_in="chassis">1 1 0</fdir1>
<fdir1 gz:expressed_in="chassis">1 1 0</fdir1>
</ode>
</friction>
</surface>
Expand Down Expand Up @@ -287,7 +287,7 @@
<ode>
<mu>1.0</mu>
<mu2>0.0</mu2>
<fdir1 ignition:expressed_in="chassis">1 -1 0</fdir1>
<fdir1 gz:expressed_in="chassis">1 -1 0</fdir1>
</ode>
</friction>
</surface>
Expand Down
8 changes: 4 additions & 4 deletions examples/worlds/nested_model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
<real_time_factor>1.0</real_time_factor>
</physics>
<plugin
filename="libignition-gazebo-physics-system.so"
filename="gz-sim-physics-system"
name="gz::sim::systems::Physics">
<engine><filename>libignition-physics-tpe-plugin.so</filename></engine>
<engine><filename>gz-physics-tpe-plugin</filename></engine>
</plugin>
<plugin
filename="libignition-gazebo-user-commands-system.so"
filename="gz-sim-user-commands-system"
name="gz::sim::systems::UserCommands">
</plugin>
<plugin
filename="libignition-gazebo-scene-broadcaster-system.so"
filename="gz-sim-scene-broadcaster-system"
name="gz::sim::systems::SceneBroadcaster">
</plugin>

Expand Down
12 changes: 6 additions & 6 deletions examples/worlds/optical_tactile_sensor_plugin.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@
<sdf version="1.7">
<world name="optical_tactile_plugin">
<plugin
filename="libignition-gazebo-physics-system.so"
filename="gz-sim-physics-system"
name="gz::sim::systems::Physics">
</plugin>
<plugin
filename="libignition-gazebo-contact-system.so"
filename="gz-sim-contact-system"
name="gz::sim::systems::Contact">
</plugin>
<plugin
filename="libignition-gazebo-user-commands-system.so"
filename="gz-sim-user-commands-system"
name="gz::sim::systems::UserCommands">
</plugin>
<plugin
filename="libignition-gazebo-scene-broadcaster-system.so"
filename="gz-sim-scene-broadcaster-system"
name="gz::sim::systems::SceneBroadcaster">
</plugin>
<plugin
filename="libignition-gazebo-sensors-system.so"
filename="gz-sim-sensors-system"
name="gz::sim::systems::Sensors">
<render_engine>ogre2</render_engine>
</plugin>
Expand Down Expand Up @@ -242,7 +242,7 @@
</link>
<static>false</static>
<plugin
filename="libignition-gazebo-opticaltactileplugin-system.so"
filename="gz-sim-opticaltactileplugin-system"
name="gz::sim::systems::OpticalTactilePlugin">
<enabled>true</enabled>
<namespace>optical_tactile_plugin</namespace>
Expand Down
2 changes: 1 addition & 1 deletion examples/worlds/particle_emitter.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
filename="gz-sim-physics-system"
name="gz::sim::systems::Physics">
<!-- Use TPE in order to use nested models -->
<engine><filename>libignition-physics-tpe-plugin.so</filename></engine>
<engine><filename>gz-physics-tpe-plugin</filename></engine>
</plugin>
<plugin
filename="gz-sim-user-commands-system"
Expand Down
6 changes: 3 additions & 3 deletions examples/worlds/pendulum_links.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
<real_time_factor>1.0</real_time_factor>
</physics>
<plugin
filename="libignition-gazebo-physics-system.so"
filename="gz-sim-physics-system"
name="gz::sim::systems::Physics">
</plugin>
<plugin
filename="libignition-gazebo-user-commands-system.so"
filename="gz-sim-user-commands-system"
name="gz::sim::systems::UserCommands">
</plugin>
<plugin
filename="libignition-gazebo-scene-broadcaster-system.so"
filename="gz-sim-scene-broadcaster-system"
name="gz::sim::systems::SceneBroadcaster">
</plugin>

Expand Down
2 changes: 1 addition & 1 deletion examples/worlds/plane_propeller_demo.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
name="gz::sim::systems::SceneBroadcaster">
</plugin>
<plugin
filename='ignition-gazebo-sensors-system'
filename='gz-sim-sensors-system'
name='gz::sim::systems::Sensors'>
</plugin>

Expand Down
8 changes: 4 additions & 4 deletions examples/worlds/skid_steer_mecanum.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
<ode>
<mu>1.0</mu>
<mu2>0.0</mu2>
<fdir1 ignition:expressed_in="chassis">1 -1 0</fdir1>
<fdir1 gz:expressed_in="chassis">1 -1 0</fdir1>
</ode>
</friction>
</surface>
Expand Down Expand Up @@ -201,7 +201,7 @@
<ode>
<mu>1.0</mu>
<mu2>0.0</mu2>
<fdir1 ignition:expressed_in="chassis">1 1 0</fdir1>
<fdir1 gz:expressed_in="chassis">1 1 0</fdir1>
</ode>
</friction>
</surface>
Expand Down Expand Up @@ -245,7 +245,7 @@
<ode>
<mu>1.0</mu>
<mu2>0.0</mu2>
<fdir1 ignition:expressed_in="chassis">1 1 0</fdir1>
<fdir1 gz:expressed_in="chassis">1 1 0</fdir1>
</ode>
</friction>
</surface>
Expand Down Expand Up @@ -289,7 +289,7 @@
<ode>
<mu>1.0</mu>
<mu2>0.0</mu2>
<fdir1 ignition:expressed_in="chassis">1 -1 0</fdir1>
<fdir1 gz:expressed_in="chassis">1 -1 0</fdir1>
</ode>
</friction>
</surface>
Expand Down
Loading