From 4f025873a01e55562895812a2e3850315dda2d87 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Fri, 22 Jan 2021 13:59:07 -0800 Subject: [PATCH 1/2] Bump in edifice: ign-common4 Signed-off-by: Louise Poubel --- .github/ci/packages.apt | 2 +- CMakeLists.txt | 4 ++-- bitbucket-pipelines.yml | 6 +++--- docker/Dockerfile.nightly | 2 +- examples/standalone/keyboard/CMakeLists.txt | 4 ++-- examples/standalone/marker/CMakeLists.txt | 4 ++-- tutorials/erb_template.md | 2 +- tutorials/migrating_ardupilot_plugin.md | 8 ++++---- tutorials/video_recorder.md | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index f5b6ac2862..a90ce8cae1 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -2,7 +2,7 @@ freeglut3-dev libfreeimage-dev libglew-dev libignition-cmake2-dev -libignition-common3-dev +libignition-common4-dev libignition-gui5-dev libignition-fuel-tools6-dev libignition-math6-eigen3-dev diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c914176b6..a99108a6bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,14 +59,14 @@ set(IGN_MSGS_VER ${ignition-msgs7_VERSION_MAJOR}) #-------------------------------------- # Find ignition-common # Always use the profiler component to get the headers, regardless of status. -ign_find_package(ignition-common3 VERSION 3.6 +ign_find_package(ignition-common4 COMPONENTS profiler events av REQUIRED ) -set(IGN_COMMON_VER ${ignition-common3_VERSION_MAJOR}) +set(IGN_COMMON_VER ${ignition-common4_VERSION_MAJOR}) #-------------------------------------- # Find ignition-fuel_tools diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 585ce33e78..1804b2e116 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -27,7 +27,7 @@ pipelines: libsdformat9-dev libignition-fuel-tools4-dev libignition-physics4-dev - # libignition-common3-dev + # libignition-common4-dev # libignition-gui3-dev # libignition-sensors3-dev # libignition-rendering3-dev @@ -35,7 +35,7 @@ pipelines: # Build dependencies from source using a given branch # - docker/scripts/build_ign.sh ignitionrobotics ign-physics default # - docker/scripts/build_ign.sh ignitionrobotics ign-fuel-tools default - - docker/scripts/build_ign.sh ignitionrobotics ign-common ign-common3 + - docker/scripts/build_ign.sh ignitionrobotics ign-common ign-common4 - docker/scripts/build_ign.sh ignitionrobotics ign-rendering default - docker/scripts/build_ign.sh ignitionrobotics ign-gui default - docker/scripts/build_ign.sh ignitionrobotics ign-sensors default @@ -72,7 +72,7 @@ pipelines: # METHOD 1: Install the following debians - apt-get install -y libignition-cmake2-dev - libignition-common3-dev + libignition-common4-dev libignition-math6-eigen3-dev libignition-plugin-dev libignition-tools-dev diff --git a/docker/Dockerfile.nightly b/docker/Dockerfile.nightly index 45ba733305..b862b29d0f 100644 --- a/docker/Dockerfile.nightly +++ b/docker/Dockerfile.nightly @@ -12,7 +12,7 @@ RUN scripts/enable_ign_nightly.sh RUN apt-get update \ && apt-get install -y \ libignition-cmake2-dev \ - libignition-common3-dev \ + libignition-common4-dev \ libignition-fuel-tools6-dev \ libignition-math6-eigen3-dev \ libignition-plugin-dev \ diff --git a/examples/standalone/keyboard/CMakeLists.txt b/examples/standalone/keyboard/CMakeLists.txt index b0c4e0ee3a..b58d56794e 100644 --- a/examples/standalone/keyboard/CMakeLists.txt +++ b/examples/standalone/keyboard/CMakeLists.txt @@ -10,8 +10,8 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") find_package(ignition-msgs7 REQUIRED) set(IGN_MSGS_VER ${ignition-msgs7_VERSION_MAJOR}) - find_package(ignition-common3 REQUIRED) - set(IGN_COMMON_VER ${ignition-common3_VERSION_MAJOR}) + find_package(ignition-common4 REQUIRED) + set(IGN_COMMON_VER ${ignition-common4_VERSION_MAJOR}) add_executable(keyboard keyboard.cc) target_link_libraries(keyboard diff --git a/examples/standalone/marker/CMakeLists.txt b/examples/standalone/marker/CMakeLists.txt index 171aa844d6..ee4be1fdd6 100644 --- a/examples/standalone/marker/CMakeLists.txt +++ b/examples/standalone/marker/CMakeLists.txt @@ -4,8 +4,8 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") find_package(ignition-transport10 QUIET REQUIRED OPTIONAL_COMPONENTS log) set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR}) - find_package(ignition-common3 REQUIRED) - set(IGN_COMMON_VER ${ignition-common3_VERSION_MAJOR}) + find_package(ignition-common4 REQUIRED) + set(IGN_COMMON_VER ${ignition-common4_VERSION_MAJOR}) find_package(ignition-msgs7 REQUIRED) set(IGN_MSGS_VER ${ignition-msgs7_VERSION_MAJOR}) diff --git a/tutorials/erb_template.md b/tutorials/erb_template.md index 888d621c4e..1814d024dc 100644 --- a/tutorials/erb_template.md +++ b/tutorials/erb_template.md @@ -102,7 +102,7 @@ Each box model also has a different name and pose to ensure they show up as indi %> ``` -[Here](https://github.com/ignitionrobotics/ign-gazebo/blob/ign-gazebo4/examples/worlds/shapes_population.sdf.erb) is a complete shapes simulation world example. +[Here](https://github.com/ignitionrobotics/ign-gazebo/blob/main/examples/worlds/shapes_population.sdf.erb) is a complete shapes simulation world example. Instead of simple shapes, you can also use a nested loop to generate 100 actors spaced out evenly in a simulation world. diff --git a/tutorials/migrating_ardupilot_plugin.md b/tutorials/migrating_ardupilot_plugin.md index 91194711f3..b314399395 100644 --- a/tutorials/migrating_ardupilot_plugin.md +++ b/tutorials/migrating_ardupilot_plugin.md @@ -22,7 +22,7 @@ documentation](https://ardupilot.org/dev/docs/using-gazebo-simulator-with-sitl.h As context to understand what we're migrating, here's a system diagram for how the ArduPilot Gazebo plugin works is used: - + *UAV icon credit: By Julian Herzog, CC BY 4.0, https://commons.wikimedia.org/w/index.php?curid=60965475* @@ -224,8 +224,8 @@ To better understand the ECS pattern as it is used in Ignition, it's helpful to learn about the EntityComponentManager (ECM), which is responsible for managing the ECS graph. A great resource to understand the logic under the hood of the ECM is the `SdfEntityCreator` class -([header](https://github.com/ignitionrobotics/ign-gazebo/blob/ign-gazebo4/include/ignition/gazebo/SdfEntityCreator.hh), -[source](https://github.com/ignitionrobotics/ign-gazebo/blob/ign-gazebo4/src/SdfEntityCreator.cc)). +([header](https://github.com/ignitionrobotics/ign-gazebo/blob/main/include/ignition/gazebo/SdfEntityCreator.hh), +[source](https://github.com/ignitionrobotics/ign-gazebo/blob/main/src/SdfEntityCreator.cc)). This class is responsible for mapping the content of an SDF file to the entities and components that form the graph handled by the ECM. For example, if you wonder which components can be accessed by default from the plugin, this @@ -752,7 +752,7 @@ In the new code we explicitly reference each Ignition package that we use: ``` # NEW find_package(sdformat11 REQUIRED) -find_package(ignition-common3-all REQUIRED) +find_package(ignition-common4-all REQUIRED) find_package(ignition-gazebo5-all REQUIRED) find_package(ignition-math6-all REQUIRED) find_package(ignition-msgs7-all REQUIRED) diff --git a/tutorials/video_recorder.md b/tutorials/video_recorder.md index 50bbef75d9..a16442e894 100644 --- a/tutorials/video_recorder.md +++ b/tutorials/video_recorder.md @@ -38,7 +38,7 @@ the [GUI Configuration](gui_config.html) tutorial for more information. If you launched Ignition Gazebo with the `video_record_dbl_pendulum.sdf` demo world, the GUI configurations are embedded in the world SDF file so you will need to download a copy of the -[sdf file](https://raw.githubusercontent.com/ignitionrobotics/ign-gazebo/ign-gazebo4/examples/worlds/video_record_dbl_pendulum.sdf). +[sdf file](https://raw.githubusercontent.com/ignitionrobotics/ign-gazebo/main/examples/worlds/video_record_dbl_pendulum.sdf). and modify the GUI configuration in that file. On the other hand, if you launched Ignition Gazebo with a world file that does not have GUI configurations, you will need to specify the settings in From 696ca6f3a439a0f09873aba4c755f6e69b8a267a Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Sun, 21 Feb 2021 09:31:23 -0800 Subject: [PATCH 2/2] trailing / Signed-off-by: Louise Poubel --- src/SdfGenerator_TEST.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SdfGenerator_TEST.cc b/src/SdfGenerator_TEST.cc index 7e834a6158..1a161267f4 100644 --- a/src/SdfGenerator_TEST.cc +++ b/src/SdfGenerator_TEST.cc @@ -543,7 +543,7 @@ TEST_F(ElementUpdateFixture, WorldWithModelsIncludedNotExpanded) TEST_F(ElementUpdateFixture, WorldWithModelsIncludedWithInvalidUris) { const std::string goodUri = - "https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Backpack/2"; + "https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Backpack/2/"; // These are URIs that are potentially problematic. const std::vector fuelUris = {