From 00e719d646dfa330d65c9ac42b365f46eafb4d20 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 16 Oct 2023 17:26:46 -0500 Subject: [PATCH 1/5] Bumps in ionic : ci_matching_branch/bump_ionic_gz-launch8 Signed-off-by: Addisu Z. Taddese --- .github/ci/packages.apt | 22 +++++++++++----------- CMakeLists.txt | 24 ++++++++++++------------ tutorials/install.md | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index 4edbd19d..d845975b 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -1,20 +1,20 @@ binutils-dev libgflags-dev -libgz-cmake3-dev -libgz-common5-dev -libgz-fuel-tools9-dev -libgz-sim8-dev -libgz-gui8-dev +libgz-cmake4-dev +libgz-common6-dev +libgz-fuel-tools10-dev +libgz-sim9-dev +libgz-gui9-dev libgz-math7-dev libgz-math7-eigen3-dev -libgz-msgs10-dev -libgz-physics7-dev +libgz-msgs11-dev +libgz-physics8-dev libgz-plugin2-dev -libgz-rendering8-dev -libgz-sensors8-dev +libgz-rendering9-dev +libgz-sensors9-dev libgz-tools2-dev -libgz-transport13-dev -libsdformat14-dev +libgz-transport14-dev +libsdformat15-dev libtinyxml2-dev libwebsockets-dev libxi-dev diff --git a/CMakeLists.txt b/CMakeLists.txt index 990ee473..5d393fc7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,8 +8,8 @@ project(gz-launch8 VERSION 8.0.0) #============================================================================ # Find gz-cmake #============================================================================ -find_package(gz-cmake3 REQUIRED) -set(GZ_CMAKE_VER ${gz-cmake3_VERSION_MAJOR}) +find_package(gz-cmake4 REQUIRED) +set(GZ_CMAKE_VER ${gz-cmake4_VERSION_MAJOR}) #============================================================================ # Configure the project @@ -36,8 +36,8 @@ gz_find_package(TINYXML2 REQUIRED PRIVATE PRETTY tinyxml2) #-------------------------------------- # Find gz-common -gz_find_package(gz-common5 REQUIRED PRIVATE) -set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR}) +gz_find_package(gz-common6 REQUIRED PRIVATE) +set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR}) #-------------------------------------- # Find gz-utils @@ -61,13 +61,13 @@ set(GZ_TOOLS_VER 2) #-------------------------------------- # Find gz-transport -gz_find_package(gz-transport13 REQUIRED) -set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR}) +gz_find_package(gz-transport14 REQUIRED) +set(GZ_TRANSPORT_VER ${gz-transport14_VERSION_MAJOR}) #-------------------------------------- # Find gz-msgs -gz_find_package(gz-msgs10 REQUIRED) -set(GZ_MSGS_VER ${gz-msgs10_VERSION_MAJOR}) +gz_find_package(gz-msgs11 REQUIRED) +set(GZ_MSGS_VER ${gz-msgs11_VERSION_MAJOR}) #-------------------------------------- # Find gz-math @@ -76,8 +76,8 @@ set(GZ_MATH_VER ${gz-math7_VERSION_MAJOR}) #-------------------------------------- # Find gz-gui -gz_find_package(gz-gui8 REQUIRED) -set(GZ_GUI_VER ${gz-gui8_VERSION_MAJOR}) +gz_find_package(gz-gui9 REQUIRED) +set(GZ_GUI_VER ${gz-gui9_VERSION_MAJOR}) gz_find_package (Qt5 COMPONENTS Core @@ -88,8 +88,8 @@ gz_find_package (Qt5 #-------------------------------------- # Find gz-sim -gz_find_package(gz-sim8 REQUIRED PRIVATE COMPONENTS gui) -set(GZ_SIM_VER ${gz-sim8_VERSION_MAJOR}) +gz_find_package(gz-sim9 REQUIRED PRIVATE COMPONENTS gui) +set(GZ_SIM_VER ${gz-sim9_VERSION_MAJOR}) gz_pkg_check_modules(websockets libwebsockets) if (NOT websockets_FOUND) diff --git a/tutorials/install.md b/tutorials/install.md index 9d4cec2a..5aab0f1a 100644 --- a/tutorials/install.md +++ b/tutorials/install.md @@ -71,7 +71,7 @@ necessary prerequisites followed by building from source. sudo sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list' wget http://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add - sudo apt-get update - sudo apt-get -y install libgz-cmake3-dev libgz-sim2-dev + sudo apt-get -y install libgz-cmake4-dev libgz-sim2-dev ``` ### Building from source From c53465ffe5300d96e792079b7568bb4c64918cd2 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 16 Oct 2023 17:51:35 -0500 Subject: [PATCH 2/5] Bumps in ionic : ci_matching_branch/bump_ionic_gz-launch8 Signed-off-by: Addisu Z. Taddese --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d393fc7..593c16a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,8 +41,8 @@ set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR}) #-------------------------------------- # Find gz-utils -gz_find_package(gz-utils2 REQUIRED COMPONENTS cli) -set(GZ_UTILS_VER ${gz-utils2_VERSION_MAJOR}) +gz_find_package(gz-utils3 REQUIRED COMPONENTS cli) +set(GZ_UTILS_VER ${gz-utils3_VERSION_MAJOR}) #-------------------------------------- # Find gz-plugin From 8f0cca8229628f43c10e569f828351fa02c7404e Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 16 Oct 2023 18:01:15 -0500 Subject: [PATCH 3/5] Bumps in ionic : ci_matching_branch/bump_ionic_gz-launch8 Signed-off-by: Addisu Z. Taddese --- .github/ci/packages.apt | 4 ++-- CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index d845975b..64bcffdf 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -5,8 +5,8 @@ libgz-common6-dev libgz-fuel-tools10-dev libgz-sim9-dev libgz-gui9-dev -libgz-math7-dev -libgz-math7-eigen3-dev +libgz-math8-dev +libgz-math8-eigen3-dev libgz-msgs11-dev libgz-physics8-dev libgz-plugin2-dev diff --git a/CMakeLists.txt b/CMakeLists.txt index 593c16a0..c2adaeee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,8 +71,8 @@ set(GZ_MSGS_VER ${gz-msgs11_VERSION_MAJOR}) #-------------------------------------- # Find gz-math -gz_find_package(gz-math7 REQUIRED) -set(GZ_MATH_VER ${gz-math7_VERSION_MAJOR}) +gz_find_package(gz-math8 REQUIRED) +set(GZ_MATH_VER ${gz-math8_VERSION_MAJOR}) #-------------------------------------- # Find gz-gui From e7a7582c1af600f23f25b9689faced1e6ca9af8d Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 16 Oct 2023 18:09:52 -0500 Subject: [PATCH 4/5] Bumps in ionic : ci_matching_branch/bump_ionic_gz-launch8 Signed-off-by: Addisu Z. Taddese --- .github/ci/packages.apt | 2 +- CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index 64bcffdf..2477dfd1 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -9,7 +9,7 @@ libgz-math8-dev libgz-math8-eigen3-dev libgz-msgs11-dev libgz-physics8-dev -libgz-plugin2-dev +libgz-plugin3-dev libgz-rendering9-dev libgz-sensors9-dev libgz-tools2-dev diff --git a/CMakeLists.txt b/CMakeLists.txt index c2adaeee..b832ff74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,8 +46,8 @@ set(GZ_UTILS_VER ${gz-utils3_VERSION_MAJOR}) #-------------------------------------- # Find gz-plugin -gz_find_package(gz-plugin2 REQUIRED_BY launch COMPONENTS loader register) -set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR}) +gz_find_package(gz-plugin3 REQUIRED_BY launch COMPONENTS loader register) +set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR}) #-------------------------------------- # Find if gz command is available From 2f0df628d05ba8fed9b4364b599468e8cf879f9a Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 23 Oct 2023 23:14:06 -0500 Subject: [PATCH 5/5] Fix tutorial Co-authored-by: Ian Chen Signed-off-by: Addisu Z. Taddese --- tutorials/install.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorials/install.md b/tutorials/install.md index 5aab0f1a..fd75cc66 100644 --- a/tutorials/install.md +++ b/tutorials/install.md @@ -71,7 +71,7 @@ necessary prerequisites followed by building from source. sudo sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list' wget http://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add - sudo apt-get update - sudo apt-get -y install libgz-cmake4-dev libgz-sim2-dev + sudo apt-get -y install libgz-cmake4-dev libgz-sim9-dev ``` ### Building from source