Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump in edifice: ign-common4 #577

Merged
merged 3 commits into from
Feb 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ci/packages.apt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions bitbucket-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ 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
# METHOD 2: Build from source
# 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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.nightly
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions examples/standalone/keyboard/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions examples/standalone/marker/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
2 changes: 1 addition & 1 deletion src/SdfGenerator_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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<std::string> fuelUris = {
Expand Down
2 changes: 1 addition & 1 deletion tutorials/erb_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
8 changes: 4 additions & 4 deletions tutorials/migrating_ardupilot_plugin.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

<img src="https://raw.githubusercontent.com/ignitionrobotics/ign-gazebo/ign-gazebo4/tutorials/files/ardupilot_diagram.png"/>
<img src="https://raw.githubusercontent.com/ignitionrobotics/ign-gazebo/main/tutorials/files/ardupilot_diagram.png"/>

*UAV icon credit: By Julian Herzog, CC BY 4.0, https://commons.wikimedia.org/w/index.php?curid=60965475*

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tutorials/video_recorder.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down