Skip to content

Commit cb61c01

Browse files
authored
ign -> gz Partial Docs Migration and Project Name Followups : gz-sim (gazebosim#1558)
Signed-off-by: methylDragon <[email protected]>
1 parent 12e975a commit cb61c01

File tree

48 files changed

+133
-130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+133
-130
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ http://answers.gazebosim.org instead.-->
1414
<!-- If source, which branch and what is the latest commit? -->
1515
* If this is a GUI or sensor rendering bug, describe your GPU and rendering system. Otherwise delete this section. <!-- If you do not know some values, leave them out. But please, at least give a try to finding them - they are really helpful when debugging rendering errors. -->
1616
- Rendering plugin: [ogre | ogre2]. <!-- You can find it in the logs of Gazebo it outputs to console when you launch it with `-v 3` or `-v 4` argument. -->
17-
- [ ] Sensor rendering error. <!-- Search for message like "[Msg] Loading plugin [ignition-rendering-ogre]" (not starting with "[GUI]"). -->
18-
- [ ] GUI rendering error. <!-- Search for message like "[GUI] [Msg] Loading plugin [ignition-rendering-ogre2] -->
17+
- [ ] Sensor rendering error. <!-- Search for message like "[Msg] Loading plugin [gz-rendering-ogre]" (not starting with "[GUI]"). -->
18+
- [ ] GUI rendering error. <!-- Search for message like "[GUI] [Msg] Loading plugin [gz-rendering-ogre2] -->
1919
- EGL headless mode:
20-
- [ ] Running in EGL headless mode <!-- only available since Ignition Fortress, GPU display is specified as /dev/dri/card* instead of :0 -->
20+
- [ ] Running in EGL headless mode <!-- only available since Gazebo Fortress, GPU display is specified as /dev/dri/card* instead of :0 -->
2121
- Generally, mention all circumstances that might affect rendering capabilities: <!-- remove lines that do not apply to keep the list short -->
2222
- [ ] running on a dual GPU machine (integrated GPU + discrete GPU)
2323
- [ ] running on a multi-GPU machine (it has multiple discrete GPUs)
@@ -47,9 +47,9 @@ http://answers.gazebosim.org instead.-->
4747
- On Mac OS, open a terminal and type `system_profiler SPDisplaysDataType`. Copy the output here.
4848
<!-- Please note that GUI rendering is not supported on macOS. -->
4949
- [ ] Please, attach the ogre.log or ogre2.log file from `~/.ignition/rendering` <!-- Choose the relevant version based on what you checked in the "Rendering plugin" question. -->
50-
50+
5151
<details>
52-
52+
5353
```
5454
# paste log here
5555
```

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,10 +207,10 @@ else()
207207
endif()
208208
# Plugin install dirs
209209
set(GZ_SIM_PLUGIN_INSTALL_DIR
210-
${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/ign-${IGN_DESIGNATION}-${PROJECT_VERSION_MAJOR}/plugins
210+
${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/gz-${IGN_DESIGNATION}-${PROJECT_VERSION_MAJOR}/plugins
211211
)
212212
set(GZ_SIM_GUI_PLUGIN_INSTALL_DIR
213-
${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/ign-${IGN_DESIGNATION}-${PROJECT_VERSION_MAJOR}/plugins/gui
213+
${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/gz-${IGN_DESIGNATION}-${PROJECT_VERSION_MAJOR}/plugins/gui
214214
)
215215

216216
#============================================================================

Changelog.md

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@
584584
* [Pull request #856](https://github.com/gazebosim/gz-sim/pull/856)
585585
* [Pull request #1001](https://github.com/gazebosim/gz-sim/pull/1001)
586586

587-
1. Upgrade ign-sensors and support custom sensors
587+
1. Upgrade gz-sensors and support custom sensors
588588
* [Pull request #617](https://github.com/gazebosim/gz-sim/pull/617)
589589

590590
1. Fix entity creation console msg
@@ -644,7 +644,7 @@
644644
1. Remove deprecations: tock 🕑
645645
* [Pull request #875](https://github.com/gazebosim/gz-sim/pull/875)
646646

647-
1. Removed and moved tape measure and grid config to ign-gui
647+
1. Removed and moved tape measure and grid config to gz-gui
648648
* [Pull request #870](https://github.com/gazebosim/gz-sim/pull/870)
649649

650650
1. Update wireframe visualization to support nested models
@@ -845,7 +845,7 @@
845845
1. Support locked entities, and headless video recording using sim time
846846
* [Pull request #862](https://github.com/gazebosim/gz-sim/pull/862)
847847

848-
1. Update ign-gazebo4 changelog
848+
1. Update gz-sim4 changelog
849849
* [Pull request #1031](https://github.com/gazebosim/gz-sim/pull/1031)
850850

851851
1. bump version and update changelog
@@ -1060,7 +1060,7 @@
10601060
1. Remove unused headers in video_recoder plugin
10611061
* [Pull request #834](https://github.com/gazebosim/gz-sim/pull/834)
10621062

1063-
1. Use moveToHelper from ign-rendering
1063+
1. Use moveToHelper from gz-rendering
10641064
* [Pull request #825](https://github.com/gazebosim/gz-sim/pull/825)
10651065

10661066
1. Make halt motion act like a brake
@@ -1099,7 +1099,7 @@
10991099
1. Contacts visualization
11001100
* [Pull request #234](https://github.com/gazebosim/gz-sim/pull/234)
11011101

1102-
1. Bump to ign-msgs 7.1 / sdformat 11.1, Windows fixes
1102+
1. Bump to gz-msgs 7.1 / sdformat 11.1, Windows fixes
11031103
* [Pull request #758](https://github.com/gazebosim/gz-sim/pull/758)
11041104

11051105
1. Add functionalities for optical tactile plugin
@@ -1108,7 +1108,7 @@
11081108
1. Fix documentation for EntityComponentManager::EachNew
11091109
* [Pull request #795](https://github.com/gazebosim/gz-sim/pull/795)
11101110

1111-
1. Bump ign-physics version to 3.2
1111+
1. Bump gz-physics version to 3.2
11121112
* [Pull request #792](https://github.com/gazebosim/gz-sim/pull/792)
11131113

11141114
1. Prevent crash on Plotting plugin with mutex
@@ -1230,7 +1230,7 @@
12301230
1. Deprecate TmpIface: it's leftover from prototyping
12311231
* [Pull request #654](https://github.com/gazebosim/gz-sim/pull/654)
12321232

1233-
1. Bump in edifice: ign-common4
1233+
1. Bump in edifice: gz-common4
12341234
* [Pull request #577](https://github.com/gazebosim/gz-sim/pull/577)
12351235

12361236
1. Plugin to spawn lights
@@ -1246,7 +1246,7 @@
12461246
1. Prepare GuiRunner to be made private
12471247
* [Pull request #567](https://github.com/gazebosim/gz-sim/pull/567)
12481248

1249-
1. Deprecate some sim::gui events in favor of ign-gui events
1249+
1. Deprecate some sim::gui events in favor of gz-gui events
12501250
* [Pull request #595](https://github.com/gazebosim/gz-sim/pull/595)
12511251

12521252
1. Heightmap (rendering only)
@@ -1308,13 +1308,13 @@
13081308
1. Fix visibility macro names when used by a different component (Windows)
13091309
* [Pull request #564](https://github.com/gazebosim/gz-sim/pull/564)
13101310

1311-
1. Bump edifice sdformat11 and ign-physics4
1311+
1. Bump edifice sdformat11 and gz-physics4
13121312
* [Pull request #549](https://github.com/gazebosim/gz-sim/pull/549)
13131313

13141314
1. Use ComponentState::PeriodicChange in UpdateState to avoid forcing full scene update
13151315
* [Pull request #486](https://github.com/gazebosim/gz-sim/pull/486)
13161316

1317-
1. Bump in edifice: ign-msgs7
1317+
1. Bump in edifice: gz-msgs7
13181318
* [Pull request #546](https://github.com/gazebosim/gz-sim/pull/546)
13191319

13201320
1. Add support for sky
@@ -1323,7 +1323,7 @@
13231323
1. Infrastructure
13241324
* [Pull request #423](https://github.com/gazebosim/gz-sim/pull/423)
13251325

1326-
1. Bump in edifice: ign-rendering5
1326+
1. Bump in edifice: gz-rendering5
13271327
* [Pull request #430](https://github.com/gazebosim/gz-sim/pull/430)
13281328

13291329
1. Add 25percent darker view angle icons
@@ -1459,7 +1459,7 @@
14591459
1. Using math::SpeedLimiter on the ackermann_steering controller.
14601460
* [Pull Request 837](https://github.com/gazebosim/gz-sim/pull/837)
14611461

1462-
1. All changes merged forward from ign-gazebo3
1462+
1. All changes merged forward from gz-sim3
14631463
* [Pull Request 866](https://github.com/gazebosim/gz-sim/pull/866)
14641464
* [Pull Request 916](https://github.com/gazebosim/gz-sim/pull/916)
14651465
* [Pull Request 933](https://github.com/gazebosim/gz-sim/pull/933)
@@ -1757,7 +1757,7 @@
17571757
1. Update Dockerfiles to use focal images
17581758
* [pull request 388](https://github.com/gazebosim/gz-sim/pull/388)
17591759

1760-
1. Updated source build instructions for ign-gazebo4
1760+
1. Updated source build instructions for gz-sim4
17611761
* [pull request 404](https://github.com/gazebosim/gz-sim/pull/404)
17621762

17631763
1. Add tests for the AnimationTime component
@@ -1894,7 +1894,7 @@
18941894
1. Support <actor><pose> and <actor><plugin>
18951895
* [BitBucket pull request 542](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gazebo/pull-requests/542)
18961896

1897-
1. Depend on ign-rendering4, ign-gui4, ign-sensors4
1897+
1. Depend on gz-rendering4, gz-gui4, gz-sensors4
18981898
* [BitBucket pull request 540](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gazebo/pull-requests/540)
18991899

19001900
1. Axis-Aligned Bounding Boxes
@@ -1927,7 +1927,7 @@
19271927
1. Fix generation of systems library symlinks in build directory
19281928
* [Pull request #1160](https://github.com/gazebosim/gz-sim/pull/1160)
19291929

1930-
1. Backport sim::Util::validTopic() from ign-gazebo4.
1930+
1. Backport sim::Util::validTopic() from gz-sim4.
19311931
* [Pull request #1153](https://github.com/gazebosim/gz-sim/pull/1153)
19321932

19331933
1. Support setting the background color for sensors
@@ -2091,7 +2091,7 @@
20912091
1. Enables confirmation dialog when closing Gazebo.
20922092
* [Pull request #850](https://github.com/gazebosim/gz-sim/pull/850)
20932093

2094-
1. Depend on ign-rendering 3.5
2094+
1. Depend on gz-rendering 3.5
20952095
* [Pull request #867](https://github.com/gazebosim/gz-sim/pull/867)
20962096

20972097
1. Using math::SpeedLimiter on the diff_drive controller.
@@ -2115,7 +2115,7 @@
21152115
1. Remove unused headers in video_recoder plugin
21162116
* [Pull request #834](https://github.com/gazebosim/gz-sim/pull/834)
21172117

2118-
1. Use moveToHelper from ign-rendering
2118+
1. Use moveToHelper from gz-rendering
21192119
* [Pull request #825](https://github.com/gazebosim/gz-sim/pull/825)
21202120

21212121
1. Remove tools/code_check and update codecov
@@ -2428,7 +2428,7 @@
24282428
1. Add search and sort for resource spawner.
24292429
* [Pull Request 359](https://github.com/gazebosim/gz-sim/pull/359)
24302430

2431-
1. Fix source build instructions for ign-gazebo3.
2431+
1. Fix source build instructions for gz-sim3.
24322432
* [Pull Request 395](https://github.com/gazebosim/gz-sim/pull/395)
24332433

24342434
1. Added playback scrubber GUI
@@ -2503,7 +2503,7 @@
25032503

25042504
### Gazebo Sim 3.2.0 (2020-05-20)
25052505

2506-
1. Merge ign-gazebo2 to ign-gazebo3
2506+
1. Merge gz-sim2 to gz-sim3
25072507
* [pull request 149](https://github.com/gazebosim/gz-sim/pull/149)
25082508

25092509
### Gazebo Sim 3.1.0 (2020-05-19)
@@ -2567,7 +2567,7 @@
25672567
1. Move function definitions to their correct locations in EntityComponentManager
25682568
* [BitBucket pull request 380](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gazebo/pull-requests/380)
25692569

2570-
1. Depend on ign-rendering3, ign-gui3, ign-sensors3
2570+
1. Depend on gz-rendering3, gz-gui3, gz-sensors3
25712571
* [BitBucket pull request 411](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gazebo/pull-requests/411)
25722572

25732573
1. Rendering and Animating Actors
@@ -2795,7 +2795,7 @@
27952795
1. Fix seeking back in time in log playback
27962796
* [BitBucket pull request 523](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gazebo/pull-requests/523)
27972797

2798-
1. Fix the deprecated ign-gazebo command line
2798+
1. Fix the deprecated gz-sim command line
27992799
* [BitBucket pull request 499](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gazebo/pull-requests/499)
28002800

28012801
1. Always use the latest render texture in scene3d
@@ -3104,7 +3104,7 @@
31043104
1. Fix distributed sim documentation
31053105
* [BitBucket pull request 318](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gazebo/pull-requests/318)
31063106

3107-
1. Port Scene3D gui plugin from ign-gui. Renamed to GzScene3D.
3107+
1. Port Scene3D gui plugin from gz-gui. Renamed to GzScene3D.
31083108
* [BitBucket pull request 315](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gazebo/pull-requests/315)
31093109

31103110
1. Entity tree UI
@@ -3215,16 +3215,16 @@
32153215
1. Distributed sim deprecate envs
32163216
* [BitBucket pull request 240](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gazebo/pull-requests/240)
32173217

3218-
1. Use ign-sensors magnetometer sensor plugin
3218+
1. Use gz-sensors magnetometer sensor plugin
32193219
* [BitBucket pull request 221](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gazebo/pull-requests/221)
32203220

3221-
1. Use ign-sensors altimeter sensor plugin
3221+
1. Use gz-sensors altimeter sensor plugin
32223222
* [BitBucket pull request 215](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gazebo/pull-requests/215)
32233223

3224-
1. Use ign-sensors imu sensor plugin
3224+
1. Use gz-sensors imu sensor plugin
32253225
* [BitBucket pull request 219](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gazebo/pull-requests/219)
32263226

3227-
1. Depend on ign-sensors rendering component
3227+
1. Depend on gz-sensors rendering component
32283228
* [BitBucket pull request 212](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gazebo/pull-requests/212)
32293229

32303230
## Gazebo Sim 1.x
@@ -3254,7 +3254,7 @@
32543254
1. Added LiftDragPlugin (ported from Gazebo classic)
32553255
* [BitBucket pull request 256](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gazebo/pull-requests/256)
32563256

3257-
1. Logging refactor unique path functions to ign-common
3257+
1. Logging refactor unique path functions to gz-common
32583258
* [BitBucket pull request 270](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gazebo/pull-requests/270)
32593259

32603260
1. Added test for log record and playback.
@@ -3263,7 +3263,7 @@
32633263
1. Add ApplyJointForce system
32643264
* [BitBucket pull request 254](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gazebo/pull-requests/254)
32653265

3266-
1. More ign-msgs <-> SDF conversions: Inertial, Geometry, Material
3266+
1. More gz-msgs <-> SDF conversions: Inertial, Geometry, Material
32673267
* [BitBucket pull request 251](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gazebo/pull-requests/251)
32683268

32693269
1. Logging command line support
@@ -3324,7 +3324,7 @@
33243324
1. Example tunnel world
33253325
* [BitBucket pull request 205](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gazebo/pull-requests/205)
33263326

3327-
1. Conversion from chrono to ign-msgs
3327+
1. Conversion from chrono to gz-msgs
33283328
* [BitBucket pull request 223](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gazebo/pull-requests/223)
33293329

33303330
1. Prevent error message when using levels
@@ -3386,7 +3386,7 @@
33863386
1. Create EventManager and delegate System instantiation to SimulationRunner
33873387
* [BitBucket pull request 79](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gazebo/pull-requests/79)
33883388

3389-
1. Integrate ign-gui
3389+
1. Integrate gz-gui
33903390
* [BitBucket pull request 11](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gazebo/pull-requests/11)
33913391

33923392
1. Remove some build dependencies.

Migration.md

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,14 @@ release will remove the deprecated code.
3434
* The `gazebo` command line verb is deprecated.
3535
Use `sim` instead (e.g. `ign gazebo` -> `gz sim`).
3636

37+
* **Breaking Changes**
38+
* The project name has been changed to use the `gz-` prefix, you **must** use the `gz` prefix!
39+
* This also means that any generated code that use the project name (e.g. CMake variables, in-source macros) would have to be migrated.
40+
* Some non-exhaustive examples of this include:
41+
* `GZ_<PROJECT>_<VISIBLE/HIDDEN>`
42+
* CMake `-config` files
43+
* Paths that depend on the project name
44+
3745
## Gazebo Sim 6.1 to 6.2
3846

3947
* If no `<namespace>` is given to the `Thruster` plugin, the namespace now
@@ -113,7 +121,7 @@ since pose information is being logged in the `changed_state` topic.
113121

114122
## Gazebo Sim 4.x to 5.x
115123

116-
* Use `cli` component of `ignition-utils1`.
124+
* Use `cli` component of `gz-utils1`.
117125

118126
* `gz::sim::RenderUtil::SelectedEntities()` now returns a
119127
`const std::vector<Entity> &` instead of forcing a copy. The calling code
@@ -174,7 +182,7 @@ in SDF by setting the `<visual><material><double_sided>` SDF element.
174182

175183
## Gazebo Sim 2.x to 3.x
176184

177-
* Use ign-rendering3, ign-sensors3 and ign-gui3.
185+
* Use gz-rendering3, gz-sensors3 and gz-gui3.
178186

179187
## Gazebo Sim 1.x to 2.x
180188

@@ -191,7 +199,7 @@ in SDF by setting the `<visual><material><double_sided>` SDF element.
191199
* The `-f`/`--file` command line argument has been deprecated. The SDF
192200
file can now be loaded without a flag.
193201

194-
* The `ign-gazebo` command line tool is deprecated. The new tool is
202+
* The `gz-sim` command line tool is deprecated. The new tool is
195203
`gz sim`, which has all the same options, except for
196204
`--distributed` and `--file`/`-f`, which have been removed.
197205

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ gz sim -h
9797
## Known issue of command line tools
9898

9999
In the event that the installation is a mix of Debian and from source, command
100-
line tools from `ign-tools` may not work correctly.
100+
line tools from `gz-tools` may not work correctly.
101101

102102
A workaround for a single package is to define the environment variable
103103
`GZ_CONFIG_PATH` to point to the location of the Gazebo library installation,
@@ -138,12 +138,12 @@ See the [Writing Tests section of the contributor guide](https://github.com/gaze
138138
Refer to the following table for information about important directories and files in this repository.
139139

140140
```
141-
ign-gazebo
142-
├── examples Various examples that can be run against binary or source installs of ign-gazebo.
141+
gz-sim
142+
├── examples Various examples that can be run against binary or source installs of gz-sim.
143143
│   ├── plugin Example plugins.
144-
│   ├── standalone Example standalone programs that use ign-gazebo as a library.
144+
│   ├── standalone Example standalone programs that use gz-sim as a library.
145145
│   └── worlds Example SDF world files.
146-
├── include/ignition/gazebo Header files that downstream users are expected to use.
146+
├── include/gz/sim Header files that downstream users are expected to use.
147147
│   └── detail Header files that are not intended for downstream use, mainly template implementations.
148148
├── src Source files and unit tests.
149149
│   ├── gui Graphical interface source code.

examples/plugin/command_actor/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This example shows how to command actors in various ways from a plugin.
44

55
## Build
66

7-
From the root of the `ign-gazebo` repository, do the following to build the example:
7+
From the root of the `gz-sim` repository, do the following to build the example:
88

99
~~~
1010
cd examples/plugin/command_actor
@@ -28,4 +28,3 @@ export GZ_SIM_SYSTEM_PLUGIN_PATH=`pwd`/build
2828
Then run the demo world:
2929

3030
gz sim -v 4 command_actor.sdf -r
31-

examples/plugin/custom_component/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ See `CustomComponentPlugin.hh` for more information.
66

77
## Build
88

9-
From the root of the `ign-gazebo` repository, do the following to build the example:
9+
From the root of the `gz-sim` repository, do the following to build the example:
1010

1111
~~~
1212
cd examples/plugin/custom_component
@@ -30,4 +30,3 @@ export GZ_SIM_SYSTEM_PLUGIN_PATH=`pwd`/build
3030
Then run a world that loads the plugin as follows:
3131

3232
gz sim -s -v 4 custom_component.sdf
33-

0 commit comments

Comments
 (0)