Merge branch 'main' into drop_mwf_pimpl

Signed-off-by: Michael Carroll <[email protected]>

.github/CODEOWNERS

@@ -1,4 +1,4 @@
 # More info:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
 
-*                     @scpeters
+*                     @scpeters @adityapande-1995

.github/ci/packages.apt

@@ -1,7 +1,9 @@
 libeigen3-dev
-libignition-cmake2-dev
-libignition-utils1-dev
+libgz-cmake3-dev
+libgz-utils2-dev
+libpython3-dev
 python3-distutils
 python3-pybind11
+python3-pytest
 ruby-dev
 swig

.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

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

.gitignore

@@ -5,3 +5,6 @@ build_*
 # OS generated files
 .DS_Store
 *.swp
+
+# Python generaated files
+*.pyc

BUILD.bazel

@@ -1,23 +1,23 @@
 load(
-    "//ign_bazel:build_defs.bzl",
-    "IGNITION_FEATURES",
-    "IGNITION_VISIBILITY",
+    "//gz_bazel:build_defs.bzl",
+    "GZ_FEATURES",
+    "GZ_VISIBILITY",
     "cmake_configure_file",
     "generate_include_header",
-    "ign_config_header",
-    "ign_export_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-math"
+PROJECT_NAME = "gz-math"
 
 PROJECT_MAJOR = 7
 
@@ -26,25 +26,25 @@ PROJECT_MINOR = 0
 PROJECT_PATCH = 0
 
 # Generates config.hh based on the version numbers in CMake code.
-ign_config_header(
+gz_config_header(
     name = "config",
-    src = "include/ignition/math/config.hh.in",
+    src = "include/gz/math/config.hh.in",
     cmakelists = ["CMakeLists.txt"],
-    project_name = "ignition-math",
+    project_name = PROJECT_NAME,
     project_version = (PROJECT_MAJOR, PROJECT_MINOR, PROJECT_PATCH),
 )
 
-ign_export_header(
-    name = "include/ignition/math/Export.hh",
-    export_base = "IGNITION_MATH",
-    lib_name = "ignition-math",
+gz_export_header(
+    name = "include/gz/math/Export.hh",
+    export_base = "GZ_MATH",
+    lib_name = "gz-math",
     visibility = ["//visibility:private"],
 )
 
 public_headers_no_gen = glob([
-    "include/ignition/math/*.hh",
-    "include/ignition/math/detail/*.hh",
-    "include/ignition/math/graph/*.hh",
+    "include/gz/math/*.hh",
+    "include/gz/math/detail/*.hh",
+    "include/gz/math/graph/*.hh",
 ])
 
 private_headers = glob(["src/*.hh"])
@@ -56,42 +56,42 @@ sources = glob(
 
 generate_include_header(
     name = "mathhh_genrule",
-    out = "include/ignition/math.hh",
+    out = "include/gz/math.hh",
     hdrs = public_headers_no_gen + [
-        "include/ignition/math/config.hh",
-        "include/ignition/math/Export.hh",
+        "include/gz/math/config.hh",
+        "include/gz/math/Export.hh",
     ],
 )
 
 public_headers = public_headers_no_gen + [
-    "include/ignition/math/config.hh",
-    "include/ignition/math/Export.hh",
-    "include/ignition/math.hh",
+    "include/gz/math/config.hh",
+    "include/gz/math/Export.hh",
+    "include/gz/math.hh",
 ]
 
 cc_library(
-    name = "ign_math",
+    name = "gz_math",
     srcs = sources + private_headers,
     hdrs = public_headers,
     includes = ["include"],
 )
 
 # use shared library only when absolutely needd
 cc_binary(
-    name = "libignition-math7.so",
+    name = "libgz-math7.so",
     includes = ["include"],
-    linkopts = ["-Wl,-soname,libignition-math7.so"],
+    linkopts = ["-Wl,-soname,libgz-math7.so"],
     linkshared = True,
     deps = [
-        ":ign_math",
+        ":gz_math",
     ],
 )
 
 [cc_test(
     name = src.replace("/", "_").replace(".cc", "").replace("src_", ""),
     srcs = [src],
     deps = [
-        ":ign_math",
+        ":gz_math",
         "@gtest",
         "@gtest//:gtest_main",
     ],

CMakeLists.txt

@@ -3,20 +3,21 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 #============================================================================
 # Initialize the project
 #============================================================================
-project(ignition-math7 VERSION 7.0.0)
+project(gz-math7 VERSION 7.0.0)
 
 #============================================================================
-# Find ignition-cmake
+# Find gz-cmake
 #============================================================================
-# If you get an error at this line, you need to install ignition-cmake
-find_package(ignition-cmake2 2.8.0 REQUIRED)
+# If you get an error at this line, you need to install gz-cmake
+find_package(gz-cmake3 REQUIRED)
 
 #============================================================================
 # Configure the project
 #============================================================================
-set (c++standard 17)
-set (CMAKE_CXX_STANDARD 17)
-ign_configure_project(VERSION_SUFFIX pre1)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+gz_configure_project(VERSION_SUFFIX pre1)
 
 #============================================================================
 # Set project-specific options
@@ -39,13 +40,13 @@ option(USE_DIST_PACKAGES_FOR_PYTHON
 #============================================================================
 
 #--------------------------------------
-# Find ignition-utils
-ign_find_package(ignition-utils1 REQUIRED VERSION 1.0)
-set(IGN_UTILS_VER ${ignition-utils1_VERSION_MAJOR})
+# Find gz-utils
+gz_find_package(gz-utils2 REQUIRED)
+set(GZ_UTILS_VER ${gz-utils2_VERSION_MAJOR})
 
 #--------------------------------------
 # Find eigen3
-ign_find_package(
+gz_find_package(
   EIGEN3
   REQUIRED_BY eigen3
   PRETTY eigen3
@@ -55,7 +56,7 @@ ign_find_package(
 # Include swig
 find_package(SWIG QUIET)
 if (NOT SWIG_FOUND)
-  IGN_BUILD_WARNING("Swig is missing: Language interfaces are disabled.")
+  GZ_BUILD_WARNING("Swig is missing: Language interfaces are disabled.")
   message (STATUS "Searching for swig - not found.")
 else()
   message (STATUS "Searching for swig - found version ${SWIG_VERSION}.")
@@ -67,7 +68,7 @@ if (SWIG_FOUND)
   # Include ruby
   find_package(Ruby 1.9 QUIET)
   if (NOT RUBY_FOUND)
-    IGN_BUILD_WARNING("Ruby is missing: Install ruby-dev to enable ruby interface to ignition math.")
+    GZ_BUILD_WARNING("Ruby is missing: Install ruby-dev to enable ruby interfaces.")
     message (STATUS "Searching for Ruby - not found.")
   else()
     message (STATUS "Searching for Ruby - found version ${RUBY_VERSION}.")
@@ -76,10 +77,10 @@ endif()
 
 ########################################
 # Python bindings
-include(IgnPython)
+include(GzPython)
 find_package(PythonLibs QUIET)
 if (NOT PYTHONLIBS_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 ${PYTHONLIBS_VERSION_STRING}.")
@@ -91,7 +92,7 @@ else()
   if (${pybind11_FOUND})
     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()
@@ -103,21 +104,21 @@ set(FAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/fake/install")
 #============================================================================
 # Configure the build
 #============================================================================
-ign_configure_build(QUIT_IF_BUILD_ERRORS
+gz_configure_build(QUIT_IF_BUILD_ERRORS
   COMPONENTS eigen3)
 
 
 #============================================================================
 # Create package information
 #============================================================================
-ign_create_packages()
+gz_create_packages()
 
 #============================================================================
 # Configure documentation
 #============================================================================
 configure_file(${CMAKE_SOURCE_DIR}/api.md.in ${CMAKE_BINARY_DIR}/api.md)
 configure_file(${CMAKE_SOURCE_DIR}/tutorials.md.in ${CMAKE_BINARY_DIR}/tutorials.md)
 
-ign_create_docs(
+gz_create_docs(
   API_MAINPAGE_MD "${CMAKE_BINARY_DIR}/api.md"
   TUTORIALS_MAINPAGE_MD "${CMAKE_BINARY_DIR}/tutorials.md")

CONTRIBUTING.md

@@ -1 +1 @@
-See the [Ignition Robotics contributing guide](https://ignitionrobotics.org/docs/all/contributing).
+See the [Gazebo contributing guide](https://gazebosim.org/docs/all/contributing).