Skip to content

Commit b23677a

Browse files
ThomasFarstrikeThomasFarstrike
committed
Move manifests to manifests/ folder, rename build script
1 parent f19387b commit b23677a

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

manifest.py renamed to manifests/manifest.py

File renamed without changes.

manifest_fri3d-2024.py renamed to manifests/manifest_fri3d-2024.py

File renamed without changes.

manifest_unix.py renamed to manifests/manifest_unix.py

File renamed without changes.

scripts/build_lvgl_micropython.sh renamed to scripts/build_mpos.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ if [ "$target" == "esp32" ]; then
7575
else
7676
manifest="manifest.py"
7777
fi
78+
manifest=$(readlink -f "$codebasedir"/manifests/"$manifest")
79+
frozenmanifest="FROZEN_MANIFEST=$manifest"
7880
else
7981
echo "Note that you can also prevent the builtin filesystem from being mounted by umounting it and creating a builtin/ folder."
8082
fi
@@ -91,19 +93,18 @@ if [ "$target" == "esp32" ]; then
9193
# CONFIG_FREERTOS_USE_TRACE_FACILITY=y
9294
# CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID=y
9395
# CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y
94-
[ ! -z "$manifest" ] && frozenmanifest="FROZEN_MANIFEST="$(readlink -f "$manifest")
9596
pushd "$codebasedir"/lvgl_micropython/
9697
python3 make.py --ota --partition-size=4194304 --flash-size=16 esp32 BOARD=ESP32_GENERIC_S3 BOARD_VARIANT=SPIRAM_OCT DISPLAY=st7789 INDEV=cst816s USER_C_MODULE="$codebasedir"/micropython-camera-API/src/micropython.cmake USER_C_MODULE="$codebasedir"/secp256k1-embedded-ecdh/micropython.cmake USER_C_MODULE="$codebasedir"/c_mpos/micropython.cmake CONFIG_FREERTOS_USE_TRACE_FACILITY=y CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID=y CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y "$frozenmanifest"
9798
popd
9899
elif [ "$target" == "unix" -o "$target" == "macOS" ]; then
99100
if [ "$buildtype" == "prod" ]; then
100-
manifest="manifest_unix.py"
101+
manifest=$(readlink -f "$codebasedir"/manifests/manifest_unix.py)
102+
frozenmanifest="FROZEN_MANIFEST=$manifest"
101103
fi
102104
# build for desktop
103105
#python3 make.py "$target" DISPLAY=sdl_display INDEV=sdl_pointer INDEV=sdl_keyboard "$manifest"
104106
# LV_CFLAGS are passed to USER_C_MODULES
105107
# STRIP= makes it so that debug symbols are kept
106-
[ ! -z "$manifest" ] && frozenmanifest="FROZEN_MANIFEST="$(readlink -f "$manifest")
107108
pushd "$codebasedir"/lvgl_micropython/
108109
# USER_C_MODULE doesn't seem to work properly so there are symlinks in lvgl_micropython/extmod/
109110
python3 make.py "$target" LV_CFLAGS="-g -O0 -ggdb -ljpeg" STRIP= DISPLAY=sdl_display INDEV=sdl_pointer INDEV=sdl_keyboard "$manifest"

0 commit comments

Comments
 (0)