Skip to content

Commit

Permalink
Replaced ninja with meson [skip ci]
Browse files Browse the repository at this point in the history
  • Loading branch information
TheQwertiest authored and jpakkane committed Jun 30, 2020
1 parent 9e0db0a commit 83a973c
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion docs/markdown/Feature-autodetection.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ the binaries `gcovr`, `lcov` and `genhtml`. If version 3.3 or higher
of the first is found, targets called *coverage-text*, *coverage-xml*
and *coverage-html* are generated. Alternatively, if the latter two
are found, only the target *coverage-html* is generated. Coverage
reports can then be produced simply by calling e.g. `ninja
reports can then be produced simply by calling e.g. `meson compile
coverage-xml`. As a convenience, a high-level *coverage* target is
also generated which will produce all 3 coverage report types, if
possible.
Expand Down
4 changes: 2 additions & 2 deletions docs/markdown/Localisation.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ Then we need to generate the main pot file. The potfile can have any name but is
Run the following command from your build folder to generate the pot file. It is recommended to inspect it manually afterwards and fill in e.g. proper copyright and contact information.

```console
$ ninja intltest-pot
$ meson compile intltest-pot
```

### generate .po files

For each language listed in the array above we need a corresponding `.po` file. Those can be generated by running the following command from your build folder.

```console
$ ninja intltest-update-po
$ meson compile intltest-update-po
```
2 changes: 1 addition & 1 deletion docs/markdown/Run-targets.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ run_target('inspector',
Run targets are not run by default. To run it run the following command.

```console
$ ninja inspector
$ meson compile inspector
```

All additional entries in `run_target`'s `command` array are passed unchanged to the inspector script, so you can do things like this:
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/Tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Now we are ready to build our code.

```
$ cd builddir
$ ninja
$ meson compile
```

Once that is done we can run the resulting binary.
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/Unit-tests.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ e = executable('prog', 'testprog.c')
test('name of test', e)
```

You can add as many tests as you want. They are run with the command `ninja
You can add as many tests as you want. They are run with the command `meson
test`.

Meson captures the output of all tests and writes it in the log file
Expand Down
6 changes: 3 additions & 3 deletions docs/markdown/howtox.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ Then issue the following commands.
```console
$ meson compile
$ meson test
$ ninja coverage-html (or coverage-xml)
$ meson compile coverage-html (or coverage-xml)
```

The coverage report can be found in the meson-logs subdirectory.
Expand Down Expand Up @@ -190,14 +190,14 @@ test failures.
Install scan-build and configure your project. Then do this:

```console
$ ninja scan-build
$ meson compile scan-build
```

You can use the `SCANBUILD` environment variable to choose the
scan-build executable.

```console
$ SCANBUILD=<your exe> ninja scan-build
$ SCANBUILD=<your exe> meson compile scan-build
```


Expand Down

0 comments on commit 83a973c

Please sign in to comment.