diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index 7f937f3e6..6d3f9a812 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -5,9 +5,9 @@ libavutil-dev libfreeimage-dev libgdal-dev libgts-dev -libignition-cmake3-dev -libignition-math7-dev -libignition-utils2-dev +libgz-cmake3-dev +libgz-math7-dev +libgz-utils2-dev libswscale-dev libtinyxml2-dev pkg-config diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 124a1f014..955a64f35 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 jammy-ci: @@ -22,5 +22,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/macos.yml b/.github/workflows/macos.yml index 0c1874153..e544a8c48 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -5,7 +5,7 @@ on: [push, pull_request] jobs: build: env: - PACKAGE: ignition-common5 + PACKAGE: gz-common5 runs-on: macos-latest steps: - uses: actions/checkout@v2 @@ -19,7 +19,7 @@ jobs: brew tap osrf/simulation; # check for ci_matching_branch brew install wget - wget https://github.com/ignition-tooling/release-tools/raw/master/jenkins-scripts/tools/detect_ci_matching_branch.py + wget https://github.com/gazebo-tooling/release-tools/raw/master/jenkins-scripts/tools/detect_ci_matching_branch.py TRY_BRANCH="${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" if python3 detect_ci_matching_branch.py ${TRY_BRANCH} then @@ -30,7 +30,7 @@ jobs: popd echo '# END SECTION' fi - # ignition-math7 has problems with swig, remove it for now + # gz-math7 has problems with swig, remove it for now brew remove swig || true brew install --only-dependencies ${PACKAGE}; - run: mkdir build 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/BUILD.bazel b/BUILD.bazel index f6e735667..e97f57bf6 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -1,23 +1,23 @@ load( "//gz_bazel:build_defs.bzl", - "IGNITION_FEATURES", - "IGNITION_ROOT", - "IGNITION_VISIBILITY", + "GZ_FEATURES", + "GZ_ROOT", + "GZ_VISIBILITY", "generate_include_header", "gz_config_header", "gz_export_header", ) package( - default_visibility = IGNITION_VISIBILITY, - features = IGNITION_FEATURES, + default_visibility = GZ_VISIBILITY, + features = GZ_FEATURES, ) licenses(["notice"]) exports_files(["LICENSE"]) -PROJECT_NAME = "ignition-common" +PROJECT_NAME = "gz-common" PROJECT_MAJOR = 5 @@ -36,8 +36,8 @@ gz_config_header( gz_export_header( name = "include/gz/common/Export.hh", - export_base = "IGNITION_COMMON", - lib_name = "ignition-common", + export_base = "GZ_COMMON", + lib_name = "gz-common", visibility = ["//visibility:private"], ) @@ -79,14 +79,14 @@ cc_library( linkopts = ["-ldl"], deps = [ "@uuid", - IGNITION_ROOT + "gz_math", + GZ_ROOT + "gz_math", ], ) cc_binary( - name = "libignition-common5.so", + name = "libgz-common5.so", includes = ["include"], - linkopts = ["-Wl,-soname,libignition-common5.so"], + linkopts = ["-Wl,-soname,libgz-common5.so"], linkshared = True, deps = [":gz_common"], ) @@ -99,11 +99,11 @@ test_srcs = glob( [cc_test( name = src.replace("/", "_").replace(".cc", "").replace("src_", ""), srcs = [src], - data = [":libignition-common5.so"], + data = [":libgz-common5.so"], deps = [ ":gz_common", - IGNITION_ROOT + "gz_bazel:utilities", - IGNITION_ROOT + "gz_common/test:test_utils", + GZ_ROOT + "gz_bazel:utilities", + GZ_ROOT + "gz_common/test:test_utils", "@gtest", "@gtest//:gtest_main", ], diff --git a/CMakeLists.txt b/CMakeLists.txt index 7436bf502..112e2fb75 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/common - VERSION_SUFFIX pre1) +gz_configure_project(VERSION_SUFFIX pre1) #============================================================================ # Set project-specific options @@ -29,7 +27,7 @@ gz_configure_project( # Option: Should Windows test symlinking? if(WIN32) option( - IGN_BUILD_SYMLINK_TESTS_ON_WINDOWS + GZ_BUILD_SYMLINK_TESTS_ON_WINDOWS "Creating symlinks requires special permissions on Windows, so those tests are disabled by default" false) endif() diff --git a/Changelog.md b/Changelog.md index a2a284d90..89696ccad 100644 --- a/Changelog.md +++ b/Changelog.md @@ -201,7 +201,7 @@ * [Pull request #58](https://github.com/gazebosim/gz-common/pull/58) 1. Corrected `BAYER_RGGR8` to `BAYER_BGGR8` in `PixelFormatName` and - `PixelFormatType` located in `graphics/include/ignition/common/Image.hh`. + `PixelFormatType` located in `graphics/include/gz/common/Image.hh`. * [BitBucket pull request 191](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-common/pull-requests/191) 1. Added URI Authority parsing to the URI class. Authority information can @@ -366,7 +366,7 @@ 1. Windows * Do not hardcode USE_EXTERNAL_TINYXML2 to OFF: [Pull Request 116](https://github.com/gazebosim/gz-common/pull/116) - * Fix IGN_HOMEDIR on Windows: [Pull Request 127](https://github.com/gazebosim/gz-common/pull/127) + * Fix GZ_HOMEDIR on Windows: [Pull Request 127](https://github.com/gazebosim/gz-common/pull/127) * Improve Windows support: [Pull Request 128](https://github.com/gazebosim/gz-common/pull/128) * Fix Windows AV CI warnings and test failures: [Pull Request 135](https://github.com/gazebosim/gz-common/pull/135) @@ -512,7 +512,7 @@ ## Gazebo Common 3.2.0 (2019-08-07) -1. Allow gzLogInit to use an absolute path. Added a timeToIso that converts a given time to an ISO string. Some console timestamps were using `IGN_SYSTEM_TIME_NS()` and others `gz::common::systemTimeISO()`. Switched all to use `gz::common::systemTimeISO()`. +1. Allow gzLogInit to use an absolute path. Added a timeToIso that converts a given time to an ISO string. Some console timestamps were using `GZ_SYSTEM_TIME_NS()` and others `gz::common::systemTimeISO()`. Switched all to use `gz::common::systemTimeISO()`. * [BitBucket pull request 203](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-common/pull-requests/203) 1. Port ColladaLoader fix: use default value of 1 for stride parameter when unset. @@ -574,7 +574,7 @@ * [BitBucket pull request 171](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-common/pull-requests/171) * [BitBucket pull request 172](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-common/pull-requests/172) -1. SystemPaths: search paths in `IGN_FILE_PATH` environment variable when finding files +1. SystemPaths: search paths in `GZ_FILE_PATH` environment variable when finding files * [BitBucket pull request 175](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-common/pull-requests/175) 1. `Time::Sleep`: return amount of time actually slept diff --git a/Migration.md b/Migration.md index e5277e10a..0f79b5942 100644 --- a/Migration.md +++ b/Migration.md @@ -75,7 +75,7 @@ release will remove the deprecated code. ### Modifications 1. Corrected `BAYER_RGGR8` to `BAYER_BGGR8` in `PixelFormatName` and - `PixelFormatType` located in `graphics/include/ignition/common/Image.hh`. + `PixelFormatType` located in `graphics/gz/common/Image.hh`. 1. URI parsing has updated to follow the specification more closely when `URI::Authority` is set. Changes include: diff --git a/README.md b/README.md index dbd3ba4a9..9e7a20e39 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ callback system. * **Graphics**: Collada, SVG, STL, OBJ, and DEM loaders. In-memory mesh, image, and material representations. Animation processing and BVH loader. * **Profiler**: A common profiler abstraction that can be used to measure and - visualize run time of various pieces of ignition robotics software. + visualize run time of various pieces of Gazebo robotics software. # Install @@ -71,7 +71,7 @@ Refer to the following table for information about important directories and fil +-- events Header and source files for the Event component. +-- examples Example programs. +-- graphics Header and source files for the Graphics component. -+-- include/ignition/common Header files for the core component. ++-- include/gz/common Header files for the core component. +-- profiler Header and source files for the Profiler component. +-- src Core source files and unit tests. +-- test diff --git a/api.md.in b/api.md.in index 218f68573..bb345ae15 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/av/BUILD.bazel b/av/BUILD.bazel index 0dbd77fc1..a2d74f5f2 100644 --- a/av/BUILD.bazel +++ b/av/BUILD.bazel @@ -1,13 +1,13 @@ load( "//gz_bazel:build_defs.bzl", - "IGNITION_ROOT", - "IGNITION_VISIBILITY", + "GZ_ROOT", + "GZ_VISIBILITY", "generate_include_header", "gz_export_header", ) package( - default_visibility = IGNITION_VISIBILITY, + default_visibility = GZ_VISIBILITY, features = [ "-parse_headers", "-layering_check", @@ -31,8 +31,8 @@ test_sources = glob(["src/*_TEST.cc"]) gz_export_header( name = "include/gz/common/av/Export.hh", - export_base = "IGNITION_COMMON_AV", - lib_name = "ignition-common-av", + export_base = "GZ_COMMON_AV", + lib_name = "gz-common-av", visibility = ["//visibility:private"], ) @@ -55,7 +55,7 @@ cc_library( hdrs = public_headers, includes = ["include"], deps = [ - IGNITION_ROOT + "gz_common", + GZ_ROOT + "gz_common", "@ffmpeg//:avcodec", "@ffmpeg//:avdevice", "@ffmpeg//:avformat", @@ -65,9 +65,9 @@ cc_library( ) cc_binary( - name = "libignition-common5-av.so", + name = "libgz-common5-av.so", includes = ["include"], - linkopts = ["-Wl,-soname,libignition-common5-av.so"], + linkopts = ["-Wl,-soname,libgz-common5-av.so"], linkshared = True, deps = [":av"], ) @@ -76,12 +76,12 @@ cc_binary( name = src.replace("/", "_").replace(".cc", "").replace("src_", ""), srcs = [src], data = [ - IGNITION_ROOT + "gz_common/test:data", + GZ_ROOT + "gz_common/test:data", ], deps = [ ":av", - IGNITION_ROOT + "gz_common/test:test_utils", - IGNITION_ROOT + "gz_bazel:utilities", + GZ_ROOT + "gz_common/test:test_utils", + GZ_ROOT + "gz_bazel:utilities", "@gtest", "@gtest//:gtest_main", ], diff --git a/av/include/CMakeLists.txt b/av/include/CMakeLists.txt index f16a51743..6a0cd1853 100644 --- a/av/include/CMakeLists.txt +++ b/av/include/CMakeLists.txt @@ -1,2 +1,2 @@ add_subdirectory(gz) -install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL} PATTERN "HWEncoder\.hh" EXCLUDE) +install(DIRECTORY ignition DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL} PATTERN "HWEncoder\.hh" EXCLUDE) diff --git a/av/src/VideoEncoder.cc b/av/src/VideoEncoder.cc index 27252011f..4f784b24d 100644 --- a/av/src/VideoEncoder.cc +++ b/av/src/VideoEncoder.cc @@ -228,7 +228,7 @@ bool VideoEncoder::Start(const std::string &_format, if (allowedEncoders != HWEncoderType::NONE) { gzwarn << "Hardware encoding with encoders " << allowedEncodersStr - << " was requested, but ignition-common is built without HW " + << " was requested, but gz-common is built without HW " << "encoding support. A software encoder will be used instead." << std::endl; } diff --git a/events/BUILD.bazel b/events/BUILD.bazel index a14b80429..792ccd8a1 100644 --- a/events/BUILD.bazel +++ b/events/BUILD.bazel @@ -1,13 +1,13 @@ load( "//gz_bazel:build_defs.bzl", - "IGNITION_ROOT", - "IGNITION_VISIBILITY", + "GZ_ROOT", + "GZ_VISIBILITY", "generate_include_header", "gz_export_header", ) package( - default_visibility = IGNITION_VISIBILITY, + default_visibility = GZ_VISIBILITY, features = [ "-parse_headers", "-layering_check", @@ -15,8 +15,8 @@ package( ) public_headers_no_gen = glob([ - "include/ignition/common/*.hh", - "include/ignition/common/events/*.hh", + "include/gz/common/*.hh", + "include/gz/common/events/*.hh", ]) sources = glob( @@ -27,23 +27,23 @@ sources = glob( test_sources = glob(["src/*_TEST.cc"]) gz_export_header( - name = "include/ignition/common/events/Export.hh", - export_base = "IGNITION_COMMON_EVENTS", - lib_name = "ignition-common-events", + name = "include/gz/common/events/Export.hh", + export_base = "GZ_COMMON_EVENTS", + lib_name = "gz-common-events", visibility = ["//visibility:private"], ) generate_include_header( name = "eventshh_genrule", - out = "include/ignition/common/events.hh", + out = "include/gz/common/events.hh", hdrs = public_headers_no_gen + [ - "include/ignition/common/events/Export.hh", + "include/gz/common/events/Export.hh", ], ) public_headers = public_headers_no_gen + [ - "include/ignition/common/events/Export.hh", - "include/ignition/common/events.hh", + "include/gz/common/events/Export.hh", + "include/gz/common/events.hh", ] cc_library( @@ -52,14 +52,14 @@ cc_library( hdrs = public_headers, includes = ["include"], deps = [ - IGNITION_ROOT + "gz_common", + GZ_ROOT + "gz_common", ], ) cc_binary( - name = "libignition-common5-events.so", + name = "libgz-common5-events.so", includes = ["include"], - linkopts = ["-Wl,-soname,libignition-common5-events.so"], + linkopts = ["-Wl,-soname,libgz-common5-events.so"], linkshared = True, deps = [":events"], ) @@ -69,7 +69,7 @@ cc_binary( srcs = [src], deps = [ ":events", - IGNITION_ROOT + "gz_common/test:test_utils", + GZ_ROOT + "gz_common/test:test_utils", "@gtest", "@gtest//:gtest_main", ], diff --git a/events/include/CMakeLists.txt b/events/include/CMakeLists.txt index 4b2bdd7bb..992a1312e 100644 --- a/events/include/CMakeLists.txt +++ b/events/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/geospatial/include/CMakeLists.txt b/geospatial/include/CMakeLists.txt index 4b2bdd7bb..992a1312e 100644 --- a/geospatial/include/CMakeLists.txt +++ b/geospatial/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/graphics/BUILD.bazel b/graphics/BUILD.bazel index f618fa92f..4e41cff36 100644 --- a/graphics/BUILD.bazel +++ b/graphics/BUILD.bazel @@ -1,13 +1,13 @@ load( "//gz_bazel:build_defs.bzl", - "IGNITION_ROOT", - "IGNITION_VISIBILITY", + "GZ_ROOT", + "GZ_VISIBILITY", "generate_include_header", "gz_export_header", ) package( - default_visibility = IGNITION_VISIBILITY, + default_visibility = GZ_VISIBILITY, features = [ "-parse_headers", "-layering_check", @@ -28,8 +28,8 @@ test_sources = glob(["src/*_TEST.cc"]) gz_export_header( name = "include/gz/common/graphics/Export.hh", - export_base = "IGNITION_COMMON_GRAPHICS", - lib_name = "ignition-common-graphics", + export_base = "GZ_COMMON_GRAPHICS", + lib_name = "gz-common-graphics", visibility = ["//visibility:private"], ) @@ -57,15 +57,15 @@ cc_library( "@glib", "@gts", "@tinyxml2", - IGNITION_ROOT + "gz_common", - IGNITION_ROOT + "gz_utils", + GZ_ROOT + "gz_common", + GZ_ROOT + "gz_utils", ], ) cc_binary( - name = "libignition-common5-graphics.so", + name = "libgz-common5-graphics.so", includes = ["include"], - linkopts = ["-Wl,-soname,libignition-common5-graphics.so"], + linkopts = ["-Wl,-soname,libgz-common5-graphics.so"], linkshared = True, deps = [":graphics"], ) @@ -74,11 +74,11 @@ cc_binary( name = src.replace("/", "_").replace(".cc", "").replace("src_", ""), srcs = [src], data = [ - IGNITION_ROOT + "gz_common/test:data", + GZ_ROOT + "gz_common/test:data", ], deps = [ ":graphics", - IGNITION_ROOT + "gz_common/test:test_utils", + GZ_ROOT + "gz_common/test:test_utils", "@gtest", "@gtest//:gtest_main", ], diff --git a/graphics/include/CMakeLists.txt b/graphics/include/CMakeLists.txt index 4b2bdd7bb..992a1312e 100644 --- a/graphics/include/CMakeLists.txt +++ b/graphics/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/graphics/src/Image.cc b/graphics/src/Image.cc index 237716191..653c958f3 100644 --- a/graphics/src/Image.cc +++ b/graphics/src/Image.cc @@ -145,7 +145,7 @@ int Image::Load(const std::string &_filename) } gzerr << "Unable to open image file[" << this->dataPtr->fullName - << "], check your IGNITION_RESOURCE_PATH settings.\n"; + << "], check your GZ_RESOURCE_PATH settings.\n"; return -1; } 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/common/SuppressWarning.hh b/include/gz/common/SuppressWarning.hh index c886957fb..4a1b3c9d4 100644 --- a/include/gz/common/SuppressWarning.hh +++ b/include/gz/common/SuppressWarning.hh @@ -35,13 +35,13 @@ * Usage example: * * SomeClass* ptr = CreatePtr(); - * IGN_COMMON_WARN_IGNORE__DELETE_NON_VIRTUAL_DESTRUCTOR + * GZ_COMMON_WARN_IGNORE__DELETE_NON_VIRTUAL_DESTRUCTOR * delete ptr; - * IGN_COMMON_WARN_RESUME__DELETE_NON_VIRTUAL_DESTRUCTOR + * GZ_COMMON_WARN_RESUME__DELETE_NON_VIRTUAL_DESTRUCTOR * */ -// Be sure to call the IGN_COMMON_WARN_RESUME__XXXXX macro at the end of the +// Be sure to call the GZ_COMMON_WARN_RESUME__XXXXX macro at the end of the // block of code where the warning suppression is needed. Otherwise, you might // inadvertently suppress legitimate warnings. diff --git a/profiler/BUILD.bazel b/profiler/BUILD.bazel index 6a382ad91..6a39767d9 100644 --- a/profiler/BUILD.bazel +++ b/profiler/BUILD.bazel @@ -1,14 +1,14 @@ load( "//gz_bazel:build_defs.bzl", - "IGNITION_ROOT", - "IGNITION_VISIBILITY", + "GZ_ROOT", + "GZ_VISIBILITY", "cmake_configure_file", "generate_include_header", "gz_export_header", ) package( - default_visibility = IGNITION_VISIBILITY, + default_visibility = GZ_VISIBILITY, features = [ "-parse_headers", "-layering_check", @@ -55,8 +55,8 @@ cmake_configure_file( gz_export_header( name = "include/gz/common/profiler/Export.hh", - export_base = "IGNITION_COMMON_PROFILER", - lib_name = "ignition-common-profiler", + export_base = "GZ_COMMON_PROFILER", + lib_name = "gz-common-profiler", visibility = ["//visibility:private"], ) @@ -94,15 +94,15 @@ cc_library( ], includes = ["include"], deps = [ - IGNITION_ROOT + "gz_common", + GZ_ROOT + "gz_common", ":remotery", ], ) cc_binary( - name = "libignition-common5-profiler.so", + name = "libgz-common5-profiler.so", includes = ["include"], - linkopts = ["-Wl,-soname,libignition-common5-profiler.so"], + linkopts = ["-Wl,-soname,libgz-common5-profiler.so"], linkshared = True, deps = [":profiler"], ) diff --git a/profiler/CMakeLists.txt b/profiler/CMakeLists.txt index 3eb7edf1b..1cd39f952 100644 --- a/profiler/CMakeLists.txt +++ b/profiler/CMakeLists.txt @@ -3,8 +3,8 @@ add_subdirectory(src) install( DIRECTORY include/ignition - DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}) + DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL}) install( DIRECTORY include/gz - DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}) + DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL}) diff --git a/profiler/include/gz/common/Profiler.hh b/profiler/include/gz/common/Profiler.hh index 435dcf32c..4ee84b2b1 100644 --- a/profiler/include/gz/common/Profiler.hh +++ b/profiler/include/gz/common/Profiler.hh @@ -42,7 +42,7 @@ namespace gz /// but instead use the profiling macros, which can be enabled/disabled /// at compile time, which eliminates any performance impact of profiling. /// - /// Profiler is enabled by setting IGN_ENABLE_PROFILER at compile time. + /// Profiler is enabled by setting GZ_ENABLE_PROFILER at compile time. /// /// The profiler header also exports several convenience macros to make /// adding inspection points easier. diff --git a/profiler/src/CMakeLists.txt b/profiler/src/CMakeLists.txt index 440bbc2b6..5ce8887e4 100644 --- a/profiler/src/CMakeLists.txt +++ b/profiler/src/CMakeLists.txt @@ -103,14 +103,14 @@ endif() if(GZ_PROFILER_REMOTERY) set(GZ_PROFILER_SCRIPT_PATH ${CMAKE_INSTALL_LIBEXECDIR}/gz/gz-common${PROJECT_VERSION_MAJOR}) - set(GZ_PROFILER_VIS_PATH ${IGN_DATA_INSTALL_DIR}/profiler_vis) + set(GZ_PROFILER_VIS_PATH ${GZ_DATA_INSTALL_DIR}/profiler_vis) - configure_file(Remotery/ign_remotery_vis.in - ${CMAKE_CURRENT_BINARY_DIR}/ign_remotery_vis + configure_file(Remotery/gz_remotery_vis.in + ${CMAKE_CURRENT_BINARY_DIR}/gz_remotery_vis @ONLY) install(PROGRAMS - ${CMAKE_CURRENT_BINARY_DIR}/ign_remotery_vis + ${CMAKE_CURRENT_BINARY_DIR}/gz_remotery_vis DESTINATION ${GZ_PROFILER_SCRIPT_PATH}) install(DIRECTORY Remotery/vis/ diff --git a/profiler/src/Profiler.cc b/profiler/src/Profiler.cc index 3d072bf3a..18b4bb7ef 100644 --- a/profiler/src/Profiler.cc +++ b/profiler/src/Profiler.cc @@ -41,7 +41,7 @@ Profiler::Profiler(): } else { - gzdbg << "Ignition profiling with: " << impl->Name() << std::endl; + gzdbg << "Gazebo profiling with: " << impl->Name() << std::endl; } } diff --git a/profiler/src/Remotery/gz_remotery_vis.in b/profiler/src/Remotery/gz_remotery_vis.in index 1cfc160e0..53f382410 100755 --- a/profiler/src/Remotery/gz_remotery_vis.in +++ b/profiler/src/Remotery/gz_remotery_vis.in @@ -1,6 +1,6 @@ #!/usr/bin/env bash -SCRIPT_PATH=@GZ_PROFILER_SCRIPT_PATH@/ign_remotery_vis +SCRIPT_PATH=@GZ_PROFILER_SCRIPT_PATH@/gz_remotery_vis VIS_PATH=@GZ_PROFILER_VIS_PATH@/index.html # Get the full path to this script diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0987b505e..1f0b36995 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -61,20 +61,20 @@ endif() if(TARGET UNIT_PluginLoader_TEST) target_compile_definitions(UNIT_PluginLoader_TEST PRIVATE - "IGN_COMMON_LIB_PATH=\"$\"") + "GZ_COMMON_LIB_PATH=\"$\"") endif() # Produce warning on Windows if the user has decided to turn on the symlink # tests. In order for those tests to work, they will need to run the tests in # administrative mode, or use some other workaround. if(WIN32) - if(IGN_BUILD_SYMLINK_TESTS_ON_WINDOWS) + if(GZ_BUILD_SYMLINK_TESTS_ON_WINDOWS) message(STATUS "") message(STATUS "You have opted to enable symlink tests on a Windows platform.") message(STATUS "The test UNIT_Filesystem_TEST will require elevated privileges") message(STATUS "in order to succeed. For more information, see the issue") message(STATUS "https://github.com/gazebosim/gz-common/issues/21") message(STATUS "") - target_compile_definitions(UNIT_Filesystem_TEST PRIVATE IGN_BUILD_SYMLINK_TESTS_ON_WINDOWS) + target_compile_definitions(UNIT_Filesystem_TEST PRIVATE GZ_BUILD_SYMLINK_TESTS_ON_WINDOWS) endif() endif() diff --git a/src/Console.cc b/src/Console.cc index c3a8cbd71..12621a7bd 100644 --- a/src/Console.cc +++ b/src/Console.cc @@ -304,7 +304,7 @@ void FileLogger::Close() FileLogger &FileLogger::operator()() { if (!this->initialized) - this->Init(".ignition", "auto_default.log"); + this->Init(".gz", "auto_default.log"); (*this) << "(" << gz::common::systemTimeIso() << ") "; return (*this); @@ -314,7 +314,7 @@ FileLogger &FileLogger::operator()() FileLogger &FileLogger::operator()(const std::string &_file, int _line) { if (!this->initialized) - this->Init(".ignition", "auto_default.log"); + this->Init(".gz", "auto_default.log"); int index = _file.find_last_of("/") + 1; (*this) << "(" << gz::common::systemTimeIso() << ") [" diff --git a/src/Console_TEST.cc b/src/Console_TEST.cc index 0e1bcc87a..303cc955a 100644 --- a/src/Console_TEST.cc +++ b/src/Console_TEST.cc @@ -79,7 +79,7 @@ TEST_F(Console_TEST, NoInitAndLog) gzlog << logString << std::endl; // Get the absolute log file path - std::string logPath = ".ignition/auto_default.log"; + std::string logPath = ".gz/auto_default.log"; // Expect to find the string in the log file EXPECT_TRUE(GetLogContent(logPath).find(logString) != std::string::npos); diff --git a/src/SystemPaths_TEST.cc b/src/SystemPaths_TEST.cc index a237de813..1bb2c8e57 100644 --- a/src/SystemPaths_TEST.cc +++ b/src/SystemPaths_TEST.cc @@ -283,7 +283,7 @@ TEST_F(SystemPathsFixture, FindFileURI) EXPECT_EQ(file1, sp.FindFileURI("anything://test_f1")); EXPECT_NE(file2, sp.FindFileURI("anything://test_f2")); - std::string newEnv{"IGN_NEW_FILE_PATH"}; + std::string newEnv{"GZ_NEW_FILE_PATH"}; common::setenv(newEnv, dir2); sp.SetFilePathEnv(newEnv); EXPECT_EQ(newEnv, sp.FilePathEnv()); diff --git a/src/TempDirectory_TEST.cc b/src/TempDirectory_TEST.cc index 4f8393cb5..fe9c1056e 100644 --- a/src/TempDirectory_TEST.cc +++ b/src/TempDirectory_TEST.cc @@ -68,7 +68,7 @@ TEST(TempDirectory, TempDirectory) std::string path; auto curDir = gz::common::cwd(); { - gz::common::TempDirectory tmp("temp_dir", "ignition", true); + gz::common::TempDirectory tmp("temp_dir", "gz", true); EXPECT_TRUE(tmp.Valid()); EXPECT_TRUE(tmp.DoCleanup()); // Current directory changed to tempdir @@ -90,7 +90,7 @@ TEST(TempDirectory, TempDirectoryRoot) auto curDir = gz::common::cwd(); { auto p = gz::common::tempDirectoryPath(); - gz::common::TempDirectory tmp(p, "temp_dir", "ignition", true); + gz::common::TempDirectory tmp(p, "temp_dir", "gz", true); EXPECT_TRUE(tmp.Valid()); EXPECT_TRUE(tmp.DoCleanup()); EXPECT_NE(curDir, gz::common::cwd()); @@ -110,7 +110,7 @@ TEST(TempDirectory, TempDirectoryEmptyRoot) std::string path; auto curDir = gz::common::cwd(); { - gz::common::TempDirectory tmp("", "temp_dir", "ignition", true); + gz::common::TempDirectory tmp("", "temp_dir", "gz", true); EXPECT_FALSE(tmp.Valid()); EXPECT_TRUE(tmp.DoCleanup()); // Since not successfully created, no update @@ -129,7 +129,7 @@ TEST(TempDirectory, TempDirectoryNoClean) std::string path; auto curDir = gz::common::cwd(); { - gz::common::TempDirectory tmp("temp_dir", "ignition", false); + gz::common::TempDirectory tmp("temp_dir", "gz", false); EXPECT_TRUE(tmp.Valid()); EXPECT_FALSE(tmp.DoCleanup()); EXPECT_NE(curDir, gz::common::cwd()); @@ -150,7 +150,7 @@ TEST(TempDirectory, TempDirectoryNoCleanLater) std::string path; auto curDir = gz::common::cwd(); { - gz::common::TempDirectory tmp("temp_dir", "ignition", true); + gz::common::TempDirectory tmp("temp_dir", "gz", true); EXPECT_TRUE(tmp.Valid()); EXPECT_TRUE(tmp.DoCleanup()); EXPECT_NE(curDir, gz::common::cwd()); diff --git a/src/Util_TEST.cc b/src/Util_TEST.cc index 453ec1930..041c615de 100644 --- a/src/Util_TEST.cc +++ b/src/Util_TEST.cc @@ -175,7 +175,7 @@ TEST(Util_TEST, emptyENV) ///////////////////////////////////////////////// TEST(Util_TEST, envSet) { - const auto key = "IGN_ENV_SET"; + const auto key = "GZ_ENV_SET"; ASSERT_TRUE(common::setenv(key, "VALUE")); // Check set var @@ -208,7 +208,7 @@ TEST(Util_TEST, envSet) ///////////////////////////////////////////////// TEST(Util_TEST, envUnset) { - const auto key = "IGN_ENV_UNSET"; + const auto key = "GZ_ENV_UNSET"; ASSERT_TRUE(common::unsetenv(key)); // Check unset var (default) @@ -237,7 +237,7 @@ TEST(Util_TEST, envUnset) ///////////////////////////////////////////////// TEST(Util_TEST, envSetEmpty) { - const auto key = "IGN_ENV_SET_EMPTY"; + const auto key = "GZ_ENV_SET_EMPTY"; ASSERT_TRUE(common::setenv(key, "")); ASSERT_FALSE(common::setenv("", "")); diff --git a/test/integration/console.cc b/test/integration/console.cc index cd0050898..fb1f0d500 100644 --- a/test/integration/console.cc +++ b/test/integration/console.cc @@ -41,7 +41,7 @@ TEST(Console_TEST, LogInitAfterConsoleOut) { auto defaultPath = gz::common::joinPaths(home, - ".ignition", "auto_default.log"); + ".gz", "auto_default.log"); std::ifstream t(defaultPath); std::string buffer((std::istreambuf_iterator(t)), diff --git a/test/static_assertions/CMakeLists.txt b/test/static_assertions/CMakeLists.txt index b3ba61b29..f3787783d 100644 --- a/test/static_assertions/CMakeLists.txt +++ b/test/static_assertions/CMakeLists.txt @@ -41,7 +41,7 @@ if (UNIX) PASS_REGULAR_EXPRESSION "is not a base class of") set_tests_properties(STATIC_ASSERT_plugin_not_global_ns PROPERTIES - PASS_REGULAR_EXPRESSION "IGN_macro_must_be_used_in_global_namespace") + PASS_REGULAR_EXPRESSION "GZ_macro_must_be_used_in_global_namespace") set_tests_properties(STATIC_ASSERT_plugin_wrong_base_class PROPERTIES PASS_REGULAR_EXPRESSION "is not a base class of") diff --git a/testing/include/CMakeLists.txt b/testing/include/CMakeLists.txt index 4b2bdd7bb..992a1312e 100644 --- a/testing/include/CMakeLists.txt +++ b/testing/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/testing/include/gz/common/testing/BazelTestPaths.hh b/testing/include/gz/common/testing/BazelTestPaths.hh index 86440fb78..003c8989f 100644 --- a/testing/include/gz/common/testing/BazelTestPaths.hh +++ b/testing/include/gz/common/testing/BazelTestPaths.hh @@ -32,7 +32,7 @@ namespace gz::common::testing /// /// The main mechanism for detecting a bazel build is via the presence of the /// TEST_SRCDIR and TEST_UNDECLARED_OUTPUTS_DIR environment variables. -/// Additionally, tests built via ign-bazel should set IGN_BAZEL_DIR. +/// Additionally, tests built via gz-bazel should set GZ_BAZEL_DIR. /// /// For source files to be available for bazel builds, they need to be set in /// the "data" section of the relevant cc_library or cc_test call. diff --git a/testing/src/BazelTestPaths.cc b/testing/src/BazelTestPaths.cc index 531d97ed1..fdf55e33d 100644 --- a/testing/src/BazelTestPaths.cc +++ b/testing/src/BazelTestPaths.cc @@ -32,11 +32,9 @@ bool BazelTestPaths::ProjectSourcePath(std::string &_sourceDir) std::string test_srcdir, bazel_path; if (common::env("TEST_SRCDIR", test_srcdir) && - common::env("IGN_BAZEL_PATH", bazel_path)) + common::env("GZ_BAZEL_PATH", bazel_path)) { - _sourceDir = gz::common::joinPaths(test_srcdir, - "ignition", - bazel_path); + _sourceDir = gz::common::joinPaths(test_srcdir, "gz", bazel_path); return true; } else @@ -52,4 +50,3 @@ bool BazelTestPaths::TestTmpPath(std::string &_tmpDir) } } // namespace gz::common::testing - diff --git a/tutorials.md.in b/tutorials.md.in index 3ab8c2498..340a35c9f 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/install.md b/tutorials/install.md index ab0e3d8df..0a0176fa3 100644 --- a/tutorials/install.md +++ b/tutorials/install.md @@ -15,7 +15,7 @@ The Source Installation instructions should be used if you need the very latest On Ubuntu systems, `apt-get` can be used to install `gz-common`: ``` -sudo apt install libignition-common<#>-dev +sudo apt install libgz-common<#>-dev ``` Be sure to replace `<#>` with a number value, such as 2 or 3, depending on @@ -31,7 +31,7 @@ On macOS, add OSRF packages: Install Gazebo Common: ``` - brew install ignition-common<#> + brew install gz-common<#> ``` Be sure to replace `<#>` with a number value, such as 3 or 4, depending on @@ -50,7 +50,7 @@ conda activate gz-ws Install `gz-common`: ``` -conda install libignition-common<#> --channel conda-forge +conda install libgz-common<#> --channel conda-forge ``` Be sure to replace `<#>` with a number value, such as 2 or 3, depending on @@ -101,12 +101,12 @@ Install Gazebo dependencies: You can view available versions and their dependencies: ``` -conda search libignition-common* --channel conda-forge --info +conda search libgz-common* --channel conda-forge --info ``` Install dependencies, replacing `<#>` with the desired versions: ``` -conda install libignition-cmake<#> libignition-math<#> --channel conda-forge +conda install libgz-cmake<#> libgz-math<#> --channel conda-forge ``` ## Build from Source @@ -143,7 +143,7 @@ conda install libignition-cmake<#> libignition-math<#> --channel conda-forge 2. Install dependencies ``` - brew install --only-dependencies ignition-common<#> + brew install --only-dependencies gz-common<#> ``` Be sure to replace `<#>` with a number value, such as 3 or 4, depending on which version you need. diff --git a/tutorials/profiler.md b/tutorials/profiler.md index e4e3d4e5c..9c9bf19d2 100644 --- a/tutorials/profiler.md +++ b/tutorials/profiler.md @@ -88,10 +88,10 @@ From terminal 2, open the visualizer using one of the following commands ```{.sh} # Find the launcher script and use it (Linux and macOS) -find /usr | grep ign_remotery_vis +find /usr | grep gz_remotery_vis ... -/usr//ign_remotery_vis +/usr//gz_remotery_vis # Use the source path (Linux) # Substitute the path to your gz-common source checkout @@ -99,10 +99,10 @@ xdg-open $SOURCE_DIR/gz-common/profiler/src/Remotery/vis/index.html # Use the installation path (Linux) # This may vary depending on where you have choosen to install -xdg-open /usr/share/ignition/ignition-common5/profiler_vis/index.html +xdg-open /usr/share/gz/gz-common5/profiler_vis/index.html # Use the installation path (macOS) -open /usr/share/ignition/ignition-common5/profiler_vis/index.html +open /usr/share/gz/gz-common5/profiler_vis/index.html ``` ### On Gazebo library @@ -118,9 +118,9 @@ When compiling with ``colcon``: colcon build --cmake-args -DENABLE_PROFILER=1 ``` -Run your Gazebo library then go to your ignition installation path and open the profiler browser using: +Run your Gazebo library then go to your Gazebo installation path and open the profiler browser using: ``` -libexec/gz/gz-common/ign_remotery_vis +libexec/gz/gz-common/gz_remotery_vis ``` If the profiler is run successfully, you should see output in a browser. Similar to this