Skip to content

Commit 54f11e5

Browse files
ThomasFarstrikeThomasFarstrike
committed
Remove main.py from manifests
This is now part of lib/
1 parent c8f725b commit 54f11e5

File tree

3 files changed

+13
-36
lines changed

3 files changed

+13
-36
lines changed

‎manifests/manifest.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
freeze('../internal_filesystem/', 'boot.py') # Hardware initialization
2-
freeze('../internal_filesystem/', 'main.py') # User Interface initialization
32
freeze('../internal_filesystem/lib', '') # Additional libraries
43
freeze('../freezeFS/', 'freezefs_mount_builtin.py') # Built-in apps

‎manifests/manifest_unix.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
freeze('../internal_filesystem/', 'boot_unix.py') # Hardware initialization
2-
freeze('../internal_filesystem/', 'main.py') # User Interface initialization
32
freeze('../internal_filesystem/lib', '') # Additional libraries
43
freeze('../freezeFS/', 'freezefs_mount_builtin.py') # Built-in apps

‎scripts/build_mpos.sh‎

Lines changed: 13 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,13 @@ target="$1"
88
buildtype="$2"
99
subtarget="$3"
1010

11-
if [ -z "$target" -o -z "$buildtype" ]; then
12-
echo "Usage: $0 target buildtype [optional subtarget]"
13-
echo "Usage: $0 <esp32 or unix or macOS> <dev or prod> [<waveshare-esp32-s3-touch-lcd-2 or fri3d-2024>]"
14-
echo "Example: $0 unix dev"
15-
echo "Example: $0 macOS dev"
16-
echo "Example: $0 esp32 dev fri3d-2024"
17-
echo "Example: $0 esp32 prod fri3d-2024"
18-
echo "Example: $0 esp32 dev waveshare-esp32-s3-touch-lcd-2"
19-
echo "Example: $0 esp32 prod waveshare-esp32-s3-touch-lcd-2"
11+
if [ -z "$target" ]; then
12+
echo "Usage: $0 target"
13+
echo "Usage: $0 <esp32 or unix or macOS>"
14+
echo "Example: $0 unix"
15+
echo "Example: $0 macOS"
16+
echo "Example: $0 esp32"
2017
echo
21-
echo "A 'dev' build is without any preinstalled files or builtin/ filsystem, so it will just start with a black screen and you'll have to do: ./scripts/install.sh to install the User Interface."
22-
echo "A 'prod' build has the files from manifest*.py frozen in. Don't forget to run: ./scripts/freezefs_mount_builtin.sh !"
2318
exit 1
2419
fi
2520

@@ -76,28 +71,14 @@ ln -sf ../../secp256k1-embedded-ecdh "$codebasedir"/lvgl_micropython/ext_mod/sec
7671
echo "Symlinking c_mpos for unix and macOS builds..."
7772
ln -sf ../../c_mpos "$codebasedir"/lvgl_micropython/ext_mod/c_mpos
7873

79-
if [ "$buildtype" == "prod" ]; then
80-
freezefs="$codebasedir"/scripts/freezefs_mount_builtin.sh
81-
echo "It's a $buildtype build, running $freezefs"
82-
$freezefs
83-
fi
84-
85-
74+
echo "Refreshing freezefs..."
75+
"$codebasedir"/scripts/freezefs_mount_builtin.sh
8676

8777
manifest=""
8878
if [ "$target" == "esp32" ]; then
89-
if [ "$buildtype" == "prod" ]; then
90-
if [ "$subtarget" == "fri3d-2024" ]; then
91-
cp internal_filesystem/boot_fri3d-2024.py /tmp/boot.py # dirty hack to have it included as boot.py by the manifest
92-
manifest="manifest_fri3d-2024.py"
93-
else
94-
manifest="manifest.py"
95-
fi
96-
manifest=$(readlink -f "$codebasedir"/manifests/"$manifest")
97-
frozenmanifest="FROZEN_MANIFEST=$manifest"
98-
else
99-
echo "Note that you can also prevent the builtin filesystem from being mounted by umounting it and creating a builtin/ folder."
100-
fi
79+
manifest=$(readlink -f "$codebasedir"/manifests/manifest.py)
80+
frozenmanifest="FROZEN_MANIFEST=$manifest"
81+
echo "Note that you can also prevent the builtin filesystem from being mounted by umounting it and creating a builtin/ folder."
10182
# Build for https://www.waveshare.com/wiki/ESP32-S3-Touch-LCD-2.
10283
# See https://github.com/lvgl-micropython/lvgl_micropython
10384
# --ota: support Over-The-Air updates
@@ -115,10 +96,8 @@ if [ "$target" == "esp32" ]; then
11596
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"
11697
popd
11798
elif [ "$target" == "unix" -o "$target" == "macOS" ]; then
118-
if [ "$buildtype" == "prod" ]; then
119-
manifest=$(readlink -f "$codebasedir"/manifests/manifest_unix.py)
120-
frozenmanifest="FROZEN_MANIFEST=$manifest"
121-
fi
99+
manifest=$(readlink -f "$codebasedir"/manifests/manifest.py)
100+
frozenmanifest="FROZEN_MANIFEST=$manifest"
122101
# build for desktop
123102
#python3 make.py "$target" DISPLAY=sdl_display INDEV=sdl_pointer INDEV=sdl_keyboard "$manifest"
124103
# LV_CFLAGS are passed to USER_C_MODULES

0 commit comments

Comments
 (0)