Partial source and cmake migrations (#1078)

Signed-off-by: methylDragon <[email protected]>
gazebosim · Jul 15, 2022 · 813f06e · 813f06e
1 parent 0553922
commit 813f06e
Show file tree

Hide file tree

Showing 54 changed files with 80 additions and 104 deletions.
diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt
@@ -1,9 +1,9 @@
-libignition-cmake3-dev
-libignition-common5-dev
-libignition-math7-dev
-libignition-tools2-dev
-libignition-utils2-dev
-libignition-utils2-cli-dev
+libgz-cmake3-dev
+libgz-common5-dev
+libgz-math7-dev
+libgz-tools2-dev
+libgz-utils2-dev
+libgz-utils2-cli-dev
 libtinyxml2-dev
 liburdfdom-dev
 libxml2-utils

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,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
@@ -29,4 +29,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
@@ -21,7 +21,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
@@ -32,7 +32,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};
 

diff --git 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
@@ -36,8 +36,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 if (BUILD_SDF)
   gz_configure_project(
-    NO_IGNITION_PREFIX
-    REPLACE_IGNITION_INCLUDE_PATH sdf
+    NO_PROJECT_PREFIX
+    REPLACE_INCLUDE_PATH sdf
     VERSION_SUFFIX pre1)
 
   #################################################
@@ -72,7 +72,7 @@ if (BUILD_SDF)
 
   #################################################
   # Copied from catkin/cmake/empy.cmake
-  include(IgnPython)
+  include(GzPython)
   function(find_python_module module)
     # cribbed from http://www.cmake.org/pipermail/cmake/2011-January/041666.html
     string(TOUPPER ${module} module_upper)
@@ -130,7 +130,7 @@ if (BUILD_SDF)
   ########################################
   # Python interfaces
   if (NOT PYTHON3_FOUND)
-    IGN_BUILD_WARNING("Python is missing: Python interfaces are disabled.")
+    GZ_BUILD_WARNING("Python is missing: Python interfaces are disabled.")
     message (STATUS "Searching for Python - not found.")
   else()
     message (STATUS "Searching for Python - found version ${Python3_VERSION}.")
@@ -139,10 +139,10 @@ if (BUILD_SDF)
     find_package(pybind11 2.4 QUIET)
 
     if (${pybind11_FOUND})
-      find_package(Python3 ${IGN_PYTHON_VERSION} REQUIRED COMPONENTS Development)
+      find_package(Python3 ${GZ_PYTHON_VERSION} REQUIRED COMPONENTS Development)
       message (STATUS "Searching for pybind11 - found version ${pybind11_VERSION}.")
   	else()
-  		IGN_BUILD_WARNING("pybind11 is missing: Python interfaces are disabled.")
+  		GZ_BUILD_WARNING("pybind11 is missing: Python interfaces are disabled.")
   		message (STATUS "Searching for pybind11 - not found.")
   	endif()
   endif()

diff --git a/Changelog.md b/Changelog.md
@@ -631,7 +631,7 @@
 1. Add EnforcementPolicy in ParserConfig to configure parsing strictness.
     * [Pull request 481](https://github.com/osrf/sdformat/pull/481)
 
-1. Use `ImplPtr` / `UniqueImplPtr` from ignition-utils
+1. Use `ImplPtr` / `UniqueImplPtr` from gz-utils
     * [Pull request 472](https://github.com/osrf/sdformat/pull/472)
     * [Pull request 474](https://github.com/osrf/sdformat/pull/474)
 
@@ -979,7 +979,7 @@
 1. Add cmake option to disable console logfile.
     * [Pull request 348](https://github.com/osrf/sdformat/pull/348)
 
-1. CMake fixes: include CMakePackageConfigHelpers and use modern cmake target for  ignition math.
+1. CMake fixes: include CMakePackageConfigHelpers and use modern cmake target for  gz math.
     * [Pull request 358](https://github.com/osrf/sdformat/pull/358)
 
 1. Cmake: add tinyxml2 to Config names.
@@ -1156,7 +1156,7 @@
 1. Add camera type aliases to docs.
     * [Pull request #514](https://github.com/gazebosim/sdformat/pull/514)
 
-1. Add action-ignition-ci
+1. Add action-gz-ci
     * [Pull request #501](https://github.com/gazebosim/sdformat/pull/452)
 
 ### libsdformat 9.5.0 (2021-02-11)

diff --git a/README.md b/README.md
@@ -202,7 +202,7 @@ conda search libsdformat --channel conda-forge --info
 
 Install dependencies, replacing `<#>` with the desired versions:
 ```
-conda install libignition-math<#> libignition-tools<#> --channel conda-forge
+conda install libgz-math<#> libgz-tools<#> --channel conda-forge
 ```
 
 ### Build from Source

diff --git a/conf/CMakeLists.txt b/conf/CMakeLists.txt
@@ -20,4 +20,4 @@ configure_file(
 
 # Install the yaml configuration files in an unversioned location.
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.yaml
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/ignition/)
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/gz/)
diff --git a/configure.bat b/configure.bat
diff --git a/include/sdf/Box.hh b/include/sdf/Box.hh
@@ -58,11 +58,11 @@ namespace sdf
     public: sdf::ElementPtr Element() const;
 
     /// \brief Get the Gazebo Math representation of this Box.
-    /// \return A const reference to an gz::math::Boxd object.
+    /// \return A const reference to a gz::math::Boxd object.
     public: const gz::math::Boxd &Shape() const;
 
     /// \brief Get a mutable Gazebo Math representation of this Box.
-    /// \return A reference to an gz::math::Boxd object.
+    /// \return A reference to a gz::math::Boxd object.
     public: gz::math::Boxd &Shape();
 
     /// \brief Create and return an SDF element filled with data from this

diff --git a/include/sdf/CMakeLists.txt b/include/sdf/CMakeLists.txt
@@ -4,5 +4,5 @@ install(
   FILES
     sdf.hh
     sdf_config.h
-  DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}/${PROJECT_INCLUDE_DIR}
+  DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL}/${PROJECT_INCLUDE_DIR}
 )
diff --git a/include/sdf/Capsule.hh b/include/sdf/Capsule.hh
@@ -65,11 +65,11 @@ namespace sdf
     public: sdf::ElementPtr Element() const;
 
     /// \brief Get the Gazebo Math representation of this Capsule.
-    /// \return A const reference to an gz::math::Sphered object.
+    /// \return A const reference to a gz::math::Sphered object.
     public: const gz::math::Capsuled &Shape() const;
 
     /// \brief Get a mutable Gazebo Math representation of this Capsule.
-    /// \return A reference to an gz::math::Capsuled object.
+    /// \return A reference to a gz::math::Capsuled object.
     public: gz::math::Capsuled &Shape();
 
     /// \brief Create and return an SDF element filled with data from this

diff --git a/include/sdf/Cylinder.hh b/include/sdf/Cylinder.hh
@@ -65,11 +65,11 @@ namespace sdf
     public: sdf::ElementPtr Element() const;
 
     /// \brief Get the Gazebo Math representation of this Cylinder.
-    /// \return A const reference to an gz::math::Sphered object.
+    /// \return A const reference to a gz::math::Sphered object.
     public: const gz::math::Cylinderd &Shape() const;
 
     /// \brief Get a mutable Gazebo Math representation of this Cylinder.
-    /// \return A reference to an gz::math::Cylinderd object.
+    /// \return A reference to a gz::math::Cylinderd object.
     public: gz::math::Cylinderd &Shape();
 
     /// \brief Create and return an SDF element filled with data from this

diff --git a/include/sdf/Ellipsoid.hh b/include/sdf/Ellipsoid.hh
@@ -57,11 +57,11 @@ namespace sdf
     public: sdf::ElementPtr Element() const;
 
     /// \brief Get the Gazebo Math representation of this Ellipsoid.
-    /// \return A const reference to an gz::math::Ellipsoidd object.
+    /// \return A const reference to a gz::math::Ellipsoidd object.
     public: const gz::math::Ellipsoidd &Shape() const;
 
     /// \brief Get a mutable Gazebo Math representation of this Ellipsoid.
-    /// \return A reference to an gz::math::Ellipsoidd object.
+    /// \return A reference to a gz::math::Ellipsoidd object.
     public: gz::math::Ellipsoidd &Shape();
 
     /// \brief Create and return an SDF element filled with data from this

diff --git a/include/sdf/Plane.hh b/include/sdf/Plane.hh
@@ -73,11 +73,11 @@ namespace sdf
     public: sdf::ElementPtr Element() const;
 
     /// \brief Get the Gazebo Math representation of this Plane.
-    /// \return A const reference to an gz::math::Planed object.
+    /// \return A const reference to a gz::math::Planed object.
     public: const gz::math::Planed &Shape() const;
 
     /// \brief Get a mutable Gazebo Math representation of this Plane.
-    /// \return A reference to an gz::math::Planed object.
+    /// \return A reference to a gz::math::Planed object.
     public: gz::math::Planed &Shape();
 
     /// \brief Create and return an SDF element filled with data from this

diff --git a/include/sdf/Sphere.hh b/include/sdf/Sphere.hh
@@ -52,11 +52,11 @@ namespace sdf
     public: void SetRadius(const double _radius);
 
     /// \brief Get the Gazebo Math representation of this Sphere.
-    /// \return A const reference to an gz::math::Sphered object.
+    /// \return A const reference to a gz::math::Sphered object.
     public: const gz::math::Sphered &Shape() const;
 
     /// \brief Get a mutable Gazebo Math representation of this Sphere.
-    /// \return A reference to an gz::math::Sphered object.
+    /// \return A reference to a gz::math::Sphered object.
     public: gz::math::Sphered &Shape();
 
     /// \brief Get a pointer to the SDF element that was used during

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -21,23 +21,23 @@ if(USE_SYSTEM_PATHS_FOR_PYTHON_INSTALLATION)
   endif()
 
   if(USE_DIST_PACKAGES_FOR_PYTHON)
-    string(REPLACE "site-packages" "dist-packages" IGN_PYTHON_INSTALL_PATH ${Python3_SITEARCH})
+    string(REPLACE "site-packages" "dist-packages" GZ_PYTHON_INSTALL_PATH ${Python3_SITEARCH})
   endif()
 else()
   # If not a system installation, respect local paths
-  set(IGN_PYTHON_INSTALL_PATH ${IGN_LIB_INSTALL_DIR}/python)
+  set(GZ_PYTHON_INSTALL_PATH ${GZ_LIB_INSTALL_DIR}/python)
 endif()
 
 # Set the build location and install location for a CPython extension
 function(configure_build_install_location _library_name)
   # Install library for actual use
   install(TARGETS ${_library_name}
-    DESTINATION "${IGN_PYTHON_INSTALL_PATH}"
+    DESTINATION "${GZ_PYTHON_INSTALL_PATH}"
   )
 endfunction()
 
 pybind11_add_module(sdformat SHARED
-  src/sdf/_ignition_sdformat_pybind11.cc
+  src/sdf/_gz_sdformat_pybind11.cc
   src/sdf/pyAirPressure.cc
   src/sdf/pyAltimeter.cc
   src/sdf/pyAtmosphere.cc
@@ -91,7 +91,7 @@ configure_build_install_location(sdformat)
 
 if (BUILD_TESTING)
   pybind11_add_module(sdformattest SHARED
-    test/_ignition_sdformattest_pybind11.cc
+    test/_gz_sdformattest_pybind11.cc
   )
 
   target_link_libraries(sdformattest PRIVATE

diff --git a/python/test/pyAirPressure_TEST.py b/python/test/pyAirPressure_TEST.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ignition.math import Vector3d
+from gz.math import Vector3d
 from sdformat import AirPressure, Noise
 import sdformat as sdf
 import unittest

diff --git a/python/test/pyAltimeter_TEST.py b/python/test/pyAltimeter_TEST.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ignition.math import Vector3d
+from gz.math import Vector3d
 from sdformat import Altimeter, Noise
 import sdformat as sdf
 import unittest

diff --git a/python/test/pyAtmosphere_TEST.py b/python/test/pyAtmosphere_TEST.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ignition.math import Pose3d, Temperature
+from gz.math import Pose3d, Temperature
 from sdformat import Atmosphere
 import sdformat as sdf
 import unittest

diff --git a/python/test/pyBox_TEST.py b/python/test/pyBox_TEST.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ignition.math import Vector3d
+from gz.math import Vector3d
 from sdformat import Box
 import unittest
 

diff --git a/python/test/pyCamera_TEST.py b/python/test/pyCamera_TEST.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import copy
-from ignition.math import Angle, Pose3d, Vector2d
+from gz.math import Angle, Pose3d, Vector2d
 import math
 from sdformat import Camera
 import sdformat as sdf

diff --git a/python/test/pyCapsule_TEST.py b/python/test/pyCapsule_TEST.py
@@ -14,7 +14,7 @@
 
 import copy
 
-from ignition.math import Vector3d, Capsuled
+from gz.math import Vector3d, Capsuled
 
 import math
 

diff --git a/python/test/pyCollision_TEST.py b/python/test/pyCollision_TEST.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import copy
-from ignition.math import Pose3d
+from gz.math import Pose3d
 from sdformat import (Box, Collision, Contact, Cylinder, Error, Geometry,
                       Plane, Surface, Sphere, SDFErrorsException)
 import sdformat as sdf

diff --git a/python/test/pyCylinder_TEST.py b/python/test/pyCylinder_TEST.py
@@ -14,7 +14,7 @@
 
 import copy
 
-from ignition.math import Vector3d
+from gz.math import Vector3d
 
 import math
 

diff --git a/python/test/pyEllipsoid_TEST.py b/python/test/pyEllipsoid_TEST.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import copy
-from ignition.math import Vector3d, Ellipsoidd
+from gz.math import Vector3d, Ellipsoidd
 import math
 from sdformat import Ellipsoid
 import unittest

diff --git a/python/test/pyFrame_TEST.py b/python/test/pyFrame_TEST.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import copy
-from ignition.math import Pose3d
+from gz.math import Pose3d
 from sdformat import Frame, Error, SDFErrorsException, ErrorCode
 import unittest
 import math

diff --git a/python/test/pyGeometry_TEST.py b/python/test/pyGeometry_TEST.py
@@ -14,7 +14,7 @@
 
 import copy
 from sdformat import Geometry, Box, Capsule, Cylinder, Ellipsoid, Mesh, Plane, Sphere
-from ignition.math import Vector3d, Vector2d
+from gz.math import Vector3d, Vector2d
 import sdformat as sdf
 import unittest