From 83c47f5113d9d95a41b1ae56a070c2cb7aa3be14 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Thu, 7 Oct 2021 15:03:14 -0700 Subject: [PATCH 1/2] Bump main to 6.0.0~pre1 Signed-off-by: Louise Poubel --- CMakeLists.txt | 2 +- Changelog.md | 4 ++++ examples/plugin/command_actor/CMakeLists.txt | 4 ++-- examples/plugin/custom_component/CMakeLists.txt | 4 ++-- examples/plugin/custom_sensor_system/CMakeLists.txt | 4 ++-- examples/plugin/gui_system_plugin/CMakeLists.txt | 4 ++-- examples/plugin/hello_world/CMakeLists.txt | 4 ++-- examples/plugin/rendering_plugins/CMakeLists.txt | 4 ++-- examples/plugin/system_plugin/CMakeLists.txt | 4 ++-- examples/standalone/custom_server/CMakeLists.txt | 4 ++-- examples/standalone/each_performance/CMakeLists.txt | 4 ++-- examples/standalone/external_ecm/CMakeLists.txt | 4 ++-- examples/standalone/light_control/CMakeLists.txt | 4 ++-- examples/standalone/multi_lrauv_race/CMakeLists.txt | 4 ++-- tutorials/migrating_ardupilot_plugin.md | 2 +- tutorials/rendering_plugins.md | 6 +++--- tutorials/test_fixture.md | 2 +- 17 files changed, 34 insertions(+), 30 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index de0be0f71b..094546bd9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) #============================================================================ # Initialize the project #============================================================================ -project(ignition-gazebo6 VERSION 6.0.0) +project(ignition-gazebo7 VERSION 7.0.0) #============================================================================ # Find ignition-cmake diff --git a/Changelog.md b/Changelog.md index 6765e032d0..11d23c6c60 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,7 @@ +## Ignition Gazebo 7.x + +### Ignition Gazebo 7.X.X (20XX-XX-XX) + ## Ignition Gazebo 6.x ### Ignition Gazebo 6.X.X (20XX-XX-XX) diff --git a/examples/plugin/command_actor/CMakeLists.txt b/examples/plugin/command_actor/CMakeLists.txt index 9d52f5539d..5175bbf7f3 100644 --- a/examples/plugin/command_actor/CMakeLists.txt +++ b/examples/plugin/command_actor/CMakeLists.txt @@ -7,9 +7,9 @@ project(CommandActor) find_package(ignition-plugin1 REQUIRED COMPONENTS register) set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR}) -find_package(ignition-gazebo6 REQUIRED) +find_package(ignition-gazebo7 REQUIRED) add_library(CommandActor SHARED CommandActor.cc) set_property(TARGET CommandActor PROPERTY CXX_STANDARD 17) target_link_libraries(CommandActor PRIVATE ignition-plugin${IGN_PLUGIN_VER}::ignition-plugin${IGN_PLUGIN_VER} - PRIVATE ignition-gazebo6::ignition-gazebo6) + PRIVATE ignition-gazebo7::ignition-gazebo7) diff --git a/examples/plugin/custom_component/CMakeLists.txt b/examples/plugin/custom_component/CMakeLists.txt index 391bc7c897..967333cccb 100644 --- a/examples/plugin/custom_component/CMakeLists.txt +++ b/examples/plugin/custom_component/CMakeLists.txt @@ -7,11 +7,11 @@ project(CustomComponentPlugin) find_package(ignition-plugin1 REQUIRED COMPONENTS register) set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR}) -find_package(ignition-gazebo6 REQUIRED) +find_package(ignition-gazebo7 REQUIRED) add_library(CustomComponentPlugin SHARED CustomComponentPlugin.cc ) set_property(TARGET CustomComponentPlugin PROPERTY CXX_STANDARD 17) target_link_libraries(CustomComponentPlugin PRIVATE ignition-plugin${IGN_PLUGIN_VER}::ignition-plugin${IGN_PLUGIN_VER} - PRIVATE ignition-gazebo6::ignition-gazebo6) + PRIVATE ignition-gazebo7::ignition-gazebo7) diff --git a/examples/plugin/custom_sensor_system/CMakeLists.txt b/examples/plugin/custom_sensor_system/CMakeLists.txt index aa424980cc..5e0792b042 100644 --- a/examples/plugin/custom_sensor_system/CMakeLists.txt +++ b/examples/plugin/custom_sensor_system/CMakeLists.txt @@ -7,8 +7,8 @@ project(OdometerSystem) ign_find_package(ignition-plugin1 REQUIRED COMPONENTS register) set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR}) -ign_find_package(ignition-gazebo6 REQUIRED) -set(IGN_GAZEBO_VER ${ignition-gazebo6_VERSION_MAJOR}) +ign_find_package(ignition-gazebo7 REQUIRED) +set(IGN_GAZEBO_VER ${ignition-gazebo7_VERSION_MAJOR}) find_package(ignition-sensors6 REQUIRED) set(IGN_SENSORS_VER ${ignition-sensors6_VERSION_MAJOR}) diff --git a/examples/plugin/gui_system_plugin/CMakeLists.txt b/examples/plugin/gui_system_plugin/CMakeLists.txt index 8c80ddd6fa..fc1b209c26 100644 --- a/examples/plugin/gui_system_plugin/CMakeLists.txt +++ b/examples/plugin/gui_system_plugin/CMakeLists.txt @@ -8,7 +8,7 @@ project(GuiSystemPlugin) set(CMAKE_AUTOMOC ON) -find_package(ignition-gazebo6 REQUIRED COMPONENTS gui) +find_package(ignition-gazebo7 REQUIRED COMPONENTS gui) QT5_ADD_RESOURCES(resources_RCC ${PROJECT_NAME}.qrc) @@ -17,5 +17,5 @@ add_library(${PROJECT_NAME} SHARED ${resources_RCC} ) target_link_libraries(${PROJECT_NAME} - PRIVATE ignition-gazebo6::gui + PRIVATE ignition-gazebo7::gui ) diff --git a/examples/plugin/hello_world/CMakeLists.txt b/examples/plugin/hello_world/CMakeLists.txt index eec9865537..7de93b0aa3 100644 --- a/examples/plugin/hello_world/CMakeLists.txt +++ b/examples/plugin/hello_world/CMakeLists.txt @@ -7,8 +7,8 @@ project(Hello_world) ign_find_package(ignition-plugin1 REQUIRED COMPONENTS register) set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR}) -ign_find_package(ignition-gazebo6 REQUIRED) -set(IGN_GAZEBO_VER ${ignition-gazebo6_VERSION_MAJOR}) +ign_find_package(ignition-gazebo7 REQUIRED) +set(IGN_GAZEBO_VER ${ignition-gazebo7_VERSION_MAJOR}) add_library(HelloWorld SHARED HelloWorld) set_property(TARGET HelloWorld PROPERTY CXX_STANDARD 17) diff --git a/examples/plugin/rendering_plugins/CMakeLists.txt b/examples/plugin/rendering_plugins/CMakeLists.txt index 46de43ab5a..12e503cd1a 100644 --- a/examples/plugin/rendering_plugins/CMakeLists.txt +++ b/examples/plugin/rendering_plugins/CMakeLists.txt @@ -32,13 +32,13 @@ target_link_libraries(${GUI_PLUGIN} set(SERVER_PLUGIN RenderingServerPlugin) find_package(ignition-plugin1 REQUIRED COMPONENTS register) -find_package(ignition-gazebo6 REQUIRED) +find_package(ignition-gazebo7 REQUIRED) add_library(${SERVER_PLUGIN} SHARED ${SERVER_PLUGIN}.cc) set_property(TARGET ${SERVER_PLUGIN} PROPERTY CXX_STANDARD 17) target_link_libraries(${SERVER_PLUGIN} PRIVATE ignition-plugin1::ignition-plugin1 - ignition-gazebo6::ignition-gazebo6 + ignition-gazebo7::ignition-gazebo7 ignition-rendering6::ignition-rendering6 ) diff --git a/examples/plugin/system_plugin/CMakeLists.txt b/examples/plugin/system_plugin/CMakeLists.txt index bc30c2d7ef..46a63f1beb 100644 --- a/examples/plugin/system_plugin/CMakeLists.txt +++ b/examples/plugin/system_plugin/CMakeLists.txt @@ -7,9 +7,9 @@ project(SampleSystem) find_package(ignition-plugin1 REQUIRED COMPONENTS register) set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR}) -find_package(ignition-gazebo6 REQUIRED) +find_package(ignition-gazebo7 REQUIRED) add_library(SampleSystem SHARED SampleSystem.cc SampleSystem2.cc) set_property(TARGET SampleSystem PROPERTY CXX_STANDARD 17) target_link_libraries(SampleSystem PRIVATE ignition-plugin${IGN_PLUGIN_VER}::ignition-plugin${IGN_PLUGIN_VER} - PRIVATE ignition-gazebo6::ignition-gazebo6) + PRIVATE ignition-gazebo7::ignition-gazebo7) diff --git a/examples/standalone/custom_server/CMakeLists.txt b/examples/standalone/custom_server/CMakeLists.txt index bc4a2c0cf1..0c31e2f242 100644 --- a/examples/standalone/custom_server/CMakeLists.txt +++ b/examples/standalone/custom_server/CMakeLists.txt @@ -1,8 +1,8 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - find_package(ignition-gazebo6 REQUIRED) - set(IGN_GAZEBO_VER ${ignition-gazebo6_VERSION_MAJOR}) + find_package(ignition-gazebo7 REQUIRED) + set(IGN_GAZEBO_VER ${ignition-gazebo7_VERSION_MAJOR}) add_executable(custom_server custom_server.cc) target_link_libraries(custom_server diff --git a/examples/standalone/each_performance/CMakeLists.txt b/examples/standalone/each_performance/CMakeLists.txt index 98bc2b1b18..7449038e7f 100644 --- a/examples/standalone/each_performance/CMakeLists.txt +++ b/examples/standalone/each_performance/CMakeLists.txt @@ -1,8 +1,8 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) -find_package(ignition-gazebo6 QUIET REQUIRED) +find_package(ignition-gazebo7 QUIET REQUIRED) add_executable(each each.cc) target_link_libraries(each - ignition-gazebo6::core) + ignition-gazebo7::core) diff --git a/examples/standalone/external_ecm/CMakeLists.txt b/examples/standalone/external_ecm/CMakeLists.txt index f03b7c51d5..af75f411fa 100644 --- a/examples/standalone/external_ecm/CMakeLists.txt +++ b/examples/standalone/external_ecm/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) -find_package(ignition-gazebo6 REQUIRED) +find_package(ignition-gazebo7 REQUIRED) add_executable(external_ecm external_ecm.cc) target_link_libraries(external_ecm - ignition-gazebo6::core) + ignition-gazebo7::core) diff --git a/examples/standalone/light_control/CMakeLists.txt b/examples/standalone/light_control/CMakeLists.txt index ce5f63be0a..7623d35208 100644 --- a/examples/standalone/light_control/CMakeLists.txt +++ b/examples/standalone/light_control/CMakeLists.txt @@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) find_package(ignition-transport11 QUIET REQUIRED OPTIONAL_COMPONENTS log) set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR}) -find_package(ignition-gazebo6 REQUIRED) -set(IGN_GAZEBO_VER ${ignition-gazebo6_VERSION_MAJOR}) +find_package(ignition-gazebo7 REQUIRED) +set(IGN_GAZEBO_VER ${ignition-gazebo7_VERSION_MAJOR}) add_executable(light_control light_control.cc) target_link_libraries(light_control diff --git a/examples/standalone/multi_lrauv_race/CMakeLists.txt b/examples/standalone/multi_lrauv_race/CMakeLists.txt index 5de19f3212..bd063eb733 100644 --- a/examples/standalone/multi_lrauv_race/CMakeLists.txt +++ b/examples/standalone/multi_lrauv_race/CMakeLists.txt @@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) find_package(ignition-transport11 QUIET REQUIRED OPTIONAL_COMPONENTS log) set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR}) -find_package(ignition-gazebo6 REQUIRED) -set(IGN_GAZEBO_VER ${ignition-gazebo6_VERSION_MAJOR}) +find_package(ignition-gazebo7 REQUIRED) +set(IGN_GAZEBO_VER ${ignition-gazebo7_VERSION_MAJOR}) add_executable(multi_lrauv_race multi_lrauv_race.cc) target_link_libraries(multi_lrauv_race diff --git a/tutorials/migrating_ardupilot_plugin.md b/tutorials/migrating_ardupilot_plugin.md index 021ee9adc4..39e5e38a82 100644 --- a/tutorials/migrating_ardupilot_plugin.md +++ b/tutorials/migrating_ardupilot_plugin.md @@ -753,7 +753,7 @@ In the new code we explicitly reference each Ignition package that we use: # NEW find_package(sdformat12 REQUIRED) find_package(ignition-common4-all REQUIRED) -find_package(ignition-gazebo6-all REQUIRED) +find_package(ignition-gazebo7-all REQUIRED) find_package(ignition-math6-all REQUIRED) find_package(ignition-msgs8-all REQUIRED) find_package(ignition-physics5-all REQUIRED) diff --git a/tutorials/rendering_plugins.md b/tutorials/rendering_plugins.md index ead63d9e38..1a9de801a7 100644 --- a/tutorials/rendering_plugins.md +++ b/tutorials/rendering_plugins.md @@ -8,7 +8,7 @@ This is not to be confused with integrating a new rendering engine. See for that. This tutorial will go over a couple of example plugins that are located at -https://github.com/ignitionrobotics/ign-gazebo/tree/ign-gazebo6/examples/plugin/rendering_plugins. +https://github.com/ignitionrobotics/ign-gazebo/tree/main/examples/plugin/rendering_plugins. ## Scenes @@ -48,7 +48,7 @@ To interact with the client-side scene, you'll need to write an [ignition::gui::Plugin](https://ignitionrobotics.org/api/gui/4.1/classignition_1_1gui_1_1Plugin.html), or a more specialized `ignition::gazebo::GuiSystem` if you need to access entities and components. -See the [GUI system plugin example](https://github.com/ignitionrobotics/ign-gazebo/tree/ign-gazebo6/examples/plugin/gui_system_plugin). +See the [GUI system plugin example](https://github.com/ignitionrobotics/ign-gazebo/tree/main/examples/plugin/gui_system_plugin). ## Getting the scene @@ -123,7 +123,7 @@ Here's how to do it: ## Running examples Follow the build instructions on the rendering plugins -[README](https://github.com/ignitionrobotics/ign-gazebo/blob/ign-gazebo6/examples/plugin/rendering_plugins) +[README](https://github.com/ignitionrobotics/ign-gazebo/blob/main/examples/plugin/rendering_plugins) and you'll generate both plugins: * `RenderingGuiPlugin`: GUI plugin that updates the GUI scene's ambient light with a random color at each click. diff --git a/tutorials/test_fixture.md b/tutorials/test_fixture.md index 4b9b5611a4..a9a4cca1c7 100644 --- a/tutorials/test_fixture.md +++ b/tutorials/test_fixture.md @@ -10,7 +10,7 @@ using Continuous Integration (CI). Gazebo can be used for testing using any testing library. We provide an example of how to setup some test cases using [Google Test](https://github.com/google/googletest) in -[ign-gazebo/examples/standalone/gtest_setup](https://github.com/ignitionrobotics/ign-gazebo/tree/ign-gazebo6/examples/standalone/gtest_setup). +[ign-gazebo/examples/standalone/gtest_setup](https://github.com/ignitionrobotics/ign-gazebo/tree/main/examples/standalone/gtest_setup). The instructions on that example's `README` can be followed to compile and run those tests. Also be sure to go through the source code for comments with From 1fb53d8a5847492b7ea646324e490e931f6f41f8 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Thu, 14 Oct 2021 10:31:15 -0700 Subject: [PATCH 2/2] Bump example Signed-off-by: Louise Poubel --- examples/standalone/gtest_setup/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/standalone/gtest_setup/CMakeLists.txt b/examples/standalone/gtest_setup/CMakeLists.txt index 7fe6ac2902..3bb366d7ac 100644 --- a/examples/standalone/gtest_setup/CMakeLists.txt +++ b/examples/standalone/gtest_setup/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.11.0 FATAL_ERROR) project(GTestSetup) # Find Gazebo -set(IGN_GAZEBO_VER 6) +set(IGN_GAZEBO_VER 7) find_package(ignition-gazebo${IGN_GAZEBO_VER} REQUIRED) # Fetch and configure GTest