fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2025-12-20 12:40:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: Use the meson setup command

Browse source 
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:
José Expósito 2023-09-02 17:04:31 +02:00
parent 8d0f2f5f62
commit 12bb7547f9
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -839,7 +839,7 @@ check-test-suites:
extends: extends:
- .fedora-build@template - .fedora-build@template
script: script:
- meson builddir - meson setup builddir
- meson introspect builddir --test | jq -r '.[].name' | grep 'libinput-test-suite' | sort > meson-testsuites - meson introspect builddir --test | jq -r '.[].name' | grep 'libinput-test-suite' | sort > meson-testsuites
- | - |
cat <<EOF > ci-testsuites ; cat <<EOF > ci-testsuites ;

2
.gitlab-ci/ci.template
View file

@ -557,7 +557,7 @@ check-test-suites:
extends: extends:
- .{{distro.name}}-build@template - .{{distro.name}}-build@template
script: script:
- meson builddir - meson setup builddir
- meson introspect builddir --test | jq -r '.[].name' | grep 'libinput-test-suite' | sort > meson-testsuites - meson introspect builddir --test | jq -r '.[].name' | grep 'libinput-test-suite' | sort > meson-testsuites
- | - |
cat <<EOF > ci-testsuites ; cat <<EOF > ci-testsuites ;

8
doc/user/building.rst
View file

@ -55,7 +55,7 @@ process below. A successful build requires the
$> git clone https://gitlab.freedesktop.org/libinput/libinput $> git clone https://gitlab.freedesktop.org/libinput/libinput
$> cd libinput $> cd libinput
$> meson --prefix=/usr builddir/ $> meson setup --prefix=/usr builddir/
$> ninja -C builddir/ $> ninja -C builddir/
$> sudo ninja -C builddir/ install $> 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 We recommend that users disable the documentation, it's not usually required
@ -96,7 +96,7 @@ again:
:: ::
$> rm -r builddir/ $> rm -r builddir/
$> meson --prefix=.... $> meson setup --prefix=....
.. _verifying_install: .. _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, more build dependencies. On systems where build dependencies are an issue,
options may be disabled with this meson command: :: 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: Where ``-Dsomefeature=false`` may be one of:

2
doc/user/contributing.rst
View file

@ -69,7 +69,7 @@ will be:
$> git clone https://gitlab.freedesktop.org/libinput/libinput $> git clone https://gitlab.freedesktop.org/libinput/libinput
$> cd libinput $> cd libinput
$> meson --prefix=/usr builddir/ $> meson setup --prefix=/usr builddir/
$> ninja -C builddir/ $> ninja -C builddir/
$> sudo ninja -C builddir/ install $> sudo ninja -C builddir/ install

2
doc/user/test-suite.rst
View file

@ -208,7 +208,7 @@ verification of distribution composes.
To configure libinput to install the tests, use the ``-Dinstall-tests=true`` To configure libinput to install the tests, use the ``-Dinstall-tests=true``
meson option:: meson option::
$ meson builddir -Dtests=true -Dinstall-tests=true <other options> $ meson setup builddir -Dtests=true -Dinstall-tests=true <other options>
.. _test-meson-suites: .. _test-meson-suites: