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

Migrate ignition-transport #324

Merged
merged 1 commit into from
Jun 26, 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
2 changes: 1 addition & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@
versions
* [BitBucket pull request 310](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-transport/pull-requests/310)

1. Converted ignition-transport-log into a component
1. Converted gz-transport-log into a component
* [BitBucket pull request 298](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-transport/pull-requests/298)

1. Added inline versioned namespace to the log library
Expand Down
2 changes: 1 addition & 1 deletion conf/transport.yaml.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
--- # Subcommands available inside ignition-transport.
--- # Subcommands available inside gz-transport.
format: 1.0.0
library_name: @PROJECT_NAME_NO_VERSION@
library_version: @PROJECT_VERSION_FULL@
Expand Down
4 changes: 2 additions & 2 deletions example/configure.bat
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
@echo Configuring for build type %build_type%

@set PROTOBUF_PATH=%cd%\..\..\..\protobuf-2.6.0-win%build_bitness%-vc12
@set IGN_TRANSPORT_PATH=%cd%\..\..\build\install\%build_type%
@set GZ_TRANSPORT_PATH=%cd%\..\..\build\install\%build_type%
@set GZ-MSGS_PATH=%cd%\..\..\..\ign-msgs\build\install\%build_type%
@set GZ-MSGS_CMAKE_PREFIX_PATH=%GZ-MSGS_PATH%\CMake
@set GZ-MATH_PATH=%cd%\..\..\..\ign-math\build\install\%build_type%
@set GZ-MATH_CMAKE_PREFIX_PATH=%GZ-MATH_PATH%\CMake

cmake -G "NMake Makefiles"^
-DCMAKE_PREFIX_PATH="%IGN_TRANSPORT_PATH%\lib\cmake\ignition-transport12;%GZ-MSGS_CMAKE_PREFIX_PATH%;%GZ-MATH_CMAKE_PREFIX_PATH%;"^
-DCMAKE_PREFIX_PATH="%GZ_TRANSPORT_PATH%\lib\cmake\gz-transport12;%GZ-MSGS_CMAKE_PREFIX_PATH%;%GZ-MATH_CMAKE_PREFIX_PATH%;"^
-DPROTOBUF_SRC_ROOT_FOLDER="%PROTOBUF_PATH%"^
-DGZ-MSGS_FOLDER="%GZ-MSGS_PATH%"^
-DCMAKE_INSTALL_PREFIX="install"^
Expand Down
2 changes: 1 addition & 1 deletion example/playback.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
/// \brief Example of playing back all messages from a log.
/// This will create publishers for all topics in a file and publish them
/// with the same timing that they were received.
/// Launch the ignition-transport subscriber example if the log was created
/// Launch the gz-transport subscriber example if the log was created
/// by recording the publisher example.

#include <cstdint>
Expand Down
2 changes: 1 addition & 1 deletion example/record.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

/// \brief Example of recording all ignition transport topics.
/// This will record all topics and currently published to a file.
/// Launch the ignition-transport publisher example so this example has
/// Launch the gz-transport publisher example so this example has
/// something to record.

#include <cstdint>
Expand Down
2 changes: 1 addition & 1 deletion log/src/cmd/cmdlog.rb.in
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ class Cmd
exit(-1)
end

# TODO(anyone): Add a sanity check for the ignition-transport-log version
# TODO(anyone): Add a sanity check for the gz-transport-log version

begin
Importer.extern 'int verbosity(int)'
Expand Down
2 changes: 1 addition & 1 deletion log/src/cmd/transportlog.yaml.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
--- # Subcommands available inside ignition-transport-log.
--- # Subcommands available inside gz-transport-log.
format: 1.0.0
library_name: gz-transport-log
library_version: @PROJECT_VERSION_FULL@
Expand Down
8 changes: 4 additions & 4 deletions tutorials/02_installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/
Run the following commands:
```
brew tap osrf/simulation
brew install ignition-transport<#>
brew install gz-transport<#>
```

Be sure to replace `<#>` with a number value, such as `8` or `9`, depending on
Expand Down Expand Up @@ -181,7 +181,7 @@ sudo make uninstall

2. Install dependencies
```
brew install --only-dependencies ignition-transport<#>
brew install --only-dependencies gz-transport<#>
```
Be sure to replace `<#>` with a number value, such as 10 or 11, depending on
which version you need.
Expand Down Expand Up @@ -254,8 +254,8 @@ conda install libignition-cmake<#> libignition-msgs<#> libignition-tools<#> --ch

4. Optionally, build the examples

If you installed to a custom location, you may need to specify ``-DCMAKE_PREFIX_PATH``, pointing to the directory containing the file ``ignition-transport<#>-config.cmake``.
That file is installed to the ``CMAKE_INSTALL_PREFIX``, for example, ``path\to\install\ignition-transport<#>\lib\cmake\ignition-transport<#>``.
If you installed to a custom location, you may need to specify ``-DCMAKE_PREFIX_PATH``, pointing to the directory containing the file ``gz-transport<#>-config.cmake``.
That file is installed to the ``CMAKE_INSTALL_PREFIX``, for example, ``path\to\install\gz-transport<#>\lib\cmake\gz-transport<#>``.
```
cd ign-transport\example
mkdir build
Expand Down