Skip to content

Commit

Permalink
Bump in edifice: ign-msgs7 (#158)
Browse files Browse the repository at this point in the history
Signed-off-by: Louise Poubel <louise@openrobotics.org>
  • Loading branch information
chapulina authored Jan 12, 2021
1 parent 50f4c94 commit 5e77cec
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/ci/packages.apt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ libcurl4-openssl-dev
libgflags-dev
libignition-cmake2-dev
libignition-common3-dev
libignition-msgs6-dev
libignition-msgs7-dev
libignition-tools-dev
libjsoncpp-dev
libtinyxml2-dev
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ set(IGN_COMMON_MAJOR_VER ${ignition-common3_VERSION_MAJOR})

#--------------------------------------
# Find ignition-msgs
ign_find_package(ignition-msgs6 REQUIRED PRIVATE)
set(IGN_MSGS_MAJOR_VER ${ignition-msgs6_VERSION_MAJOR})
ign_find_package(ignition-msgs7 REQUIRED PRIVATE)
set(IGN_MSGS_MAJOR_VER ${ignition-msgs7_VERSION_MAJOR})

#--------------------------------------
# Find ignition-tools
Expand Down
2 changes: 1 addition & 1 deletion configure.bat
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ call %win_lib% :download_unzip_install libzip-1.4.0_zlip-1.2.11_vc15-x64-dll-MD.
call %win_lib% :install_ign_project ign-cmake ign-cmake2
call %win_lib% :install_ign_project ign-tools ign-tools1
call %win_lib% :install_ign_project ign-common ign-common3
call %win_lib% :install_ign_project ign-msgs master
call %win_lib% :install_ign_project ign-msgs main

:: Set configuration variables
@set build_type=Release
Expand Down
2 changes: 1 addition & 1 deletion include/ignition/fuel_tools/FuelClient.hh
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ namespace ignition
/// \brief Remove a model from ignition fuel
/// \param[in] _id The model identifier.
/// \return Result of the delete operation
/// Deprecate this function in ign-fuel-tools5. DeleteUrl
/// Deprecate this function in ign-fuel-tools6. DeleteUrl
/// replaces this function.
public: Result DeleteModel(const ModelIdentifier &_id);

Expand Down
6 changes: 3 additions & 3 deletions tutorials/01_installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Install Ignition Fuel Tools:

```
sudo apt-get update
sudo apt-get install libignition-fuel-tools5-dev
sudo apt-get install libignition-fuel-tools6-dev
```

## Mac OS X
Expand All @@ -51,7 +51,7 @@ Run the following commands:

```
brew tap osrf/simulation
brew install ignition-fuel-tools5
brew install ignition-fuel-tools6
```

## Windows
Expand All @@ -67,7 +67,7 @@ Make sure you have removed the Ubuntu pre-compiled binaries before
installing from source:

```
sudo apt-get remove libignition-fuel-tools5-dev
sudo apt-get remove libignition-fuel-tools6-dev
```

Install prerequisites. A clean Ubuntu system will need:
Expand Down
4 changes: 2 additions & 2 deletions tutorials/02_configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@ mkdir /tmp/conf_tutorial && cd /tmp/conf_tutorial
Download the file `download.cc` and save it under `/tmp/conf_tutorial`:

```
wget https://github.com/ignitionrobotics/ign-fuel-tools/raw/ign-fuel-tools5/example/download.cc
wget https://github.com/ignitionrobotics/ign-fuel-tools/raw/ign-fuel-tools6/example/download.cc
```

Also, download `CMakeLists.txt` for compiling the example:

```
wget https://github.com/ignitionrobotics/ign-fuel-tools/raw/ign-fuel-tools5/example/CMakeLists.txt
wget https://github.com/ignitionrobotics/ign-fuel-tools/raw/ign-fuel-tools6/example/CMakeLists.txt
```

Install a dependency:
Expand Down
8 changes: 4 additions & 4 deletions tutorials/04_cpp_api.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ Download the files `list.cc`, `details.cc`, `download.cc`,
`CMakeLists.txt`, and save them under `/tmp/fuel_tutorial`:

```
wget https://github.com/ignitionrobotics/ign-fuel-tools/raw/ign-fuel-tools5/example/list.cc
wget https://github.com/ignitionrobotics/ign-fuel-tools/raw/ign-fuel-tools5/example/details.cc
wget https://github.com/ignitionrobotics/ign-fuel-tools/raw/ign-fuel-tools5/example/download.cc
wget https://github.com/ignitionrobotics/ign-fuel-tools/raw/ign-fuel-tools5/example/CMakeLists.txt
wget https://github.com/ignitionrobotics/ign-fuel-tools/raw/ign-fuel-tools6/example/list.cc
wget https://github.com/ignitionrobotics/ign-fuel-tools/raw/ign-fuel-tools6/example/details.cc
wget https://github.com/ignitionrobotics/ign-fuel-tools/raw/ign-fuel-tools6/example/download.cc
wget https://github.com/ignitionrobotics/ign-fuel-tools/raw/ign-fuel-tools6/example/CMakeLists.txt
```

Let's start by compiling the examples:
Expand Down

0 comments on commit 5e77cec

Please sign in to comment.