summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2023-05-04 20:35:39 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2023-05-05 09:44:56 +1000
commit98b3314278f581f4ab9b3a5170341bdd7aea3719 (patch)
treead74b93803431ea1a2f19aee2afefc3b1ecfb56b
parent536cf42704cc15b377a25a7fb101a48631c3700f (diff)
downloadlibxkbcommon-98b3314278f581f4ab9b3a5170341bdd7aea3719.tar.gz
libxkbcommon-98b3314278f581f4ab9b3a5170341bdd7aea3719.tar.bz2
libxkbcommon-98b3314278f581f4ab9b3a5170341bdd7aea3719.zip
README: use meson compile/test over ninja
This is backend-agnostic and the recommended way to invoke compilation. This requires meson 0.55 (July 2020) and we only require 0.51 but at this point I'm expecting most users who require the README instructions will have a recent-enough meson anyway.
-rw-r--r--README.md6
-rwxr-xr-xfuzz/fuzz.sh2
2 files changed, 4 insertions, 4 deletions
diff --git a/README.md b/README.md
index 4425578..84bbcaa 100644
--- a/README.md
+++ b/README.md
@@ -14,8 +14,8 @@ See [Quick Guide](doc/quick-guide.md).
libxkbcommon is built with [Meson](http://mesonbuild.com/):
meson setup build
- ninja -C build
- ninja -C build test # Run the tests.
+ meson compile -C build
+ meson test -C build # Run the tests.
To build for use with Wayland, you can disable X11 support while still
using the X11 keyboard configuration resource files thusly:
@@ -24,7 +24,7 @@ using the X11 keyboard configuration resource files thusly:
-Denable-x11=false \
-Dxkb-config-root=/usr/share/X11/xkb \
-Dx-locale-root=/usr/share/X11/locale
- ninja -C build
+ meson compile -C build
## API
diff --git a/fuzz/fuzz.sh b/fuzz/fuzz.sh
index 65aab9c..1dc1476 100755
--- a/fuzz/fuzz.sh
+++ b/fuzz/fuzz.sh
@@ -13,5 +13,5 @@ esac
export CC=afl-clang-fast
export AFL_HARDEN=1
test -d fuzz/build || meson setup -Db_lto=true fuzz/build
-ninja -C fuzz/build
+meson compile -C fuzz/build
afl-fuzz -i fuzz/$1/testcases -x fuzz/$1/dict -o fuzz/$1/findings -t 200 -m 10 -- ./fuzz/build/fuzz-$1 @@