Skip to content

Commit 17e5dd6

Browse files
chapulinaJohn Shepherd
and
John Shepherd
authored
Updates to README and installation (#127)
Signed-off-by: Louise Poubel <louise@openrobotics.org> Co-authored-by: John Shepherd <john@openrobotics.org>
1 parent b77b0ed commit 17e5dd6

File tree

4 files changed

+96
-32
lines changed

4 files changed

+96
-32
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
See the [Ignition Robotics contributing guide](https://ignitionrobotics.org/docs/all/contributing).
1+
See the [Ignition contributing guide](https://ignitionrobotics.org/docs/all/contributing).

README.md

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ which can be used to add custom widgets.
3131

3232
[Documentation](#documentation)
3333

34-
[Testing](#testing)
35-
3634
[Folder Structure](#folder-structure)
3735

3836
[Code of Conduct](#code-of-conduct)
@@ -52,7 +50,7 @@ which can be used to add custom widgets.
5250

5351
# Install
5452

55-
See the [installation tutorial](https://ignitionrobotics.org/api/gui/3.2/install.html).
53+
See the [installation tutorial](https://ignitionrobotics.org/api/gui/4.0/install.html).
5654

5755
# Usage
5856

@@ -89,16 +87,6 @@ export IGN_CONFIG_PATH=$HOME/.ignition/tools/configs
8987

9088
This issue is tracked [here](https://github.com/ignitionrobotics/ign-tools/issues/8).
9189

92-
# Testing
93-
94-
After building, to run all tests:
95-
96-
cd build
97-
make test
98-
99-
See [this tutorial](https://ignitionrobotics.org/api/gui/4.0/install.html) for
100-
further instructions on how to disable testing, run test coverage, etc.
101-
10290
# Folder Structure
10391

10492
* `include/ignition/gui`: Contains all the files which will be installed, such as
@@ -139,7 +127,7 @@ Please see
139127

140128
# Versioning
141129

142-
This library uses [Semantic Versioning](https://semver.org/). Additionally, this library is part of the [Ignition Robotics project](https://ignitionrobotics.org) which periodically releases a versioned set of compatible and complimentary libraries. See the [Ignition Robotics website](https://ignitionrobotics.org) for version and release information.
130+
This library uses [Semantic Versioning](https://semver.org/). Additionally, this library is part of the [Ignition project](https://ignitionrobotics.org) which periodically releases a versioned set of compatible and complimentary libraries. See the [Ignition website](https://ignitionrobotics.org) for version and release information.
143131

144132
# License
145133

api.md.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## Ignition @IGN_DESIGNATION_CAP@
22

3-
Ignition @IGN_DESIGNATION_CAP@ is a component in Ignition Robotics, a set of libraries
4-
designed to rapidly develop robot and simulation applications.
3+
Ignition @IGN_DESIGNATION_CAP@ is a component in Ignition, a set of libraries
4+
designed to rapidly develop robot and simulation applications.
55

66
## License
77

tutorials/01_install.md

Lines changed: 91 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,23 @@
22

33
Next Tutorial: \ref commandline
44

5-
[Install](#install)
6-
7-
* [Binary Install](#binary-install)
8-
9-
* [Source Install](#source-install)
10-
11-
* [Prerequisites](#prerequisites)
12-
13-
* [Building from Source](#building-from-source)
14-
155
# Install
166

17-
We recommend following the [Binary Install](#binary-install) instructions to get up and running as quickly and painlessly as possible.
7+
These instructions are for installing only Ignition GUI. If you're interested
8+
in using all the Ignition libraries, not only Igniton GUI, check out this
9+
[Ignition installation](https://ignitionrobotics.org/docs/latest/install).
10+
11+
We recommend following the binary install instructions to get up and running as
12+
quickly and painlessly as possible.
1813

19-
The [Source Install](#source-install) instructions should be used if you need the very latest software improvements, if you need to modify the code, or if you plan to make a contribution.
14+
The source install instructions should be used if you need the very latest
15+
software improvements, if you need to modify the code, or if you plan to make a
16+
contribution.
2017

2118
## Binary Install
2219

20+
### Ubuntu
21+
2322
On Ubuntu, it's possible to install Ignition GUI as follows:
2423

2524
Add OSRF packages:
@@ -35,27 +34,48 @@ Install Ignition GUI:
3534
Be sure to replace `<#>` with a number value, such as 1 or 2, depending on
3635
which version you need.
3736

37+
### macOS
38+
39+
On macOS, add OSRF packages:
40+
41+
ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
42+
brew tap osrf/simulation
43+
44+
Install Ignition GUI:
45+
46+
brew install ignition-gui<#>
47+
48+
Be sure to replace `<#>` with a number value, such as 1 or 2, depending on
49+
which version you need.
50+
3851
## Source Install
3952

4053
### Prerequisites
4154

4255
#### Ubuntu Bionic 18.04 or above
4356

44-
Install dependencies:
57+
Add OSRF packages:
4558

4659
sudo apt update
4760
sudo apt -y install wget lsb-release gnupg
4861
sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list'
4962
wget http://packages.osrfoundation.org/gazebo.key -O - | apt-key add -
5063
sudo apt-add-repository -s "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable $(lsb_release -c -s) main"
51-
sudo apt-get build-dep -y ignition-gui4
52-
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8 --slave /usr/bin/gcov gcov /usr/bin/gcov-8
5364

5465
Clone source code:
5566

5667
# This checks out the `master` branch. You can append `-b ign-gui#` (replace # with a number) to checkout a specific version
5768
git clone http://github.com/ignitionrobotics/ign-gui
5869

70+
Install dependencies
71+
72+
sudo apt -y install $(sort -u $(find . -iname 'packages.apt') | tr '\n' ' ')
73+
74+
Only on Bionic, update the GCC compiler version:
75+
76+
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8 --slave /usr/bin/gcov gcov /usr/bin/gcov-8
77+
78+
5979
### Building from source
6080

6181
Build and install as follows:
@@ -66,3 +86,59 @@ Build and install as follows:
6686
cmake ..
6787
make -j4
6888
sudo make install
89+
90+
# Documentation
91+
92+
API documentation and tutorials can be accessed at
93+
[https://ignitionrobotics.org/libs/gui](https://ignitionrobotics.org/libs/gui)
94+
95+
You can also generate the documentation from a clone of this repository by following these steps.
96+
97+
1. You will need [Doxygen](http://www.doxygen.org/). On Ubuntu Doxygen can be installed using
98+
99+
```
100+
sudo apt-get install doxygen
101+
```
102+
103+
2. Clone the repository
104+
105+
```
106+
git clone https://github.com/ignitionrobotics/ign-gui
107+
```
108+
109+
3. Configure and build the documentation.
110+
111+
```
112+
cd ign-gui
113+
mkdir build
114+
cd build
115+
cmake ../
116+
make doc
117+
```
118+
119+
4. View the documentation by running the following command from the `build` directory.
120+
121+
```
122+
firefox doxygen/html/index.html
123+
```
124+
125+
# Testing
126+
127+
Follow these steps to run tests and static code analysis in your clone of this repository.
128+
129+
1. Follow the [source install instruction](#source-install).
130+
131+
2. Run tests.
132+
133+
```
134+
make test
135+
```
136+
137+
3. Static code checker.
138+
139+
```
140+
make codecheck
141+
```
142+
143+
See the [Writing Tests section of the contributor guide](https://ignitionrobotics.org/docs/all/contributing#writing-tests) for help creating or modifying tests.
144+

0 commit comments

Comments
 (0)