diff --git a/.github/ci/after_make.sh b/.github/ci/after_make.sh index b9ba4a0f..0c1fe954 100644 --- a/.github/ci/after_make.sh +++ b/.github/ci/after_make.sh @@ -6,7 +6,7 @@ set -x make install # So gz-tools finds fuel-tools -export GZ_CONFIG_PATH=/usr/local/share/ignition +export GZ_CONFIG_PATH=/usr/local/share/gz export LD_LIBRARY_PATH=/usr/local/lib/:$LD_LIBRARY_PATH # Compile example diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index c41a9d2c..bfe38000 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -1,12 +1,12 @@ curl libcurl4-openssl-dev libgflags-dev -libignition-cmake3-dev -libignition-common5-dev -libignition-math7-dev -libignition-msgs9-dev -libignition-tools2-dev -libignition-utils2-dev +libgz-cmake3-dev +libgz-common5-dev +libgz-math7-dev +libgz-msgs9-dev +libgz-tools2-dev +libgz-utils2-dev libjsoncpp-dev libtinyxml2-dev libyaml-dev diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ba1eed61..bd14ed68 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 @@ -24,4 +24,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 7d7b4e17..38c4fc13 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/CMakeLists.txt b/CMakeLists.txt index 569941ae..0278299b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,9 +15,7 @@ set(GZ_CMAKE_VER ${gz-cmake3_VERSION_MAJOR}) #============================================================================ # Configure the project #============================================================================ -gz_configure_project( - REPLACE_IGNITION_INCLUDE_PATH gz/fuel_tools - VERSION_SUFFIX pre1) +gz_configure_project(VERSION_SUFFIX pre1) #============================================================================ # Set project-specific options @@ -35,7 +33,7 @@ gz_find_package(TINYXML2 REQUIRED PRIVATE PRETTY tinyxml2) #-------------------------------------- # Find libcurl -gz_find_package(IgnCURL REQUIRED PRIVATE PRETTY curl) +gz_find_package(GzCURL REQUIRED PRIVATE PRETTY curl) #-------------------------------------- # Find jsoncpp diff --git a/Changelog.md b/Changelog.md index 2c62e31b..d22ff828 100644 --- a/Changelog.md +++ b/Changelog.md @@ -105,7 +105,7 @@ 1. Use semantic version and prevent crash if version is missing * [Pull request #151](https://github.com/gazebosim/gz-fuel-tools/pull/151) -1. Document `IGN_FUEL_CACHE_PATH` on command line +1. Document `GZ_FUEL_CACHE_PATH` on command line * [Pull request #149](https://github.com/gazebosim/gz-fuel-tools/pull/149) 1. Infrastructure @@ -183,7 +183,7 @@ 1. Use semantic version and prevent crash if version is missing * [Pull request #151](https://github.com/gazebosim/gz-fuel-tools/pull/151) -1. Document `IGN_FUEL_CACHE_PATH` on command line +1. Document `GZ_FUEL_CACHE_PATH` on command line * [Pull request #149](https://github.com/gazebosim/gz-fuel-tools/pull/149) 1. Support editing/patching model files diff --git a/INSTALL_WINDOWS.md b/INSTALL_WINDOWS.md index 9456e625..33a51175 100644 --- a/INSTALL_WINDOWS.md +++ b/INSTALL_WINDOWS.md @@ -38,7 +38,7 @@ need to [disable the Windows firewall](http://windows.microsoft.com/en-us/window nmake install - You should now have an installation of Gazebo Fuel-Tools in gz-ws/ign-fuel-tools/build/install. + You should now have an installation of Gazebo Fuel-Tools in gz-ws/gz-fuel-tools/build/install. ## Run tests diff --git a/api.md.in b/api.md.in index 218f6857..bb345ae1 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/conf/CMakeLists.txt b/conf/CMakeLists.txt index 72c37ab3..a37a5804 100644 --- a/conf/CMakeLists.txt +++ b/conf/CMakeLists.txt @@ -17,8 +17,8 @@ configure_file( "${CMAKE_CURRENT_BINARY_DIR}/fuel${PROJECT_VERSION_MAJOR}.yaml" @ONLY) # Install the yaml configuration files in an unversioned location. -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fuel${PROJECT_VERSION_MAJOR}.yaml DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/ignition/) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fuel${PROJECT_VERSION_MAJOR}.yaml DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/gz/) # Install config.yaml install (FILES config.yaml DESTINATION - ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/ignition/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}/) + ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/gz/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}/) diff --git a/configure.bat b/configure.bat deleted file mode 100644 index edc20be9..00000000 --- a/configure.bat +++ /dev/null @@ -1,31 +0,0 @@ - -:: NOTE: This script is only meant to be used as part of the ignition developers' CI system -:: Users and developers should build and install this library using cmake and Visual Studio - - -:: Install dependencies -call %win_lib% :download_unzip_install curl-7.57.0-vc15-x64-dll-MD.zip -call %win_lib% :download_unzip_install jsoncpp-1.8.4-vc15-x64-dll-MD.zip -call %win_lib% :download_unzip_install libyaml-0.1.7-vc15-x64-md.zip -call %win_lib% :download_unzip_install libzip-1.4.0_zlip-1.2.11_vc15-x64-dll-MD.zip -call %win_lib% :install_ign_project gz-cmake gz-cmake3 -call %win_lib% :install_ign_project gz-tools gz-tools2 -call %win_lib% :install_ign_project gz-common main -call %win_lib% :install_ign_project gz-msgs main - -:: Set configuration variables -@set build_type=Release -@if not "%1"=="" set build_type=%1 -@echo Configuring for build type %build_type% - -:: Go to the directory that this configure.bat file exists in -cd /d %~dp0 - -:: Create a build directory and configure -md build -cd build -cmake .. -G "NMake Makefiles" -DCMAKE_INSTALL_PREFIX="%WORKSPACE_INSTALL_DIR%" -DCMAKE_BUILD_TYPE="%build_type%" -DBUILD_TESTING:BOOL=False -:: Note: We disable testing by default. If the intention is for the CI to build and test -:: this project, then the CI script will turn it back on. - -:: If the caller wants to build and/or install, they should do so after calling this script diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 10b865da..6c9646ac 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,15 +1,15 @@ find_package(Doxygen) if (DOXYGEN_FOUND) - configure_file(${CMAKE_SOURCE_DIR}/doc/ignition.in - ${CMAKE_BINARY_DIR}/ignition.dox @ONLY) + configure_file(${CMAKE_SOURCE_DIR}/doc/gz.in + ${CMAKE_BINARY_DIR}/gz.dox @ONLY) configure_file(${CMAKE_SOURCE_DIR}/doc/tutorials.in ${CMAKE_BINARY_DIR}/tutorials.dox @ONLY) add_custom_target(doc ALL # Generate the API documentation - ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/ignition.dox + ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/gz.dox WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/tutorials.dox @@ -17,5 +17,5 @@ if (DOXYGEN_FOUND) COMMENT "Generating API documentation with Doxygen" VERBATIM) install(FILES ${CMAKE_BINARY_DIR}/doc/${PROJECT_NAME_LOWER}.tag.xml - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/ignition/${PROJECT_NAME_LOWER}_${PROJECT_VERSION_MINOR}) + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/gz/${PROJECT_NAME_LOWER}_${PROJECT_VERSION_MINOR}) endif() diff --git a/doc/gz.in b/doc/gz.in index da995971..d02b0535 100644 --- a/doc/gz.in +++ b/doc/gz.in @@ -693,7 +693,7 @@ FILE_VERSION_FILTER = # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE # tag is left empty. -LAYOUT_FILE = "@IGNITION_CMAKE_DOXYGEN_DIR@/layout.xml" +LAYOUT_FILE = "@GZ_CMAKE_DOXYGEN_DIR@/layout.xml" # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib @@ -2079,7 +2079,7 @@ SKIP_FUNCTION_MACROS = NO # the path). If a tag file is not located in the directory in which doxygen is # run, you must also specify the path to the tagfile here. -TAGFILES = "@IGNITION_CMAKE_DOXYGEN_DIR@/cppreference.tag.xml = http://en.cppreference.com/w" \ +TAGFILES = "@GZ_CMAKE_DOXYGEN_DIR@/cppreference.tag.xml = http://en.cppreference.com/w" \ "GZ-MSGS_DOXYGEN_TAGFILE@ = @GZ-MSGS_API_URL@" # When a file name is specified after GENERATE_TAGFILE, doxygen will create a @@ -2432,4 +2432,4 @@ GENERATE_LEGEND = YES # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_CLEANUP = YES \ No newline at end of file +DOT_CLEANUP = YES diff --git a/doc/header.html b/doc/header.html index 556b0456..43d87300 100644 --- a/doc/header.html +++ b/doc/header.html @@ -29,7 +29,7 @@