From 035a530c3c796c246d59116773d0e01dd1c20f33 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Mon, 11 Jul 2022 15:57:52 -0700 Subject: [PATCH 1/2] Move dockerfile (#328) Signed-off-by: methylDragon --- docker/{ign-transport => gz-transport}/Dockerfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docker/{ign-transport => gz-transport}/Dockerfile (100%) diff --git a/docker/ign-transport/Dockerfile b/docker/gz-transport/Dockerfile similarity index 100% rename from docker/ign-transport/Dockerfile rename to docker/gz-transport/Dockerfile From 8cd0c3e66496a92bae118a6c7bec8674da2b310f Mon Sep 17 00:00:00 2001 From: methylDragon Date: Mon, 11 Jul 2022 15:58:08 -0700 Subject: [PATCH 2/2] Partial cmake and source migrations (#328) Signed-off-by: methylDragon --- .github/ci/packages.apt | 10 ++-- .github/workflows/ci.yml | 4 +- .github/workflows/pr-collection-labeler.yml | 2 +- CMakeLists.txt | 6 +- Changelog.md | 8 +-- INSTALL_WINDOWS.md | 8 +-- README.md | 4 +- api.md.in | 4 +- conf/CMakeLists.txt | 20 +++---- docker/gz-transport/Dockerfile | 12 ++-- example/configure.bat | 26 --------- include/CMakeLists.txt | 2 +- include/gz/transport/CMakeLists.txt | 2 +- include/gz/transport/Helpers.hh | 2 +- include/gz/transport/gz_auto_headers.hh.in | 2 +- log/include/CMakeLists.txt | 2 +- log/src/CMakeLists.txt | 2 +- log/src/Descriptor_TEST.cc | 56 +++++++++---------- log/src/cmd/CMakeLists.txt | 2 +- log/test/integration/recorder.cc | 8 +-- src/CIface_TEST.cc | 2 +- src/NetUtils.cc | 2 +- src/NodeShared.cc | 10 ++-- src/Node_TEST.cc | 2 +- src/cmd/CMakeLists.txt | 22 ++++---- src/cmd/cmdtransport.rb.in | 2 +- .../all_symbols_have_version.bash.in | 6 +- tutorials.md.in | 4 +- tutorials/02_installation.md | 14 ++--- tutorials/07_relay.md | 4 +- 30 files changed, 111 insertions(+), 139 deletions(-) delete mode 100644 example/configure.bat diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index c025cdcf4..fc9b97a5d 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -1,8 +1,8 @@ -libignition-cmake3-dev -libignition-math7-dev -libignition-msgs9-dev -libignition-tools2-dev -libignition-utils2-cli-dev +libgz-cmake3-dev +libgz-math7-dev +libgz-msgs9-dev +libgz-tools2-dev +libgz-utils2-cli-dev libprotobuf-dev libprotoc-dev libsqlite3-dev diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b4b8a356b..54d4e3ab4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: uses: actions/checkout@v2 - name: Compile and test id: ci - uses: ignition-tooling/action-ignition-ci@focal + uses: gazebo-tooling/action-gz-ci@focal with: codecov-enabled: true cppcheck-enabled: true @@ -25,4 +25,4 @@ jobs: uses: actions/checkout@v2 - name: Compile and test id: ci - uses: ignition-tooling/action-ignition-ci@jammy + uses: gazebo-tooling/action-gz-ci@jammy diff --git a/.github/workflows/pr-collection-labeler.yml b/.github/workflows/pr-collection-labeler.yml index 7d7b4e179..38c4fc13b 100644 --- a/.github/workflows/pr-collection-labeler.yml +++ b/.github/workflows/pr-collection-labeler.yml @@ -8,6 +8,6 @@ jobs: steps: - name: Add collection labels if: github.event.action == 'opened' - uses: ignition-tooling/pr-collection-labeler@v1 + uses: gazebo-tooling/pr-collection-labeler@v1 with: github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b90a56ee..45a663af5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,9 +18,7 @@ set(GZ_CMAKE_VER ${gz-cmake3_VERSION_MAJOR}) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -gz_configure_project( - REPLACE_IGNITION_INCLUDE_PATH gz/transport - VERSION_SUFFIX pre1) +gz_configure_project(VERSION_SUFFIX pre1) #============================================================================ # Set project-specific options @@ -42,7 +40,7 @@ message(STATUS "\n\n-- ====== Finding Dependencies ======") #-------------------------------------- # Find Protobuf set(REQ_PROTOBUF_VER 3) -gz_find_package(IgnProtobuf +gz_find_package(GzProtobuf VERSION ${REQ_PROTOBUF_VER} REQUIRED PRETTY Protobuf) diff --git a/Changelog.md b/Changelog.md index 6da95c32f..ddd56c422 100644 --- a/Changelog.md +++ b/Changelog.md @@ -37,7 +37,7 @@ 1. Remove no username error messages * [Pull request #286](https://github.com/gazebosim/gz-transport/pull/286) -1. Documented the default value of `IGN_PARTITION` +1. Documented the default value of `GZ_PARTITION` * [Pull request #281](https://github.com/gazebosim/gz-transport/pull/281) 1. Remove static on `registrationCb` and `unregistrationCb`. @@ -380,7 +380,7 @@ * [BitBucket pull request 370](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-transport/pull-requests/370) * [BitBucket pull request 373](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-transport/pull-requests/373) -1. Introduce `IGN_RELAY`. +1. Introduce `GZ_RELAY`. * [BitBucket pull request 364](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-transport/pull-requests/364) 1. Upgrade to ignition-msgs4. @@ -480,10 +480,10 @@ 1. Added integration tests for recording * [BitBucket pull request 275](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-transport/pull-requests/275) -1. Added ability to play back ignition transport topics +1. Added ability to play back gz transport topics * [BitBucket pull request 274](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-transport/pull-requests/274) -1. Added ability to record ignition transport topics +1. Added ability to record gz transport topics * [BitBucket pull request 273](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-transport/pull-requests/273) 1. Added ability to query log messages by topic name and time received diff --git a/INSTALL_WINDOWS.md b/INSTALL_WINDOWS.md index a14799ed2..f6c416332 100644 --- a/INSTALL_WINDOWS.md +++ b/INSTALL_WINDOWS.md @@ -72,7 +72,7 @@ directory that has the source files. Here is an example: ..\configure nmake install -1. Clone ign-transport: +1. Clone gz-transport: git clone https://github.com/gazebosim/gz-transport cd gz-transport @@ -85,18 +85,18 @@ directory that has the source files. Here is an example: nmake install - You should now have an installation of ign-transport in gz-ws/ign-transport/build/install. + You should now have an installation of gz-transport in gz-ws/gz-transport/build/install. 1. Before running any executables, you need to modify your `PATH` to include the directories including your DLL dependencies to let Windows find dynamic libs (similar to `LD_LIBRARY_PATH` on Linux). Don't put quotes around the path, even if it contains spaces. E.g., if you're working in `C:\My Stuff\gz-ws`: - set PATH=%PATH%;C:\My Stuff\gz-ws\ZeroMQ 4.0.4\bin;C:\My Stuff\gz-ws\ign-msgs\build\install\Release\lib + set PATH=%PATH%;C:\My Stuff\gz-ws\ZeroMQ 4.0.4\bin;C:\My Stuff\gz-ws\gz-msgs\build\install\Release\lib 1. Now build the examples: - cd gz-ws\ign-transport\example + cd gz-ws\gz-transport\example mkdir build cd build ..\configure diff --git a/README.md b/README.md index bf7a604d7..ae6d6ed84 100644 --- a/README.md +++ b/README.md @@ -84,9 +84,9 @@ Visit the [documentation page](https://gazebosim.org/api/transport/11.0/index.ht # Folder Structure ``` -ign-transport +gz-transport ├── conf Configuration file for the integration with the `gz` CLI tool. -├── docker Dockerfile with ign-transport installed and scripts to build and run the code. +├── docker Dockerfile with gz-transport installed and scripts to build and run the code. ├── example Example programs that use most of the Gazebo Transport API. ├── include Header files that get installed. ├── log All the code related with Gazebo Transport logging. diff --git a/api.md.in b/api.md.in index 076d03826..50360ff6e 100644 --- a/api.md.in +++ b/api.md.in @@ -1,6 +1,6 @@ -## Gazebo @IGN_DESIGNATION_CAP@ +## Gazebo @GZ_DESIGNATION_CAP@ -Gazebo @IGN_DESIGNATION_CAP@ is a component in Gazebo, a set of libraries +Gazebo @GZ_DESIGNATION_CAP@ is a component in Gazebo, a set of libraries designed to rapidly develop robot and simulation applications. ## License diff --git a/conf/CMakeLists.txt b/conf/CMakeLists.txt index 044e6a501..6f5089fca 100644 --- a/conf/CMakeLists.txt +++ b/conf/CMakeLists.txt @@ -1,27 +1,27 @@ # Used only for internal testing. -set(gz_library_path "${CMAKE_BINARY_DIR}/test/lib/$/ruby/gz/cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}") +set(gz_library_path "${CMAKE_BINARY_DIR}/test/lib/$/ruby/gz/cmd${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}") # Generate a configuration file for internal testing. # Note that the major version of the library is included in the name. # Ex: transport0.yaml configure_file( - "${IGN_DESIGNATION}.yaml.in" - "${CMAKE_CURRENT_BINARY_DIR}/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.yaml.configured" @ONLY) + "${GZ_DESIGNATION}.yaml.in" + "${CMAKE_CURRENT_BINARY_DIR}/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}.yaml.configured" @ONLY) file(GENERATE - OUTPUT "${CMAKE_BINARY_DIR}/test/conf/$/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.yaml" - INPUT "${CMAKE_CURRENT_BINARY_DIR}/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.yaml.configured") + OUTPUT "${CMAKE_BINARY_DIR}/test/conf/$/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}.yaml" + INPUT "${CMAKE_CURRENT_BINARY_DIR}/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}.yaml.configured") # Used for the installed version. -set(gz_library_path "${CMAKE_INSTALL_PREFIX}/lib/ruby/gz/cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}") +set(gz_library_path "${CMAKE_INSTALL_PREFIX}/lib/ruby/gz/cmd${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}") # Generate the configuration file that is installed. # Note that the major version of the library is included in the name. # Ex: transport0.yaml configure_file( - "${IGN_DESIGNATION}.yaml.in" - "${CMAKE_CURRENT_BINARY_DIR}/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.yaml" @ONLY) + "${GZ_DESIGNATION}.yaml.in" + "${CMAKE_CURRENT_BINARY_DIR}/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}.yaml" @ONLY) # Install the yaml configuration files in an unversioned location. -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.yaml - DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/ignition/) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}.yaml + DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/gz/) diff --git a/docker/gz-transport/Dockerfile b/docker/gz-transport/Dockerfile index 5c11af19c..1979a8ff5 100644 --- a/docker/gz-transport/Dockerfile +++ b/docker/gz-transport/Dockerfile @@ -64,13 +64,13 @@ RUN sudo /bin/sh -c 'echo "deb [trusted=yes] http://packages.osrfoundation.org/g && sudo /bin/sh -c 'wget http://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add -' \ && sudo apt-get update \ && sudo apt-get install -y \ - libignition-cmake3-dev \ - libignition-math7-dev \ - libignition-msgs9-dev \ - libignition-utils2-cli-dev \ + libgz-cmake3-dev \ + libgz-math7-dev \ + libgz-msgs9-dev \ + libgz-utils2-cli-dev \ && sudo apt-get clean -# Ignition transport +# Gazebo transport RUN git clone https://github.com/gazebosim/gz-transport.git \ && cd gz-transport \ && mkdir build \ @@ -79,7 +79,7 @@ RUN git clone https://github.com/gazebosim/gz-transport.git \ && sudo make -j4 install \ && cd ../.. -# Ignition transport examples +# Gazebo transport examples RUN cd gz-transport/example \ && mkdir build \ && cd build \ diff --git a/example/configure.bat b/example/configure.bat deleted file mode 100644 index ae863bd7d..000000000 --- a/example/configure.bat +++ /dev/null @@ -1,26 +0,0 @@ -@rem Run CMake, pointing to sibling directories containing dependencies. -@rem Note that zmq and cppzmq are relative to the source dir, while -@rem protobuf is relative to the build dir. Not sure why. -@set build_type=Release -@if not "%1"=="" set build_type=%1 -@set build_bitness=64 -@if not "%2"=="" set build_bitness=%2 -@echo Configuring for build type %build_type% - -@set PROTOBUF_PATH=%cd%\..\..\..\protobuf-2.6.0-win%build_bitness%-vc12 -@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="%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"^ - -DCMAKE_BUILD_TYPE=%build_type%^ - .. - -@if %errorlevel% neq 0 exit /b %errorlevel% -@echo Configuration complete. To build, run `nmake` diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 4b2bdd7bb..992a1312e 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -1,2 +1,2 @@ add_subdirectory(gz) -install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}) +install(DIRECTORY ignition DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL}) diff --git a/include/gz/transport/CMakeLists.txt b/include/gz/transport/CMakeLists.txt index 2a5d4fc9f..153f266a8 100644 --- a/include/gz/transport/CMakeLists.txt +++ b/include/gz/transport/CMakeLists.txt @@ -3,4 +3,4 @@ # that the detail headers are not installed. The next install line solves this # problem. gz_install_all_headers(EXCLUDE_DIRS detail) -install(DIRECTORY detail DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}/gz/${IGN_DESIGNATION}) +install(DIRECTORY detail DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL}/gz/${GZ_DESIGNATION}) diff --git a/include/gz/transport/Helpers.hh b/include/gz/transport/Helpers.hh index 1a4d46dc3..feff06b19 100644 --- a/include/gz/transport/Helpers.hh +++ b/include/gz/transport/Helpers.hh @@ -88,5 +88,5 @@ namespace gz } } -// IGN_TRANSPORT_HELPERS_HH_ +// GZ_TRANSPORT_HELPERS_HH_ #endif diff --git a/include/gz/transport/gz_auto_headers.hh.in b/include/gz/transport/gz_auto_headers.hh.in index 6a6849cf3..78322db29 100644 --- a/include/gz/transport/gz_auto_headers.hh.in +++ b/include/gz/transport/gz_auto_headers.hh.in @@ -1,3 +1,3 @@ // Automatically generated -#include +#include ${ign_headers} diff --git a/log/include/CMakeLists.txt b/log/include/CMakeLists.txt index 4b2bdd7bb..992a1312e 100644 --- a/log/include/CMakeLists.txt +++ b/log/include/CMakeLists.txt @@ -1,2 +1,2 @@ add_subdirectory(gz) -install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}) +install(DIRECTORY ignition DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL}) diff --git a/log/src/CMakeLists.txt b/log/src/CMakeLists.txt index 27d325e0d..4a9398da4 100644 --- a/log/src/CMakeLists.txt +++ b/log/src/CMakeLists.txt @@ -41,7 +41,7 @@ if(MSVC) endif() # Set install instructions for the sql schema, and configure the build to use it -set(SCHEMA_INSTALL_BASE ${IGN_DATA_INSTALL_DIR}) +set(SCHEMA_INSTALL_BASE ${GZ_DATA_INSTALL_DIR}) install(DIRECTORY ../sql DESTINATION ${SCHEMA_INSTALL_BASE}) set(SCHEMA_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${SCHEMA_INSTALL_BASE}/sql) configure_file(build_config.hh.in build_config.hh @ONLY) diff --git a/log/src/Descriptor_TEST.cc b/log/src/Descriptor_TEST.cc index 17d3d9f90..ecf67183b 100644 --- a/log/src/Descriptor_TEST.cc +++ b/log/src/Descriptor_TEST.cc @@ -63,12 +63,12 @@ TEST(Descriptor, TopicIdOneTopic) { Descriptor desc = Log::Construct(); TopicKeyMap topics; - TopicKey key = {"/foo/bar", "ign.msgs.DNE"}; + TopicKey key = {"/foo/bar", "gz.msgs.DNE"}; topics[key] = 5; Log::Reset(desc, topics); - EXPECT_EQ(5, desc.TopicId("/foo/bar", "ign.msgs.DNE")); - EXPECT_GT(0, desc.TopicId("/fooo/bar", "ign.msgs.DNE")); - EXPECT_GT(0, desc.TopicId("/foo/bar", "ign.msgs.DNEE")); + EXPECT_EQ(5, desc.TopicId("/foo/bar", "gz.msgs.DNE")); + EXPECT_GT(0, desc.TopicId("/fooo/bar", "gz.msgs.DNE")); + EXPECT_GT(0, desc.TopicId("/foo/bar", "gz.msgs.DNEE")); } ////////////////////////////////////////////////// @@ -76,18 +76,18 @@ TEST(Descriptor, TopicIdMultipleTopicsSameName) { Descriptor desc = Log::Construct(); TopicKeyMap topics; - TopicKey key1 = {"/foo/bar", "ign.msgs.DNE"}; - TopicKey key2 = {"/foo/bar", "ign.msgs.DNE2"}; - TopicKey key3 = {"/foo/bar", "ign.msgs.DNE3"}; + TopicKey key1 = {"/foo/bar", "gz.msgs.DNE"}; + TopicKey key2 = {"/foo/bar", "gz.msgs.DNE2"}; + TopicKey key3 = {"/foo/bar", "gz.msgs.DNE3"}; topics[key1] = 5; topics[key2] = 6; topics[key3] = 7; Log::Reset(desc, topics); - EXPECT_EQ(5, desc.TopicId("/foo/bar", "ign.msgs.DNE")); - EXPECT_EQ(6, desc.TopicId("/foo/bar", "ign.msgs.DNE2")); - EXPECT_EQ(7, desc.TopicId("/foo/bar", "ign.msgs.DNE3")); - EXPECT_GT(0, desc.TopicId("/fooo/bar", "ign.msgs.DNE")); - EXPECT_GT(0, desc.TopicId("/foo/bar", "ign.msgs.DNEE")); + EXPECT_EQ(5, desc.TopicId("/foo/bar", "gz.msgs.DNE")); + EXPECT_EQ(6, desc.TopicId("/foo/bar", "gz.msgs.DNE2")); + EXPECT_EQ(7, desc.TopicId("/foo/bar", "gz.msgs.DNE3")); + EXPECT_GT(0, desc.TopicId("/fooo/bar", "gz.msgs.DNE")); + EXPECT_GT(0, desc.TopicId("/foo/bar", "gz.msgs.DNEE")); } ////////////////////////////////////////////////// @@ -95,18 +95,18 @@ TEST(Descriptor, TopicIdMultipleTopicsSameType) { Descriptor desc = Log::Construct(); TopicKeyMap topics; - TopicKey key1 = {"/foo/bar", "ign.msgs.DNE"}; - TopicKey key2 = {"/fiz/buz", "ign.msgs.DNE"}; - TopicKey key3 = {"/fiz/bar", "ign.msgs.DNE"}; + TopicKey key1 = {"/foo/bar", "gz.msgs.DNE"}; + TopicKey key2 = {"/fiz/buz", "gz.msgs.DNE"}; + TopicKey key3 = {"/fiz/bar", "gz.msgs.DNE"}; topics[key1] = 5; topics[key2] = 6; topics[key3] = 7; Log::Reset(desc, topics); - EXPECT_EQ(5, desc.TopicId("/foo/bar", "ign.msgs.DNE")); - EXPECT_EQ(6, desc.TopicId("/fiz/buz", "ign.msgs.DNE")); - EXPECT_EQ(7, desc.TopicId("/fiz/bar", "ign.msgs.DNE")); - EXPECT_GT(0, desc.TopicId("/fooo/bar", "ign.msgs.DNE")); - EXPECT_GT(0, desc.TopicId("/foo/bar", "ign.msgs.DNEE")); + EXPECT_EQ(5, desc.TopicId("/foo/bar", "gz.msgs.DNE")); + EXPECT_EQ(6, desc.TopicId("/fiz/buz", "gz.msgs.DNE")); + EXPECT_EQ(7, desc.TopicId("/fiz/bar", "gz.msgs.DNE")); + EXPECT_GT(0, desc.TopicId("/fooo/bar", "gz.msgs.DNE")); + EXPECT_GT(0, desc.TopicId("/foo/bar", "gz.msgs.DNEE")); } ////////////////////////////////////////////////// @@ -114,7 +114,7 @@ TEST(Descriptor, TopicsMapOneTopic) { Descriptor desc = Log::Construct(); TopicKeyMap topics; - TopicKey key = {"/foo/bar", "ign.msgs.DNE"}; + TopicKey key = {"/foo/bar", "gz.msgs.DNE"}; topics[key] = 5; Log::Reset(desc, topics); auto topicsMap = desc.TopicsToMsgTypesToId(); @@ -122,7 +122,7 @@ TEST(Descriptor, TopicsMapOneTopic) EXPECT_EQ("/foo/bar", topicsMap.begin()->first); auto msgsMap = topicsMap.begin()->second; ASSERT_EQ(1u, msgsMap.size()); - EXPECT_EQ("ign.msgs.DNE", msgsMap.begin()->first); + EXPECT_EQ("gz.msgs.DNE", msgsMap.begin()->first); EXPECT_EQ(5, msgsMap.begin()->second); } @@ -131,12 +131,12 @@ TEST(Descriptor, MsgTypesMapOneTopic) { Descriptor desc = Log::Construct(); TopicKeyMap topics; - TopicKey key = {"/foo/bar", "ign.msgs.DNE"}; + TopicKey key = {"/foo/bar", "gz.msgs.DNE"}; topics[key] = 5; Log::Reset(desc, topics); auto msgsMap = desc.MsgTypesToTopicsToId(); ASSERT_EQ(1u, msgsMap.size()); - EXPECT_EQ("ign.msgs.DNE", msgsMap.begin()->first); + EXPECT_EQ("gz.msgs.DNE", msgsMap.begin()->first); auto topicsMap = msgsMap.begin()->second; ASSERT_EQ(1u, topicsMap.size()); EXPECT_EQ("/foo/bar", topicsMap.begin()->first); @@ -146,10 +146,10 @@ TEST(Descriptor, MsgTypesMapOneTopic) ////////////////////////////////////////////////// TEST(Descriptor, TopicKeyEquality) { - TopicKey key1 = {"/foo/bar", "ign.msgs.DNE"}; - TopicKey key2 = {"/foo/bar", "ign.msgs.DNE2"}; - TopicKey key3 = {"/foo/bar3", "ign.msgs.DNE"}; - TopicKey key4 = {"/foo/bar", "ign.msgs.DNE"}; + TopicKey key1 = {"/foo/bar", "gz.msgs.DNE"}; + TopicKey key2 = {"/foo/bar", "gz.msgs.DNE2"}; + TopicKey key3 = {"/foo/bar3", "gz.msgs.DNE"}; + TopicKey key4 = {"/foo/bar", "gz.msgs.DNE"}; EXPECT_FALSE(key1 == key2); EXPECT_FALSE(key1 == key3); EXPECT_EQ(key1, key4); diff --git a/log/src/cmd/CMakeLists.txt b/log/src/cmd/CMakeLists.txt index 2f5677978..f410bcc10 100644 --- a/log/src/cmd/CMakeLists.txt +++ b/log/src/cmd/CMakeLists.txt @@ -57,4 +57,4 @@ configure_file( "transportlog.yaml.in" ${transportlog_configured}) -install(FILES ${transportlog_configured} DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/ignition/) +install(FILES ${transportlog_configured} DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/gz/) diff --git a/log/test/integration/recorder.cc b/log/test/integration/recorder.cc index a064747bc..05119c9de 100644 --- a/log/test/integration/recorder.cc +++ b/log/test/integration/recorder.cc @@ -72,7 +72,7 @@ TEST(recorder, GZ_UTILS_TEST_DISABLED_ON_MAC(BeginRecordingTopicsBeforeAdvertisement)) { // Remember to include a leading slash so that the VerifyTopic lambda below - // will work correctly. ign-transport automatically adds a leading slash to + // will work correctly. gz-transport automatically adds a leading slash to // topics that don't specify one. std::vector topics = {"/foo", "/bar"}; @@ -283,7 +283,7 @@ TEST(recorder, BeginRecordingAllBeforeAdvertisement) TEST(recorder, DataWriterQueue) { // Remember to include a leading slash so that the VerifyTopic lambda below - // will work correctly. ign-transport automatically adds a leading slash to + // will work correctly. gz-transport automatically adds a leading slash to // topics that don't specify one. std::string topic{"/foo"}; @@ -372,7 +372,7 @@ TEST(recorder, DataWriterQueue) TEST(recorder, DataWriterQueueClockUpdates) { // Remember to include a leading slash so that the VerifyTopic lambda below - // will work correctly. ign-transport automatically adds a leading slash to + // will work correctly. gz-transport automatically adds a leading slash to // topics that don't specify one. std::string topic{"/foo"}; @@ -446,7 +446,7 @@ void TestBufferSizeSettings(const std::optional &_bufferSize, int _numChirps) { // Remember to include a leading slash so that the VerifyTopic lambda below - // will work correctly. ign-transport automatically adds a leading slash to + // will work correctly. gz-transport automatically adds a leading slash to // topics that don't specify one. std::string topic{"/foo"}; diff --git a/src/CIface_TEST.cc b/src/CIface_TEST.cc index d9f73b366..f7acb9d6d 100644 --- a/src/CIface_TEST.cc +++ b/src/CIface_TEST.cc @@ -183,7 +183,7 @@ int main(int argc, char **argv) setenv("GZ_PARTITION", partition.c_str(), 1); // Enable verbose mode. - // setenv("IGN_VERBOSE", "1", 1); + // setenv("GZ_VERBOSE", "1", 1); ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); diff --git a/src/NetUtils.cc b/src/NetUtils.cc index 6f7f7c536..a68586282 100644 --- a/src/NetUtils.cc +++ b/src/NetUtils.cc @@ -131,7 +131,7 @@ inline namespace GZ_TRANSPORT_VERSION_NAMESPACE ////////////////////////////////////////////////// std::string determineHost() { - // First, did the user set IGN_IP? + // First, did the user set GZ_IP? std::string gzIp; if (env("GZ_IP", gzIp) && !gzIp.empty()) { diff --git a/src/NodeShared.cc b/src/NodeShared.cc index bab381471..32fd88d55 100644 --- a/src/NodeShared.cc +++ b/src/NodeShared.cc @@ -63,7 +63,7 @@ using namespace std::chrono_literals; using namespace gz; using namespace transport; -const char kIgnAuthDomain[] = "ign-auth"; +const char kGzAuthDomain[] = "gz-auth"; // Enum that encapsulates the possible values for ZeroMQ's setsocketopt // for ZMQ_PLAIN_SERVER. A value of 1 enables @@ -1719,12 +1719,12 @@ void NodeSharedPrivate::SecurityInit() #ifdef GZ_CPPZMQ_POST_4_7_0 this->publisher->set(zmq::sockopt::plain_server, asPlainSecurityServer); - this->publisher->set(zmq::sockopt::zap_domain, kIgnAuthDomain); + this->publisher->set(zmq::sockopt::zap_domain, kGzAuthDomain); #else this->publisher->setsockopt(ZMQ_PLAIN_SERVER, &asPlainSecurityServer, sizeof(asPlainSecurityServer)); - this->publisher->setsockopt(ZMQ_ZAP_DOMAIN, kIgnAuthDomain, - std::strlen(kIgnAuthDomain)); + this->publisher->setsockopt(ZMQ_ZAP_DOMAIN, kGzAuthDomain, + std::strlen(kGzAuthDomain)); #endif } } @@ -1831,7 +1831,7 @@ void NodeSharedPrivate::AccessControlHandler() } // Check the domain - if (std::strcmp(domain.c_str(), kIgnAuthDomain) != 0) + if (std::strcmp(domain.c_str(), kGzAuthDomain) != 0) { sendAuthErrorHelper(*sock, "Invalid domain"); continue; diff --git a/src/Node_TEST.cc b/src/Node_TEST.cc index bdd0d2594..4727c1990 100644 --- a/src/Node_TEST.cc +++ b/src/Node_TEST.cc @@ -2313,7 +2313,7 @@ int main(int argc, char **argv) setenv("GZ_PARTITION", partition.c_str(), 1); // Enable verbose mode. - setenv("IGN_VERBOSE", "1", 1); + setenv("GZ_VERBOSE", "1", 1); ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt index 5dac33bca..97e816bf2 100644 --- a/src/cmd/CMakeLists.txt +++ b/src/cmd/CMakeLists.txt @@ -15,24 +15,24 @@ target_link_libraries(gz ) # Build topic CLI executable -set(topic_executable ign-transport-topic) +set(topic_executable gz-transport-topic) add_executable(${topic_executable} topic_main.cc) target_link_libraries(${topic_executable} gz gz-utils${GZ_UTILS_VER}::cli ${PROJECT_LIBRARY_TARGET_NAME} ) -install(TARGETS ${topic_executable} DESTINATION ${IGN_LIB_INSTALL_DIR}/ignition/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}/) +install(TARGETS ${topic_executable} DESTINATION ${GZ_LIB_INSTALL_DIR}/gz/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}/) # Build service CLI executable -set(service_executable ign-transport-service) +set(service_executable gz-transport-service) add_executable(${service_executable} service_main.cc) target_link_libraries(${service_executable} gz gz-utils${GZ_UTILS_VER}::cli ${PROJECT_LIBRARY_TARGET_NAME} ) -install(TARGETS ${service_executable} DESTINATION ${IGN_LIB_INSTALL_DIR}/ignition/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}/) +install(TARGETS ${service_executable} DESTINATION ${GZ_LIB_INSTALL_DIR}/gz/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}/) # Build the unit tests. gz_build_tests(TYPE UNIT SOURCES ${gtest_sources} @@ -64,8 +64,8 @@ endif() # Generate the ruby script for internal testing. # Note that the major version of the library is included in the name. # Ex: cmdtransport0.rb -set(cmd_script_generated_test "${CMAKE_BINARY_DIR}/test/lib/$/ruby/gz/cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.rb") -set(cmd_script_configured_test "${CMAKE_CURRENT_BINARY_DIR}/test_cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.rb.configured") +set(cmd_script_generated_test "${CMAKE_BINARY_DIR}/test/lib/$/ruby/gz/cmd${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}.rb") +set(cmd_script_configured_test "${CMAKE_CURRENT_BINARY_DIR}/test_cmd${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}.rb.configured") # Set the library_location variable to the full path of the library file within # the build directory. @@ -73,7 +73,7 @@ set(service_exe_location "$") set(topic_exe_location "$") configure_file( - "cmd${IGN_DESIGNATION}.rb.in" + "cmd${GZ_DESIGNATION}.rb.in" "${cmd_script_configured_test}" @ONLY) @@ -87,16 +87,16 @@ file(GENERATE # Generate the ruby script that gets installed. # Note that the major version of the library is included in the name. # Ex: cmdtransport0.rb -set(cmd_script_generated "${CMAKE_CURRENT_BINARY_DIR}/cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.rb") +set(cmd_script_generated "${CMAKE_CURRENT_BINARY_DIR}/cmd${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}.rb") set(cmd_script_configured "${cmd_script_generated}.configured") # Set the library_location variable to the relative path to the library file # within the install directory structure. -set(service_exe_location "../../../${CMAKE_INSTALL_LIBDIR}/ignition/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}/$") -set(topic_exe_location "../../../${CMAKE_INSTALL_LIBDIR}/ignition/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}/$") +set(service_exe_location "../../../${CMAKE_INSTALL_LIBDIR}/gz/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}/$") +set(topic_exe_location "../../../${CMAKE_INSTALL_LIBDIR}/gz/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}/$") configure_file( - "cmd${IGN_DESIGNATION}.rb.in" + "cmd${GZ_DESIGNATION}.rb.in" "${cmd_script_configured}" @ONLY) diff --git a/src/cmd/cmdtransport.rb.in b/src/cmd/cmdtransport.rb.in index 7ddc3c072..74d96000b 100644 --- a/src/cmd/cmdtransport.rb.in +++ b/src/cmd/cmdtransport.rb.in @@ -24,7 +24,7 @@ COMMANDS = { } # -# Class for the Ignition transport command line tools. +# Class for the Gazebo transport command line tools. # class Cmd def execute(args) diff --git a/test/integration/all_symbols_have_version.bash.in b/test/integration/all_symbols_have_version.bash.in index f95072554..0809555fb 100644 --- a/test/integration/all_symbols_have_version.bash.in +++ b/test/integration/all_symbols_have_version.bash.in @@ -2,10 +2,10 @@ LIBPATH=$1 VERSIONED_NS=v@PROJECT_VERSION_MAJOR@ -IGN_PROJECT=@IGN_DESIGNATION@ +GZ_PROJECT=@GZ_DESIGNATION@ # Sanity check - there should be at least one symbol -NUM_SYMBOLS=$(nm $LIBPATH | grep -e "gz.*$IGN_PROJECT" | wc -l) +NUM_SYMBOLS=$(nm $LIBPATH | grep -e "gz.*$GZ_PROJECT" | wc -l) if [ $NUM_SYMBOLS -eq 0 ] then @@ -14,7 +14,7 @@ then fi # There must be no unversioned symbols -UNVERSIONED_SYMBOLS=$(nm $LIBPATH | grep -e "gz.*$IGN_PROJECT" | grep -e "$VERSIONED_NS" -v) +UNVERSIONED_SYMBOLS=$(nm $LIBPATH | grep -e "gz.*$GZ_PROJECT" | grep -e "$VERSIONED_NS" -v) UNVERSIONED_SYMBOL_CHARS=$(printf "$UNVERSIONED_SYMBOLS" | wc -m) if [ $UNVERSIONED_SYMBOL_CHARS -ne 0 ] diff --git a/tutorials.md.in b/tutorials.md.in index 3ed732a68..e6a5a923b 100644 --- a/tutorials.md.in +++ b/tutorials.md.in @@ -1,8 +1,8 @@ \page tutorials Tutorials -Welcome to the Gazebo @IGN_DESIGNATION_CAP@ tutorials. These tutorials +Welcome to the Gazebo @GZ_DESIGNATION_CAP@ tutorials. These tutorials will guide you through the process of understanding the capabilities of the -Gazebo @IGN_DESIGNATION_CAP@ library and how to use the library effectively. +Gazebo @GZ_DESIGNATION_CAP@ library and how to use the library effectively. **The tutorials** diff --git a/tutorials/02_installation.md b/tutorials/02_installation.md index b45d05e71..19fbf7ac4 100644 --- a/tutorials/02_installation.md +++ b/tutorials/02_installation.md @@ -28,7 +28,7 @@ wget https://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add - Install Gazebo Transport: ``` sudo apt-get update -sudo apt-get install libignition-transport<#>-dev +sudo apt-get install libgz-transport<#>-dev ``` Be sure to replace `<#>` with a number value, such as `8` or `9`, depending on @@ -73,7 +73,7 @@ conda activate gz-ws Install: ``` -conda install libignition-transport<#> --channel conda-forge +conda install libgz-transport<#> --channel conda-forge ``` Be sure to replace `<#>` with a number value, such as 1 or 2, depending on @@ -89,12 +89,12 @@ Ubuntu distribution equal to 20.04 (Focal) or newer. Make sure you have removed the Ubuntu pre-compiled binaries before installing from source: ``` -sudo apt-get remove libignition-transport.*-dev +sudo apt-get remove libgz-transport.*-dev ``` Install prerequisites. A clean Ubuntu system will need: ``` -sudo apt-get install git cmake pkg-config python ruby-ronn libprotoc-dev libprotobuf-dev protobuf-compiler uuid-dev libzmq3-dev libignition-msgs-dev libignition-utils2-cli-dev +sudo apt-get install git cmake pkg-config python ruby-ronn libprotoc-dev libprotobuf-dev protobuf-compiler uuid-dev libzmq3-dev libgz-msgs-dev libgz-utils2-cli-dev ``` Clone the repository @@ -166,7 +166,7 @@ debian-based install when you currently have installed the library from source, navigate to your source code directory's build folders and run `make uninstall`: ``` -cd /tmp/ign-transport/build +cd /tmp/gz-transport/build sudo make uninstall ``` @@ -222,12 +222,12 @@ Install Gazebo dependencies: You can view available versions and their dependencies: ``` -conda search libignition-transport* --channel conda-forge --info +conda search libgz-transport* --channel conda-forge --info ``` Install dependencies, replacing `<#>` with the desired versions: ``` -conda install libignition-cmake<#> libignition-msgs<#> libignition-tools<#> --channel conda-forge +conda install libgz-cmake<#> libgz-msgs<#> libgz-tools<#> --channel conda-forge ``` #### Building from Source diff --git a/tutorials/07_relay.md b/tutorials/07_relay.md index d6d953717..3ba52723d 100644 --- a/tutorials/07_relay.md +++ b/tutorials/07_relay.md @@ -26,7 +26,7 @@ install Docker following any of the existing guides available We're going to build a Docker image and run it inside your host computer. Download the [build.bash](https://github.com/gazebosim/gz-transport/raw/main/docker/build.bash), [run.bash](https://github.com/gazebosim/gz-transport/raw/main/docker/run.bash) and -[Dockerfile](https://github.com/gazebosim/gz-transport/raw/main/docker/ign-transport/Dockerfile) files. +[Dockerfile](https://github.com/gazebosim/gz-transport/raw/main/docker/gz-transport/Dockerfile) files. ```{.sh} wget https://github.com/gazebosim/gz-transport/raw/main/docker/build.bash @@ -53,7 +53,7 @@ cd gz-transport/example/build Back on your host, make sure that you have Gazebo Tools and net-tools installed: ``` -sudo apt install ignition-tools2 net-tools +sudo apt install gz-tools2 net-tools ``` Now, let's configure Gazebo Transport to block all multicast traffic going