diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index 835053d41..09f6e9c5b 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -1,6 +1,6 @@ libeigen3-dev -libignition-cmake3-dev -libignition-utils2-dev +libgz-cmake3-dev +libgz-utils2-dev libpython3-dev python3-distutils python3-pybind11 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/BUILD.bazel b/BUILD.bazel index 7ce600965..016f40329 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -1,7 +1,7 @@ load( "//gz_bazel:build_defs.bzl", - "IGNITION_FEATURES", - "IGNITION_VISIBILITY", + "GZ_FEATURES", + "GZ_VISIBILITY", "cmake_configure_file", "generate_include_header", "gz_config_header", @@ -9,8 +9,8 @@ load( ) package( - default_visibility = IGNITION_VISIBILITY, - features = IGNITION_FEATURES, + default_visibility = GZ_VISIBILITY, + features = GZ_FEATURES, ) licenses(["notice"]) @@ -28,23 +28,23 @@ PROJECT_PATCH = 0 # Generates config.hh based on the version numbers in CMake code. gz_config_header( name = "config", - src = "include/ignition/math/config.hh.in", + src = "include/gz/math/config.hh.in", cmakelists = ["CMakeLists.txt"], project_name = PROJECT_NAME, project_version = (PROJECT_MAJOR, PROJECT_MINOR, PROJECT_PATCH), ) gz_export_header( - name = "include/ignition/math/Export.hh", - export_base = "IGNITION_MATH", - lib_name = "ignition-math", + 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,17 +56,17 @@ 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( @@ -78,9 +78,9 @@ cc_library( # 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 = [ ":gz_math", diff --git a/CMakeLists.txt b/CMakeLists.txt index b1c4f7cb5..59899f90f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) gz_configure_project( - REPLACE_IGNITION_INCLUDE_PATH gz/math + REPLACE_INCLUDE_PATH gz/math VERSION_SUFFIX pre1) #============================================================================ @@ -58,7 +58,7 @@ gz_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}.") @@ -70,7 +70,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 interfaces.") + 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}.") @@ -79,10 +79,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}.") @@ -94,7 +94,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() diff --git a/Changelog.md b/Changelog.md index 7115a26a6..99516f400 100644 --- a/Changelog.md +++ b/Changelog.md @@ -417,7 +417,7 @@ instead. 1. Added functions to convert between time_point and secNsec * [Pull request 150](https://github.com/gazebosim/gz-math/pull/150) -1. Fix IGNITION_MATH_XXX_VERSION +1. Fix GZ_MATH_XXX_VERSION * [Pull request 151](https://github.com/gazebosim/gz-math/pull/151) 1. Add Max and Min function to Vector2.hh diff --git a/Migration.md b/Migration.md index 5c81932ab..aaaab1dd6 100644 --- a/Migration.md +++ b/Migration.md @@ -12,6 +12,7 @@ release will remove the deprecated code. 1. Removed the Quaternion integer template `Quaternioni`. 1. The project name has been changed to use the `gz-` prefix, you **must** use the `gz` prefix! + * This also means that any generated code that use the project name (e.g. CMake variables, in-source macros) would have to be migrated. * Some non-exhaustive examples of this include: * `GZ__