Skip to content

Commit 667f93a

Browse files
committed
Migrate CLI
Signed-off-by: methylDragon <methylDragon@gmail.com>
1 parent e5e1067 commit 667f93a

File tree

14 files changed

+38
-38
lines changed

14 files changed

+38
-38
lines changed

BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ cc_library(
137137
cc_binary(
138138
name = "libignition-msgs.so",
139139
srcs = [
140-
"src/ign.cc",
141-
"src/ign.hh",
140+
"src/gz.cc",
141+
"src/gz.hh",
142142
],
143143
includes = ["include"],
144144
linkshared = True,

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ gz_find_package(ignition-math7 REQUIRED)
8888
set(IGN_MATH_VER ${ignition-math7_VERSION_MAJOR})
8989

9090
#--------------------------------------
91-
# Find if ign command is available
92-
find_program(HAVE_IGN_TOOLS ign)
91+
# Find if gz command is available
92+
find_program(HAVE_GZ_TOOLS gz)
9393

9494
#--------------------------------------
9595
# Find Tinyxml2
@@ -101,7 +101,7 @@ gz_find_package(TINYXML2 REQUIRED PRIVATE PRETTY tinyxml2)
101101
gz_configure_build(QUIT_IF_BUILD_ERRORS)
102102

103103
#============================================================================
104-
# ign command line support
104+
# gz command line support
105105
#============================================================================
106106
add_subdirectory(conf)
107107

Changelog.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
1. Adds PerformanceSensorMetrics proto message.
105105
* [Pull request #172](https://github.com/gazebosim/gz-msgs/pull/172)
106106

107-
1. Detect ign instead of using cmake module to check for ignition-tools
107+
1. Detect gz instead of using cmake module to check for ignition-tools
108108
* [Pull request #166](https://github.com/gazebosim/gz-msgs/pull/166)
109109

110110
1. Bazel build support
@@ -164,7 +164,7 @@
164164
1. Adds PerformanceSensorMetrics proto message.
165165
* [Pull request #172](https://github.com/gazebosim/gz-msgs/pull/172)
166166

167-
1. Detect ign instead of using cmake module to check for ignition-tools
167+
1. Detect gz instead of using cmake module to check for ignition-tools
168168
* [Pull request #166](https://github.com/gazebosim/gz-msgs/pull/166)
169169

170170
1. Bazel build support for ign-msgs6
@@ -280,7 +280,7 @@
280280
1. Adds PerformanceSensorMetrics proto message.
281281
* [Pull request #172](https://github.com/gazebosim/gz-msgs/pull/172)
282282

283-
1. Detect ign instead of using cmake module to check for ignition-tools
283+
1. Detect gz instead of using cmake module to check for ignition-tools
284284
* [Pull request #166](https://github.com/gazebosim/gz-msgs/pull/166)
285285

286286
1. Remove tools/code\_check and update codecov
@@ -499,7 +499,7 @@
499499

500500
1. Updated `model.proto` with more documentation. Position, velocity, force,
501501
and acceleration information for joint have been moved to the `axis.proto`
502-
message, see the Migration guide. The `ign.hh` header file is no longer
502+
message, see the Migration guide. The `gz.hh` header file is no longer
503503
installed.
504504
* [BitBucket pull request 104](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-msgs/pull-requests/104)
505505

Migration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ release will remove the deprecated code.
8787

8888
### Removals
8989

90-
1. **include/gz/msgs/ign.hh** is no longer installed.
90+
1. **include/gz/msgs/gz.hh** is no longer installed.
9191

9292
## Gazebo Msgs 2.X to 3.X
9393

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ A workaround for a single package is to define the environment variable
3030
`GZ_CONFIG_PATH` to point to the location of the Ignition library installation,
3131
where the YAML file for the package is found, such as
3232
```
33-
export GZ_CONFIG_PATH=/usr/local/share/ignition
33+
export GZ_CONFIG_PATH=/usr/local/share/gz
3434
```
3535

3636
However, that environment variable only takes a single path, which means if the
@@ -41,9 +41,9 @@ line is using symbolic links to each library's YAML file.
4141
```
4242
mkdir ~/.ignition/tools/configs -p
4343
cd ~/.ignition/tools/configs/
44-
ln -s /usr/local/share/ignition/fuel8.yaml .
45-
ln -s /usr/local/share/ignition/transport12.yaml .
46-
ln -s /usr/local/share/ignition/transportlog12.yaml .
44+
ln -s /usr/local/share/gz/fuel8.yaml .
45+
ln -s /usr/local/share/gz/transport12.yaml .
46+
ln -s /usr/local/share/gz/transportlog12.yaml .
4747
...
4848
export GZ_CONFIG_PATH=$HOME/.ignition/tools/configs
4949
```

conf/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Used only for internal testing.
2-
set(gz_library_path "${CMAKE_BINARY_DIR}/test/lib/ruby/ignition/cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}")
2+
set(gz_library_path "${CMAKE_BINARY_DIR}/test/lib/ruby/gz/cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}")
33

44
# Generate a configuration file for internal testing.
55
# Note that the major version of the library is included in the name.
@@ -9,7 +9,7 @@ configure_file(
99
"${CMAKE_BINARY_DIR}/test/conf/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.yaml" @ONLY)
1010

1111
# Used for the installed version.
12-
set(gz_library_path "${CMAKE_INSTALL_PREFIX}/lib/ruby/ignition/cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}")
12+
set(gz_library_path "${CMAKE_INSTALL_PREFIX}/lib/ruby/gz/cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}")
1313

1414
# Generate the configuration file that is installed.
1515
# Note that the major version of the library is included in the name.

src/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ gz_create_core_library(SOURCES
178178
${gen_sources}
179179
${PROJECT_SOURCE_DIR}/src/Factory.cc
180180
${PROJECT_SOURCE_DIR}/src/Filesystem.cc
181-
${PROJECT_SOURCE_DIR}/src/ign.cc
181+
${PROJECT_SOURCE_DIR}/src/gz.cc
182182
${PROJECT_SOURCE_DIR}/src/Utility.cc
183183
CXX_STANDARD 17)
184184

@@ -219,7 +219,7 @@ gz_build_tests(TYPE UNIT
219219
)
220220

221221
##################################################
222-
# ign msgs command
222+
# gz msgs command
223223
if(NOT WIN32)
224224
add_subdirectory(cmd)
225225
endif()

src/cmd/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Generate the ruby script for internal testing.
33
# Note that the major version of the library is included in the name.
44
# Ex: cmdtransport0.rb
5-
set(cmd_script_generated_test "${CMAKE_BINARY_DIR}/test/lib/ruby/ignition/cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.rb")
5+
set(cmd_script_generated_test "${CMAKE_BINARY_DIR}/test/lib/ruby/gz/cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.rb")
66
set(cmd_script_configured_test "${cmd_script_generated_test}.configured")
77

88
# Set the library_location variable to the full path of the library file within
@@ -41,4 +41,4 @@ file(GENERATE
4141
INPUT "${cmd_script_configured}")
4242

4343
# Install the ruby command line library in an unversioned location.
44-
install(FILES ${cmd_script_generated} DESTINATION lib/ruby/ignition)
44+
install(FILES ${cmd_script_generated} DESTINATION lib/ruby/gz)

src/cmd/cmdmsgs.rb.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ COMMON_OPTIONS =
3636
' --versions Show the available versions.'
3737
COMMANDS = { 'msg' =>
3838
"Print information about ignition messages.\n\n" +
39-
" ign msg [options]\n\n" +
39+
" gz msg [options]\n\n" +
4040
"Options:\n\n" +
4141
" -i [ --info ] arg " +
4242
"Get info about the specified message type.\n" +
@@ -151,7 +151,7 @@ class Cmd
151151
end
152152
else
153153
puts 'Command error: I do not have an implementation for '\
154-
"command [ign #{options['command']}]."
154+
"command [gz #{options['command']}]."
155155
end
156156
rescue
157157
puts "Library error: Problem running [#{options['command']}]() "\

src/gz.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#pragma warning(pop)
2626
#endif
2727

28-
#include "ign.hh"
28+
#include "gz.hh"
2929

3030
#include <iostream>
3131
#include <string>

0 commit comments

Comments
 (0)