From c723ace718ec8ab8e3660d8c64f79784c7cc6d0d Mon Sep 17 00:00:00 2001 From: Lee Miller Date: Fri, 2 Feb 2024 21:48:13 +0200 Subject: [PATCH 1/5] Add .dockerignore mainly to avoid the .buildozer dir in local containers --- .dockerignore | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..77d72c64 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,7 @@ +bin +build +dist +__pycache__ +.buildozer +.tox +mprofile_* -- 2.45.1 From d08b07dd67daba1c15f849a94a09d6532f870796 Mon Sep 17 00:00:00 2001 From: Lee Miller Date: Fri, 2 Feb 2024 21:51:37 +0200 Subject: [PATCH 2/5] Update .gitignore by the stuff created by tox and buildozer --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 72e5700f..fc331499 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ src/**/*.so src/**/a.out build/lib.* build/temp.* +bin dist *.egg-info docs/_*/* @@ -19,6 +20,8 @@ docs/autodoc/ build pyan/ **.coverage +coverage.xml **htmlcov* **coverage.json - +.buildozer +.tox -- 2.45.1 From fde26f2ddac33654d1260b9044b2f0597f5047ad Mon Sep 17 00:00:00 2001 From: Lee Miller Date: Fri, 16 Feb 2024 21:28:36 +0200 Subject: [PATCH 3/5] Slightly edit the build script - copy apk; check package files in test.sh --- .buildbot/android/build.sh | 9 +++++---- .buildbot/android/test.sh | 6 ++++++ 2 files changed, 11 insertions(+), 4 deletions(-) create mode 100755 .buildbot/android/test.sh diff --git a/.buildbot/android/build.sh b/.buildbot/android/build.sh index 31fa06b8..10176ef3 100755 --- a/.buildbot/android/build.sh +++ b/.buildbot/android/build.sh @@ -1,8 +1,9 @@ -#!/bin/sh +#!/bin/bash export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 -cd packages/android +pushd packages/android buildozer android debug || exit $? -cd ../.. +popd + mkdir -p ../out -mv packages/android/bin/*.apk ../out \ No newline at end of file +cp packages/android/bin/*.apk ../out diff --git a/.buildbot/android/test.sh b/.buildbot/android/test.sh new file mode 100755 index 00000000..b61fac85 --- /dev/null +++ b/.buildbot/android/test.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +unzip -p packages/android/bin/*.apk assets/private.tar \ + | tar --list -z > package.list +cat package.list +cat package.list | grep '\.sql$' || exit 1 -- 2.45.1 From a10170b4e55a27251acb5d497c5e92c69a7808a4 Mon Sep 17 00:00:00 2001 From: Lee Miller Date: Thu, 1 Feb 2024 02:30:55 +0200 Subject: [PATCH 4/5] Include SQL scripts into the apk (fixes: #1949) --- packages/android/buildozer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/android/buildozer.spec b/packages/android/buildozer.spec index e560934f..c98717b4 100644 --- a/packages/android/buildozer.spec +++ b/packages/android/buildozer.spec @@ -13,7 +13,7 @@ package.domain = org.mock source.dir = ../../src # (list) Source files to include (let empty to include all the files) -source.include_exts = py,png,jpg,kv,atlas,tflite +source.include_exts = py,png,jpg,kv,atlas,tflite,sql # (list) List of inclusions using pattern matching #source.include_patterns = assets/*,images/*.png -- 2.45.1 From 65ae17f0ad18fba0bb82c2b8aa40cfeb884fe386 Mon Sep 17 00:00:00 2001 From: Lee Miller Date: Thu, 22 Feb 2024 01:38:10 +0200 Subject: [PATCH 5/5] Change permissions for whole ANDROID_SDK_HOME to enable updates by buildozer --- .buildbot/android/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildbot/android/Dockerfile b/.buildbot/android/Dockerfile index c649373a..2d722834 100755 --- a/.buildbot/android/Dockerfile +++ b/.buildbot/android/Dockerfile @@ -94,8 +94,8 @@ RUN useradd -m -U builder && mkdir /android WORKDIR /android -RUN chown -R builder.builder /android "${ANDROID_SDK_HOME}/.android" \ - && chmod -R go+w "${ANDROID_SDK_HOME}/.android" +RUN chown -R builder.builder /android "${ANDROID_SDK_HOME}" \ + && chmod -R go+w "${ANDROID_SDK_HOME}" USER builder -- 2.45.1