From 2ef3e5269f44c4664a90ec04f3c2c0a7382800c1 Mon Sep 17 00:00:00 2001 From: Kjell Ahlstedt Date: Mon, 3 Apr 2023 11:18:19 +0200 Subject: README.md, CI: meson -> meson setup --- .github/workflows/meson-clang-10.yml | 2 +- .github/workflows/meson-gcc-10.yml | 2 +- .github/workflows/publish-docs.yml | 2 +- README.md | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/meson-clang-10.yml b/.github/workflows/meson-clang-10.yml index adab196..092c00e 100644 --- a/.github/workflows/meson-clang-10.yml +++ b/.github/workflows/meson-clang-10.yml @@ -19,7 +19,7 @@ jobs: # Install it with pip3 instead of apt. sudo pip3 install "meson>=0.55.0" export CXX=clang++-10 - meson -Dwarnings=fatal -Dwarning_level=3 -Dwerror=true _build + meson setup -Dwarnings=fatal -Dwarning_level=3 -Dwerror=true _build cd _build meson compile - name: Test diff --git a/.github/workflows/meson-gcc-10.yml b/.github/workflows/meson-gcc-10.yml index 46cc6b5..d358d7f 100644 --- a/.github/workflows/meson-gcc-10.yml +++ b/.github/workflows/meson-gcc-10.yml @@ -19,7 +19,7 @@ jobs: # Install it with pip3 instead of apt. sudo pip3 install "meson>=0.55.0" export CXX=g++-10 - meson -Dwarnings=fatal -Dwarning_level=3 -Dwerror=true _build + meson setup -Dwarnings=fatal -Dwarning_level=3 -Dwerror=true _build cd _build meson compile - name: Test diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml index 35434f8..95b0a6f 100644 --- a/.github/workflows/publish-docs.yml +++ b/.github/workflows/publish-docs.yml @@ -38,7 +38,7 @@ jobs: export ENV DEBIAN_FRONTEND=noninteractive sudo apt update sudo apt install libxml2-utils docbook5-xml docbook-xsl mm-common g++ meson ninja-build python3-setuptools python3-pip --yes - meson -Dbuild-documentation=true -Dbuild-examples=false -Dbuild-tests=false _build + meson setup -Dbuild-documentation=true -Dbuild-examples=false -Dbuild-tests=false _build meson compile -C _build - name: Collect Documentation # Collect all documentation to be published. diff --git a/README.md b/README.md index 5ffed35..dfc32e9 100644 --- a/README.md +++ b/README.md @@ -54,10 +54,10 @@ For instance: ```sh # If the tarball was made with Autotools, and you want to rebuild the reference # documentation, you must enable maintainer-mode: -$ meson --prefix=/some_directory --libdir=lib -Dmaintainer-mode=true your_builddir . +$ meson setup --prefix=/some_directory --libdir=lib -Dmaintainer-mode=true your_builddir . # If the tarball was made with Meson, or you don't want to rebuild the docs: -$ meson --prefix=/some_directory --libdir=lib your_builddir . +$ meson setup --prefix=/some_directory --libdir=lib your_builddir . # then: $ cd your_builddir @@ -105,7 +105,7 @@ Don't call the builddir 'build'. There is a directory called 'build' with files used by Autotools. ```sh -$ meson --prefix=/some_directory --libdir=lib your_builddir . +$ meson setup --prefix=/some_directory --libdir=lib your_builddir . $ cd your_builddir $ ninja $ ninja install -- cgit v1.2.1