From ec44f18b2e0a90e6ec8b2006314f673a58782a25 Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Tue, 27 Aug 2024 09:50:35 -0700 Subject: [PATCH 01/10] Update badges to point to gz-fuel-tools10 (#439) Signed-off-by: Ian Chen --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index d8c30fa7..5f5b2e04 100644 --- a/README.md +++ b/README.md @@ -9,10 +9,10 @@ Build | Status -- | -- -Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-fuel-tools/tree/main/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-fuel-tools/tree/main) -Ubuntu Noble | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_fuel_tools-ci-main-noble-amd64)](https://build.osrfoundation.org/job/gz_fuel_tools-ci-main-noble-amd64) -Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_fuel_tools-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/gz_fuel_tools-ci-main-homebrew-amd64) -Windows | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_fuel_tools-main-win)](https://build.osrfoundation.org/job/gz_fuel_tools-main-win/) +Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-fuel-tools/tree/gz-fuel-tools10/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-fuel-tools/tree/gz-fuel-tools10) +Ubuntu Noble | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_fuel_tools-ci-fuel-tools10-noble-amd64)](https://build.osrfoundation.org/job/gz_fuel_tools-ci-gz-fuel-tools10-noble-amd64) +Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_fuel_tools-ci-gz-fuel-tools10-homebrew-amd64)](https://build.osrfoundation.org/job/gz_fuel_tools-ci-gz-fuel-tools10-homebrew-amd64) +Windows | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_fuel_tools-10-win)](https://build.osrfoundation.org/job/gz_fuel_tools-10-win/) Gazebo Fuel Tools is composed by a client library and command line tools for interacting with Gazebo Fuel servers. @@ -21,7 +21,7 @@ interacting with Gazebo Fuel servers. # Building and installing -See the [installation tutorial](https://gazebosim.org/api/fuel_tools/9/install.html). +See the [installation tutorial](https://gazebosim.org/api/fuel_tools/10/install.html). Make sure `GZ_CONFIG_PATH` is set to the right install location so that `gz fuel` will work. Default is `/usr/local/share/gz`. From 6d126de37ff13f6f238e03cae7d088e54289ec72 Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Tue, 27 Aug 2024 18:06:05 -0700 Subject: [PATCH 02/10] Prepare for 10.0.0pre release (#440) Signed-off-by: Ian Chen --- CMakeLists.txt | 2 +- Changelog.md | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 30d4e552..5367452e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ set(GZ_CMAKE_VER ${gz-cmake4_VERSION_MAJOR}) #============================================================================ # Configure the project #============================================================================ -gz_configure_project(VERSION_SUFFIX) +gz_configure_project(VERSION_SUFFIX pre1) #============================================================================ # Set project-specific options diff --git a/Changelog.md b/Changelog.md index e08532f2..926bb36e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,7 +2,13 @@ ### Gazebo Fuel Tools 10.0.0 (2024-09-XX) -Changes since 9.1.0 +1. **Baseline:** this includes all changes from 9.1.0 and earlier. + +1. Update badges to point to gz-fuel-tools10 + * [Pull request #439](https://github.com/gazebosim/gz-fuel-tools/pull/439) + +1. Ionic changelog + * [Pull request #438](https://github.com/gazebosim/gz-fuel-tools/pull/438) 1. Require cmake 3.22.1 * [Pull request #436](https://github.com/gazebosim/gz-fuel-tools/pull/436) From 4abd3ba755354028ae330a4aed660bd874449783 Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Wed, 28 Aug 2024 18:40:01 -0700 Subject: [PATCH 03/10] Prepare for gz-fuel-tools10.0.0~pre2 release (#441) Signed-off-by: Ian Chen --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5367452e..2c4b321c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ set(GZ_CMAKE_VER ${gz-cmake4_VERSION_MAJOR}) #============================================================================ # Configure the project #============================================================================ -gz_configure_project(VERSION_SUFFIX pre1) +gz_configure_project(VERSION_SUFFIX pre2) #============================================================================ # Set project-specific options From 04f0a0427085db5464f2a08ac4f9653c6d581be7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Ag=C3=BCero?= Date: Tue, 3 Sep 2024 16:06:34 +0200 Subject: [PATCH 04/10] Tutorial tweaks for the command line tutorial. (#442) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Carlos Agüero --- tutorials/03_command_line.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tutorials/03_command_line.md b/tutorials/03_command_line.md index cad58e74..7239a306 100644 --- a/tutorials/03_command_line.md +++ b/tutorials/03_command_line.md @@ -31,8 +31,7 @@ https://fuel.gazebosim.org By default, Fuel will list resources from all the servers listed in your `config.yaml` file. See the \ref configuration for more details. -> **Tip**: If you want to see resources from a different Fuel server, add it to -`config.yaml` to and re-run the list command to see resources from both servers! +> **Tip**: If you want to see resources from a different Fuel server, add it to `config.yaml` to and re-run the list command to see resources from both servers! There are a few other options on the command, run the help to see all of them: @@ -123,7 +122,10 @@ sub-command. You can access the list of edit options using: gz fuel edit -h ``` -You must be the resource owner, or an authorized member of the organization that owns the resource, in order to edit the resource. This in turn means you must use the `--header 'Private-token: YOUR_TOKEN'` option with the `edit` sub-command. +You must be the resource owner, or an authorized member of the organization that owns the resource, in order to edit the resource. This in turn means you must use the next option with the `edit` subcommand: +``` +--header 'Private-token: YOUR_TOKEN' +``` ### Change resource privacy From d8e5faeff36e3100f96e6ec3b031e4efc1529896 Mon Sep 17 00:00:00 2001 From: Antoine Van Malleghem Date: Tue, 3 Sep 2024 21:15:00 +0200 Subject: [PATCH 05/10] fix readme (#443) Signed-off-by: Van Malleghem Antoine --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5f5b2e04..62f8caa4 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ Default is `/usr/local/share/gz`. For a complete list of commands run `gz fuel -h` on the command line. **List all models** + ```{.sh} $ gz fuel list -t model -r | head https://fuel.gazebosim.org/anonymous/test_model_595389531 @@ -46,6 +47,7 @@ https://fuel.gazebosim.org/anonymous/test_model_380348669 ``` **Download a model** + ```{.sh} $ gz fuel download -u https://fuel.gazebosim.org/1.0/OpenRobotics/models/Ambulance -v 4 Downloading model: @@ -98,13 +100,14 @@ in. Create a private token at [https://app.gazebosim.org/settings#access_tokens](https://app.gazebosim.org/settings#access_tokens). Store the generated token someplace safe. -The private token can then used to upload a model: +The private token can then be used to upload a model: ```{.sh} gz fuel upload -m ~/path_to_model --header 'Private-token: ' ``` ## Dependencies On ubuntu run + ```{.sh} sudo apt install ruby-ffi libzip-dev libcurl-dev libjsoncpp-dev ``` From 580755da587715d884b22dda76e13a6b38647588 Mon Sep 17 00:00:00 2001 From: Antoine Van Malleghem Date: Wed, 4 Sep 2024 09:10:15 +0200 Subject: [PATCH 06/10] fix cpp api tutorial (#444) Signed-off-by: Van Malleghem Antoine --- tutorials/04_cpp_api.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tutorials/04_cpp_api.md b/tutorials/04_cpp_api.md index 1555c228..5a420ca1 100644 --- a/tutorials/04_cpp_api.md +++ b/tutorials/04_cpp_api.md @@ -13,6 +13,12 @@ this tutorial: mkdir /tmp/fuel_tutorial && cd /tmp/fuel_tutorial ``` +Install compilation prerequisites: + +```bash +sudo apt-get install libgflags-dev +``` + Download the files `list.cc`, `details.cc`, `download.cc`, `CMakeLists.txt`, and save them under `/tmp/fuel_tutorial`: @@ -172,7 +178,7 @@ for (const auto &server : client.Config().Servers()) id.SetServer(server); gz::fuel_tools::ModelIdentifier model; - if (!client.ModelDetails(server, id, model)) + if (!client.ModelDetails(id, model)) continue; std::cout << model.AsPrettyString() << std::endl; From 45b610009ffb1283018045b7707a36319827c885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Hern=C3=A1ndez=20Cordero?= Date: Wed, 4 Sep 2024 10:16:09 +0200 Subject: [PATCH 07/10] Fixed readme syntax (#445) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alejandro Hernández Cordero --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 62f8caa4..8415595c 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ For a complete list of commands run `gz fuel -h` on the command line. **List all models** -```{.sh} +```bash $ gz fuel list -t model -r | head https://fuel.gazebosim.org/anonymous/test_model_595389531 https://fuel.gazebosim.org/anonymous/test_model_122023392 @@ -48,7 +48,7 @@ https://fuel.gazebosim.org/anonymous/test_model_380348669 **Download a model** -```{.sh} +```bash $ gz fuel download -u https://fuel.gazebosim.org/1.0/OpenRobotics/models/Ambulance -v 4 Downloading model: Name: Ambulance @@ -101,14 +101,14 @@ Create a private token at [https://app.gazebosim.org/settings#access_tokens](https://app.gazebosim.org/settings#access_tokens). Store the generated token someplace safe. The private token can then be used to upload a model: -```{.sh} +```bash gz fuel upload -m ~/path_to_model --header 'Private-token: ' ``` ## Dependencies On ubuntu run -```{.sh} +```bash sudo apt install ruby-ffi libzip-dev libcurl-dev libjsoncpp-dev ``` From 93803c78dc55a978e39dfbb2a89d47585ff3c999 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Thu, 26 Sep 2024 14:09:24 -0500 Subject: [PATCH 08/10] Prepare for 10.0.0 (#447) Signed-off-by: Addisu Z. Taddese --- CMakeLists.txt | 2 +- Changelog.md | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c4b321c..30d4e552 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ set(GZ_CMAKE_VER ${gz-cmake4_VERSION_MAJOR}) #============================================================================ # Configure the project #============================================================================ -gz_configure_project(VERSION_SUFFIX pre2) +gz_configure_project(VERSION_SUFFIX) #============================================================================ # Set project-specific options diff --git a/Changelog.md b/Changelog.md index 926bb36e..9f73d6b8 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,9 +1,15 @@ ## Gazebo Fuel Tools 10.x -### Gazebo Fuel Tools 10.0.0 (2024-09-XX) +### Gazebo Fuel Tools 10.0.0 (2024-09-25) 1. **Baseline:** this includes all changes from 9.1.0 and earlier. +1. Miscellaneous documentation fixes + * [Pull request #445](https://github.com/gazebosim/gz-fuel-tools/pull/445) + * [Pull request #444](https://github.com/gazebosim/gz-fuel-tools/pull/444) + * [Pull request #443](https://github.com/gazebosim/gz-fuel-tools/pull/443) + * [Pull request #442](https://github.com/gazebosim/gz-fuel-tools/pull/442) + 1. Update badges to point to gz-fuel-tools10 * [Pull request #439](https://github.com/gazebosim/gz-fuel-tools/pull/439) From e5bfbe9fd478c671aa8fd531b05a719c3f0a9477 Mon Sep 17 00:00:00 2001 From: Martin Pecka Date: Sat, 5 Oct 2024 02:10:09 +0200 Subject: [PATCH 09/10] Fixed cmd on Windows (#446) Signed-off-by: Martin Pecka --- src/cmd/CMakeLists.txt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt index 833f2856..d6a1ea74 100644 --- a/src/cmd/CMakeLists.txt +++ b/src/cmd/CMakeLists.txt @@ -31,7 +31,15 @@ set(cmd_script_configured "${CMAKE_CURRENT_BINARY_DIR}/${CMD_NAME}${PROJECT_VERS # Set the library_location variable to the relative path to the library file # within the install directory structure. -set(library_location "../../../${CMAKE_INSTALL_LIBDIR}/$") +if (MSVC) + set(library_location_prefix "${CMAKE_INSTALL_BINDIR}") +else() + set(library_location_prefix "${CMAKE_INSTALL_LIBDIR}") +endif() + +# Set the library_location variable to the relative path to the library file +# within the install directory structure. +set(library_location "../../../${library_location_prefix}/$") configure_file( "${CMD_NAME}.rb.in" From 698f4144ca28bb3facfe9acba96a0ef4a5d6207c Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Sat, 5 Oct 2024 00:13:27 +0000 Subject: [PATCH 10/10] merge and update readme Signed-off-by: Ian Chen --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8415595c..72ddc262 100644 --- a/README.md +++ b/README.md @@ -9,10 +9,10 @@ Build | Status -- | -- -Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-fuel-tools/tree/gz-fuel-tools10/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-fuel-tools/tree/gz-fuel-tools10) -Ubuntu Noble | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_fuel_tools-ci-fuel-tools10-noble-amd64)](https://build.osrfoundation.org/job/gz_fuel_tools-ci-gz-fuel-tools10-noble-amd64) -Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_fuel_tools-ci-gz-fuel-tools10-homebrew-amd64)](https://build.osrfoundation.org/job/gz_fuel_tools-ci-gz-fuel-tools10-homebrew-amd64) -Windows | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_fuel_tools-10-win)](https://build.osrfoundation.org/job/gz_fuel_tools-10-win/) +Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-fuel-tools/tree/main/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-fuel-tools/tree/main) +Ubuntu Noble | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_fuel_tools-ci-main-noble-amd64)](https://build.osrfoundation.org/job/gz_fuel_tools-ci-main-noble-amd64) +Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_fuel_tools-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/gz_fuel_tools-ci-main-homebrew-amd64) +Windows | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_fuel_tools-main-win)](https://build.osrfoundation.org/job/gz_fuel_tools-main-win/) Gazebo Fuel Tools is composed by a client library and command line tools for interacting with Gazebo Fuel servers.