mirror of
https://gitlab.freedesktop.org/libinput/libinput.git
synced 2025-12-20 13:50:15 +01:00
meson: Use the meson setup command
Meson recommends using the `meson setup [options]` command:
WARNING: Running the setup command as `meson [options]` instead of
`meson setup [options]` is ambiguous and deprecated.
Update the documentation and CI to use the recommended command.
Signed-off-by: José Expósito <jose.exposito89@gmail.com>
This commit is contained in:
parent
8d0f2f5f62
commit
12bb7547f9
5 changed files with 8 additions and 8 deletions
|
|
@ -839,7 +839,7 @@ check-test-suites:
|
|||
extends:
|
||||
- .fedora-build@template
|
||||
script:
|
||||
- meson builddir
|
||||
- meson setup builddir
|
||||
- meson introspect builddir --test | jq -r '.[].name' | grep 'libinput-test-suite' | sort > meson-testsuites
|
||||
- |
|
||||
cat <<EOF > ci-testsuites ;
|
||||
|
|
|
|||
|
|
@ -557,7 +557,7 @@ check-test-suites:
|
|||
extends:
|
||||
- .{{distro.name}}-build@template
|
||||
script:
|
||||
- meson builddir
|
||||
- meson setup builddir
|
||||
- meson introspect builddir --test | jq -r '.[].name' | grep 'libinput-test-suite' | sort > meson-testsuites
|
||||
- |
|
||||
cat <<EOF > ci-testsuites ;
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ process below. A successful build requires the
|
|||
|
||||
$> git clone https://gitlab.freedesktop.org/libinput/libinput
|
||||
$> cd libinput
|
||||
$> meson --prefix=/usr builddir/
|
||||
$> meson setup --prefix=/usr builddir/
|
||||
$> ninja -C builddir/
|
||||
$> sudo ninja -C builddir/ install
|
||||
|
||||
|
|
@ -71,7 +71,7 @@ Additional options may also be specified. For example:
|
|||
|
||||
::
|
||||
|
||||
$> meson --prefix=/usr -Ddocumentation=false builddir/
|
||||
$> meson setup --prefix=/usr -Ddocumentation=false builddir/
|
||||
|
||||
|
||||
We recommend that users disable the documentation, it's not usually required
|
||||
|
|
@ -96,7 +96,7 @@ again:
|
|||
::
|
||||
|
||||
$> rm -r builddir/
|
||||
$> meson --prefix=....
|
||||
$> meson setup --prefix=....
|
||||
|
||||
|
||||
.. _verifying_install:
|
||||
|
|
@ -242,7 +242,7 @@ available options. The default build enables most options and thus requires
|
|||
more build dependencies. On systems where build dependencies are an issue,
|
||||
options may be disabled with this meson command: ::
|
||||
|
||||
meson --prefix=/usr -Dsomefeature=false builddir
|
||||
meson setup --prefix=/usr -Dsomefeature=false builddir
|
||||
|
||||
Where ``-Dsomefeature=false`` may be one of:
|
||||
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ will be:
|
|||
|
||||
$> git clone https://gitlab.freedesktop.org/libinput/libinput
|
||||
$> cd libinput
|
||||
$> meson --prefix=/usr builddir/
|
||||
$> meson setup --prefix=/usr builddir/
|
||||
$> ninja -C builddir/
|
||||
$> sudo ninja -C builddir/ install
|
||||
|
||||
|
|
|
|||
|
|
@ -208,7 +208,7 @@ verification of distribution composes.
|
|||
To configure libinput to install the tests, use the ``-Dinstall-tests=true``
|
||||
meson option::
|
||||
|
||||
$ meson builddir -Dtests=true -Dinstall-tests=true <other options>
|
||||
$ meson setup builddir -Dtests=true -Dinstall-tests=true <other options>
|
||||
|
||||
.. _test-meson-suites:
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue