Merge pull request #8329 from keymanapp/fix/linux/build.sh

fix(linux): Fix ibus-keyman/build.sh
This commit is contained in:
Eberhard Beilharz 2023-02-28 08:32:43 +01:00 committed by GitHub
commit 8e1ebbca11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -19,8 +19,7 @@ builder_describe \
"test" \
"install install artifacts" \
"uninstall uninstall artifacts" \
"--debug,-d Debug build" \
"--output=OUTPUT_PATH,-o Output path (default: ../build/)"
"--debug,-d Debug build"
# We can't yet depend on core until it moved to the new build.sh syntax
# (currently it doesn't know some parameters that we're passing)
# "@/core configure build"
@ -35,12 +34,7 @@ if builder_has_option --debug; then
else
MESON_TARGET=release
fi
if builder_has_option --output; then
OUTPUT_PATH=$(readlink -f "$OUTPUT_PATH")
else
OUTPUT_PATH="$THIS_SCRIPT_PATH/../build"
fi
MESON_PATH="$OUTPUT_PATH/$(uname -m)/$MESON_TARGET"
MESON_PATH="../build/$(uname -m)/$MESON_TARGET"
builder_describe_outputs \
configure "${MESON_PATH}/build.ninja" \
@ -48,7 +42,7 @@ builder_describe_outputs \
build "${MESON_PATH}/tests/ibus-keyman-tests"
if builder_start_action clean; then
rm -rf "${OUTPUT_PATH:?}/"
rm -rf "$THIS_SCRIPT_PATH/../build/"
builder_finish_action success clean
fi