From 96ecdba855d1b8f04894164849cfb4228eb69864 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Fri, 12 Jan 2024 14:28:03 +0100 Subject: [PATCH] tools/toolbox: Expose --wipe meson flag It's useful when the existing build directory became invalid, for instance after a meson update, and exposing it directly from the wrapper script is more convenient than removing the directory or entering the toolbox manually to invoke meson. Part-of: --- tools/toolbox/meson-build.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/toolbox/meson-build.sh b/tools/toolbox/meson-build.sh index 82234f119..a8d79f1fd 100755 --- a/tools/toolbox/meson-build.sh +++ b/tools/toolbox/meson-build.sh @@ -16,6 +16,7 @@ usage() { -Dkey=val Option to pass to meson setup --dist Run meson dist + --wipe Wipe build directory and reconfigure -h, --help Display this help @@ -49,6 +50,7 @@ TEMP=$(getopt \ --options 't:D:h' \ --longoptions 'toolbox:' \ --longoptions 'dist' \ + --longoptions 'wipe' \ --longoptions 'help' \ -- "$@") || die "Run $(basename $0) --help to see available options" @@ -69,6 +71,11 @@ while true; do shift ;; + --wipe) + WIPE=--wipe + shift + ;; + -D) MESON_OPTIONS+=(-D$2) shift 2 @@ -94,7 +101,7 @@ BUILD_DIR=build-$TOOLBOX needs_reconfigure && RECONFIGURE=--reconfigure toolbox run --container $TOOLBOX sh -c " - meson setup --prefix=/usr $RECONFIGURE ${MESON_OPTIONS[*]} $BUILD_DIR && + meson setup --prefix=/usr $RECONFIGURE $WIPE ${MESON_OPTIONS[*]} $BUILD_DIR && meson compile -C $BUILD_DIR && sudo meson install -C $BUILD_DIR && $DIST