summaryrefslogtreecommitdiff
path: root/Meta
diff options
context:
space:
mode:
authorTimothy Flynn <trflynn89@pm.me>2023-01-26 06:51:48 -0500
committerTim Flynn <trflynn89@pm.me>2023-01-27 08:14:24 -0500
commitad8183beb4ce22e09bede15be05b39d9b1587e4b (patch)
treedd10955402cf65bb0ea66d91c6a19247a69a310a /Meta
parent9743445e44781ad2c07b6d3c3cfeb9769f937dcd (diff)
downloadserenity-ad8183beb4ce22e09bede15be05b39d9b1587e4b.zip
Meta: Support running ladybird with arguments from serenity.sh
You may now, for example, run: ./Meta/serenity.sh run lagom ladybird https://serenityos.org
Diffstat (limited to 'Meta')
-rwxr-xr-xMeta/serenity.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/Meta/serenity.sh b/Meta/serenity.sh
index 31986f1e58..eb985da2b6 100755
--- a/Meta/serenity.sh
+++ b/Meta/serenity.sh
@@ -402,6 +402,7 @@ run_gdb() {
}
build_and_run_lagom_target() {
+ local run_target="${1}"
local lagom_target="${CMD_ARGS[0]}"
local lagom_args
@@ -415,7 +416,7 @@ build_and_run_lagom_target() {
# Then existing list separators must be replaced with a semicolon for CMake.
lagom_args=$(IFS=';' ; echo -e "${cmd_args[*]}")
- LAGOM_TARGET="${lagom_target}" LAGOM_ARGS="${lagom_args[*]}" build_target "run-lagom-target"
+ LAGOM_TARGET="${lagom_target}" LAGOM_ARGS="${lagom_args[*]}" build_target "${run_target}"
}
if [[ "$CMD" =~ ^(build|install|image|copy-src|run|gdb|test|rebuild|recreate|kaddr2line|addr2line|setup-and-run)$ ]]; then
@@ -447,10 +448,9 @@ if [[ "$CMD" =~ ^(build|install|image|copy-src|run|gdb|test|rebuild|recreate|kad
run)
if [ "$TARGET" = "lagom" ]; then
if [ "${CMD_ARGS[0]}" = "ladybird" ]; then
- build_target "${CMD_ARGS[0]}"
- ninja -C "$BUILD_DIR" run-ladybird
+ build_and_run_lagom_target "run-ladybird"
else
- build_and_run_lagom_target
+ build_and_run_lagom_target "run-lagom-target"
fi
else
build_target