From d68650c644da944cf0548abceb4f3945b006702d Mon Sep 17 00:00:00 2001 From: Thomas Farstrike Date: Mon, 20 Oct 2025 18:07:23 +0200 Subject: [PATCH] Increment version and improve build_all.sh --- internal_filesystem/lib/mpos/info.py | 2 +- scripts/build_all.sh | 24 +++++++++++++++++------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/internal_filesystem/lib/mpos/info.py b/internal_filesystem/lib/mpos/info.py index 4ed04d29..20d765de 100644 --- a/internal_filesystem/lib/mpos/info.py +++ b/internal_filesystem/lib/mpos/info.py @@ -1,4 +1,4 @@ -CURRENT_OS_VERSION = "0.1.2" +CURRENT_OS_VERSION = "0.2.0" # Unique string that defines the hardware, used by OSUpdate and the About app _hardware_id = "missing-hardware-info" diff --git a/scripts/build_all.sh b/scripts/build_all.sh index 2aea5d74..77568703 100755 --- a/scripts/build_all.sh +++ b/scripts/build_all.sh @@ -5,19 +5,29 @@ updatesdir=../updates/ buildfile="$builddir"/lvgl_micropy_ESP32_GENERIC_S3-SPIRAM_OCT-16.bin updatefile=../lvgl_micropython/lib/micropython/ports/esp32/build-ESP32_GENERIC_S3-SPIRAM_OCT/micropython.bin +version=$(grep CURRENT_OS_VERSION internal_filesystem/lib/mpos/info.py | cut -d "=" -f 2 | tr -d " " | tr -d '"') + +overwrite="$1" +if [ "$overwrite" != "--overwrite" ] && ls "$outdir"/*"$version"* 2>/dev/null; then + echo "WARNING: $version already exists, use --overwrite to overwrite it" + exit 1 +fi + +exit 0 + ./scripts/build_lvgl_micropython.sh esp32 prod fri3d-2024 -cp "$buildfile" "$outdir"/MicroPythonOS_fri3d-2024_prod -cp "$updatefile" "$updatesdir"/MicroPythonOS_fri3d-2024_prod.ota +cp "$buildfile" "$outdir"/MicroPythonOS_fri3d-2024_prod_"$version".bin +cp "$updatefile" "$updatesdir"/MicroPythonOS_fri3d-2024_prod_"$version".ota ./scripts/build_lvgl_micropython.sh esp32 dev fri3d-2024 -cp "$buildfile" "$outdir"/MicroPythonOS_fri3d-2024_dev +cp "$buildfile" "$outdir"/MicroPythonOS_fri3d-2024_dev_"$version".bin ./scripts/build_lvgl_micropython.sh esp32 prod waveshare-esp32-s3-touch-lcd-2 -cp "$buildfile" "$outdir"/MicroPythonOS_waveshare-esp32-s3-touch-lcd-2_prod -cp "$updatefile" "$updatesdir"/MicroPythonOS_waveshare-esp32-s3-touch-lcd-2_prod.ota +cp "$buildfile" "$outdir"/MicroPythonOS_waveshare-esp32-s3-touch-lcd-2_prod_"$version".bin +cp "$updatefile" "$updatesdir"/MicroPythonOS_waveshare-esp32-s3-touch-lcd-2_prod_"$version".ota ./scripts/build_lvgl_micropython.sh esp32 dev waveshare-esp32-s3-touch-lcd-2 -cp "$buildfile" "$outdir"/MicroPythonOS_waveshare-esp32-s3-touch-lcd-2_dev +cp "$buildfile" "$outdir"/MicroPythonOS_waveshare-esp32-s3-touch-lcd-2_dev_"$version".bin ./scripts/build_lvgl_micropython.sh unix dev -cp "$builddir"/lvgl_micropy_unix "$outdir"/MicroPythonOS_amd64_Linux +cp "$builddir"/lvgl_micropy_unix "$outdir"/MicroPythonOS_amd64_linux_"$version".elf