From 83a973ca04cf53dd98ff487b4273155b82cf554a Mon Sep 17 00:00:00 2001 From: TheQwertiest Date: Tue, 30 Jun 2020 18:32:27 +0300 Subject: [PATCH] Replaced `ninja` with `meson` [skip ci] --- docs/markdown/Feature-autodetection.md | 2 +- docs/markdown/Localisation.md | 4 ++-- docs/markdown/Run-targets.md | 2 +- docs/markdown/Tutorial.md | 2 +- docs/markdown/Unit-tests.md | 2 +- docs/markdown/howtox.md | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/markdown/Feature-autodetection.md b/docs/markdown/Feature-autodetection.md index a568313e8..4d366d939 100644 --- a/docs/markdown/Feature-autodetection.md +++ b/docs/markdown/Feature-autodetection.md @@ -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. diff --git a/docs/markdown/Localisation.md b/docs/markdown/Localisation.md index ce9e3b671..ed63e137b 100644 --- a/docs/markdown/Localisation.md +++ b/docs/markdown/Localisation.md @@ -48,7 +48,7 @@ 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 @@ -56,5 +56,5 @@ $ ninja intltest-pot 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 ``` diff --git a/docs/markdown/Run-targets.md b/docs/markdown/Run-targets.md index 38129a6d2..b584bf769 100644 --- a/docs/markdown/Run-targets.md +++ b/docs/markdown/Run-targets.md @@ -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: diff --git a/docs/markdown/Tutorial.md b/docs/markdown/Tutorial.md index be6888d6a..c5a4e6bcf 100644 --- a/docs/markdown/Tutorial.md +++ b/docs/markdown/Tutorial.md @@ -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. diff --git a/docs/markdown/Unit-tests.md b/docs/markdown/Unit-tests.md index 4f51d35b9..60fcad216 100644 --- a/docs/markdown/Unit-tests.md +++ b/docs/markdown/Unit-tests.md @@ -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 diff --git a/docs/markdown/howtox.md b/docs/markdown/howtox.md index 5f9d13601..c89f883cf 100644 --- a/docs/markdown/howtox.md +++ b/docs/markdown/howtox.md @@ -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. @@ -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= ninja scan-build +$ SCANBUILD= meson compile scan-build ```