From 9568d4ca14d46eee5444951e195be26073c38187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Chiotti?= <44336112+maelchiotti@users.noreply.github.com> Date: Tue, 24 Dec 2024 15:57:33 +0100 Subject: [PATCH] [325] build mimir --- scripts/isar/fdroid_build_isar.sh | 16 +++--- scripts/mimir/fdroid_build_mimir.sh | 82 ++++++++++++++++++++++++++++- 2 files changed, 88 insertions(+), 10 deletions(-) diff --git a/scripts/isar/fdroid_build_isar.sh b/scripts/isar/fdroid_build_isar.sh index a15540ad..e9a687cc 100644 --- a/scripts/isar/fdroid_build_isar.sh +++ b/scripts/isar/fdroid_build_isar.sh @@ -22,21 +22,21 @@ x64() { } armv7() { - echo "Building libisar for armv7" + echo "Building libisar for armv7" - bash tool/build_android.sh armv7 + bash tool/build_android.sh armv7 - mv libisar_android_armv7.so libisar.so - mv libisar.so "$PUB_CACHE"/hosted/pub.isar-community.dev/isar_flutter_libs-*/android/src/main/jniLibs/armeabi-v7a/ + mv libisar_android_armv7.so libisar.so + mv libisar.so "$PUB_CACHE"/hosted/pub.isar-community.dev/isar_flutter_libs-*/android/src/main/jniLibs/armeabi-v7a/ } arm64() { - echo "Building libisar for arm64" + echo "Building libisar for arm64" - bash tool/build_android.sh arm64 + bash tool/build_android.sh arm64 - mv libisar_android_arm64.so libisar.so - mv libisar.so "$PUB_CACHE"/hosted/pub.isar-community.dev/isar_flutter_libs-*/android/src/main/jniLibs/arm64-v8a/ + mv libisar_android_arm64.so libisar.so + mv libisar.so "$PUB_CACHE"/hosted/pub.isar-community.dev/isar_flutter_libs-*/android/src/main/jniLibs/arm64-v8a/ } test -d .isar || exit diff --git a/scripts/mimir/fdroid_build_mimir.sh b/scripts/mimir/fdroid_build_mimir.sh index 2fe21b19..4ca397fd 100644 --- a/scripts/mimir/fdroid_build_mimir.sh +++ b/scripts/mimir/fdroid_build_mimir.sh @@ -1,9 +1,88 @@ #!/usr/bin/env sh +# Pass no parameters to build mimir for all architectures, +# or pass the desired architectures (x86, x64, armv7, arm64) + +x86() { + echo "Building mimir for x86" + + bash scripts/build-android.sh x86 + + cd platform-build + mv libembedded_milli_android_x86.so libembedded_milli.so + mv libembedded_milli.so "$PUB_CACHE"/hosted/pub.dev/flutter_mimir-*/android/src/main/jniLibs/x86/ +} + +x64() { + echo "Building mimir for x64" + + bash scripts/build-android.sh x64 + + cd platform-build + mv libembedded_milli_android_x64.so libembedded_milli.so + mv libembedded_milli.so "$PUB_CACHE"/hosted/pub.dev/flutter_mimir-*/android/src/main/jniLibs/x86_64/ +} + +armv7() { + echo "Building mimir for armv7" + + bash scripts/build-android.sh armv7 + + cd platform-build + mv libembedded_milli_android_armv7.so libembedded_milli.so + mv libembedded_milli.so "$PUB_CACHE"/hosted/pub.dev/flutter_mimir-*/android/src/main/jniLibs/armeabi-v7a/ +} + +arm64() { + echo "Building mimir for arm64" + + bash scripts/build-android.sh arm64 + + cd platform-build + mv libembedded_milli_android_arm64.so libembedded_milli.so + mv libembedded_milli.so "$PUB_CACHE"/hosted/pub.dev/flutter_mimir-*/android/src/main/jniLibs/arm64-v8a/ +} + test -d .mimir || exit cp .mimir-cargo.lock .mimir/Cargo.lock + +for dir in "$PUB_CACHE"/hosted/pub.dev/flutter_mimir-*; do + echo "Creating directory $dir/android/src/main/jniLibs" + mkdir "$dir"/android/src/main/jniLibs +done + ( cd .mimir || exit + if [ "$#" -eq 0 ]; then + x86 + x64 + armv7 + arm64 + else + for arch in "$@" + do + case $arch in + "x86") + x86 + ;; + "x64") + x64 + ;; + "armv7") + armv7 + ;; + "arm64") + arm64 + ;; + *) + echo "Invalid architecture: '$arch'" + esac + done + fi +) + + + echo "Building mimir" @@ -13,5 +92,4 @@ cp .mimir-cargo.lock .mimir/Cargo.lock echo "Creating directory $dir/android/src/main/jniLibs" mkdir "$dir"/android/src/main/jniLibs done - mv platform-build/EmbeddedMilliAndroid.tar.gz "$PUB_CACHE"/hosted/pub.dev/flutter_mimir-*/android/src/main/jniLibs/ -) \ No newline at end of file + mv platform-build/EmbeddedMilliAndroid.tar.gz "$PUB_CACHE"/hosted/pub.dev/flutter_mimir-*/android/src/main/jniLibs/ \ No newline at end of file