erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-18 22:37:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Apply suggestions from code review

Browse source 
Co-authored-by: Marc Durdin <marc@durdin.net>
This commit is contained in:
Darcy Wong 2023-02-23 12:57:19 +07:00 • committed by GitHub
parent 0555028892
commit cb29cd0599
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
android/KMEA/build.sh
View file

@ -37,7 +37,7 @@ DEBUG="debug"
RELEASE="release"
builder_describe "Builds Keyman Engine for Android (KMEA)." \
"@../../web configure" \
"@../../web" \
"clean" \
"configure" \
"build" \
@ -113,25 +113,13 @@ if builder_start_action configure; then
echo "Copying es6-shim polyfill"
cp $KEYMAN_ROOT/node_modules/es6-shim/es6-shim.min.js $KMEA_ASSETS/es6-shim.min.js
if [ $? -ne 0 ]; then
builder_die "ERROR: copying artifacts failed"
fi
# Cursory check that KMW exists
if [ ! -f "$KMEA_ASSETS/keymanandroid.js" ]; then
builder_die "ERROR: keymanweb not built"
fi
builder_finish_action success configure
fi
if builder_start_action clean:engine; then
if [ -f "$KMA_ROOT/KMEA/app/build/outputs/aar/$ARTIFACT" ]; then
rm -f "$KMA_ROOT/KMEA/app/build/outputs/aar/$ARTIFACT"
echo "Cleaned $ARTIFACT"
else
echo "Nothing to clean"
fi
rm -f "$KMA_ROOT/KMEA/app/build/outputs/aar/$ARTIFACT"
builder_finish_action success clean:engine
fi
@ -141,15 +129,11 @@ fi
if builder_start_action build:engine; then
echo "Gradle Build of KMEA"
cd $KMA_ROOT/KMEA
cd "$KMA_ROOT/KMEA"
echo "BUILD_FLAGS $BUILD_FLAGS"
# Build without test
./gradlew $DAEMON_FLAG clean $BUILD_FLAGS
if [ $? -ne 0 ]; then
builder_die "ERROR: Build of KMEA failed"
fi
# TODO: remove _copy_artifacts() when all the Android projects have builder
_copy_artifacts
@ -158,8 +142,7 @@ if builder_start_action build:engine; then
fi
if builder_start_action test:engine; then
echo "Gradle test of KMEA"
cd $KMA_ROOT/KMEA
cd "$KMA_ROOT/KMEA"
if builder_has_option --ci; then
# Report JUnit test results to CI
@ -168,9 +151,6 @@ if builder_start_action test:engine; then
echo "TEST_FLAGS: $TEST_FLAGS"
./gradlew $DAEMON_FLAG $TEST_FLAGS
if [ $? -ne 0 ]; then
builder_die "ERROR: KMEA test cases failed"
fi
builder_finish_action success test:engine
fi