Partial cmake and source migrations (#392)

Signed-off-by: methylDragon <[email protected]>

.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

.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

.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

.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 }}

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",
     ],

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()

Changelog.md

@@ -8,7 +8,7 @@
 1. Fix spelling in URI error message
     * [Pull request #333](https://github.com/gazebosim/gz-common/pull/333)
 
-1. `ignLogInit` fails if run after console output
+1. `gzLogInit` fails if run after console output
     * [Pull request #332](https://github.com/gazebosim/gz-common/pull/332)
 
 1. Fix compatibility with FFmpeg 5.0
@@ -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

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:

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

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

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",
     ],

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)

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;
     }