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: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3113>
This commit is contained in:
parent
26e8408b92
commit
96ecdba855
@ -16,6 +16,7 @@ usage() {
|
|||||||
|
|
||||||
-Dkey=val Option to pass to meson setup
|
-Dkey=val Option to pass to meson setup
|
||||||
--dist Run meson dist
|
--dist Run meson dist
|
||||||
|
--wipe Wipe build directory and reconfigure
|
||||||
|
|
||||||
-h, --help Display this help
|
-h, --help Display this help
|
||||||
|
|
||||||
@ -49,6 +50,7 @@ TEMP=$(getopt \
|
|||||||
--options 't:D:h' \
|
--options 't:D:h' \
|
||||||
--longoptions 'toolbox:' \
|
--longoptions 'toolbox:' \
|
||||||
--longoptions 'dist' \
|
--longoptions 'dist' \
|
||||||
|
--longoptions 'wipe' \
|
||||||
--longoptions 'help' \
|
--longoptions 'help' \
|
||||||
-- "$@") || die "Run $(basename $0) --help to see available options"
|
-- "$@") || die "Run $(basename $0) --help to see available options"
|
||||||
|
|
||||||
@ -69,6 +71,11 @@ while true; do
|
|||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
--wipe)
|
||||||
|
WIPE=--wipe
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
|
||||||
-D)
|
-D)
|
||||||
MESON_OPTIONS+=(-D$2)
|
MESON_OPTIONS+=(-D$2)
|
||||||
shift 2
|
shift 2
|
||||||
@ -94,7 +101,7 @@ BUILD_DIR=build-$TOOLBOX
|
|||||||
needs_reconfigure && RECONFIGURE=--reconfigure
|
needs_reconfigure && RECONFIGURE=--reconfigure
|
||||||
|
|
||||||
toolbox run --container $TOOLBOX sh -c "
|
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 &&
|
meson compile -C $BUILD_DIR &&
|
||||||
sudo meson install -C $BUILD_DIR &&
|
sudo meson install -C $BUILD_DIR &&
|
||||||
$DIST
|
$DIST
|
||||||
|
Loading…
x
Reference in New Issue
Block a user