Skip to content

Commit fd4fda0

Browse files
Fix desktop build
1 parent 2fc6331 commit fd4fda0

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

internal_filesystem/boot.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# This file is the only one that can't be overridden (without rebuilding) for development, so keep it minimal.
1+
# This file is the only one that can't be overridden (without rebuilding) for development because it's not in lib/, so keep it minimal.
22

3-
# Make sure the storage partition's /lib is first in the path, so whatever is placed there overrides frozen libraries
4-
# This allows a "prod[uction]" build to be used for development as well, just by overriding the libraries in /lib
3+
# Make sure the storage partition's lib/ is first in the path, so whatever is placed there overrides frozen libraries.
4+
# This allows any build to be used for development as well, just by overriding the libraries in lib/
55
import sys
6-
sys.path.insert(0, '/lib')
6+
sys.path.insert(0, 'lib')
77

88
print("Passing execution over to MicroPythonOS's main.py")
99
import mpos.main

scripts/build_mpos.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,11 @@ if [ "$target" == "esp32" ]; then
9898
elif [ "$target" == "unix" -o "$target" == "macOS" ]; then
9999
manifest=$(readlink -f "$codebasedir"/manifests/manifest.py)
100100
frozenmanifest="FROZEN_MANIFEST=$manifest"
101-
# build for desktop
102-
#python3 make.py "$target" DISPLAY=sdl_display INDEV=sdl_pointer INDEV=sdl_keyboard "$manifest"
103101
# LV_CFLAGS are passed to USER_C_MODULES
104102
# STRIP= makes it so that debug symbols are kept
105103
pushd "$codebasedir"/lvgl_micropython/
106104
# USER_C_MODULE doesn't seem to work properly so there are symlinks in lvgl_micropython/extmod/
107-
python3 make.py "$target" LV_CFLAGS="-g -O0 -ggdb -ljpeg" STRIP= DISPLAY=sdl_display INDEV=sdl_pointer INDEV=sdl_keyboard "$manifest"
105+
python3 make.py "$target" LV_CFLAGS="-g -O0 -ggdb -ljpeg" STRIP= DISPLAY=sdl_display INDEV=sdl_pointer INDEV=sdl_keyboard "$frozenmanifest"
108106
popd
109107
else
110108
echo "invalid target $target"

scripts/install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ find apps/ -maxdepth 1 -type l | while read symlink; do
5252

5353
done
5454

55-
echo "Unmounting builtin/ so that it can be customized..." # not sure this is necessary
56-
$mpremote exec "import os ; os.umount('/builtin')"
55+
#echo "Unmounting builtin/ so that it can be customized..." # not sure this is necessary
56+
#$mpremote exec "import os ; os.umount('/builtin')"
5757
$mpremote fs cp -r builtin :/
5858
$mpremote fs cp -r lib :/
5959

0 commit comments

Comments
 (0)