InfiniTime.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index be8ef41f00dd7197a8b681978f30fdcab8cb0920..1da460c4994a0554ca8e4d0f587bdb2551bb8acb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,6 +54,10 @@ if(BUILD_DFU)
   set(BUILD_DFU true)
 endif()
 
+if(BUILD_RESOURCES)
+  set(BUILD_RESOURCES true)
+endif()
+
 set(TARGET_DEVICE "PINETIME" CACHE STRING "Target device")
 set_property(CACHE TARGET_DEVICE PROPERTY STRINGS PINETIME MOY-TFK5 MOY-TIN5 MOY-TON5 MOY-UNK)
 
@@ -97,6 +101,11 @@ if(BUILD_DFU)
   message("    * Build DFU (using adafruit-nrfutil) : Enabled")
 else()
   message("    * Build DFU (using adafruit-nrfutil) : Disabled")
+endif()
+if(BUILD_RESOURCES)
+  message("    * Build resources : Enabled")
+else()
+  message("    * Build resources : Disabled")
 endif()
 
 set(VERSION_EDIT_WARNING "// Do not edit this file, it is automatically generated by CMAKE!")




diff --git a/docker/Dockerfile b/docker/Dockerfile
index f2d187d0486361fd0c4e4d9a0ade196e0d97b5b3..927160dbebe60c37b17326665d1099353daabbfc 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -22,6 +22,12 @@       libssl-dev \
       python3-dev \
       git \
       apt-utils \
+      pkg-config \
+      libpixman-1-dev \
+      libcairo2-dev \
+      libpango-1.0-0 \
+      ibpango1.0-dev \
+      libpangocairo-1.0-0 \
     && curl -sL https://deb.nodesource.com/setup_18.x | bash - \
     && apt-get install -y nodejs \
     && rm -rf /var/cache/apt/* /var/lib/apt/lists/*;
@@ -32,6 +38,10 @@ RUN pip3 install adafruit-nrfutil
 RUN pip3 install -Iv cryptography==3.3
 RUN pip3 install cbor
 RUN npm i lv_font_conv@1.5.2 -g
+
+RUN npm i ts-node@10.9.1 -g
+RUN npm i @swc/core -g
+RUN npm i lv_img_conv@0.3.0 -g
 
 # build.sh knows how to compile
 COPY build.sh /opt/




diff --git a/docker/build.sh b/docker/build.sh
index 663390c4d2f5f897fde1c73b76e531a220c8a930..58dcccc1d8b7ff4b64f37d89a57babecd7b8fd5b 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -11,6 +11,10 @@ export SOURCES_DIR="${SOURCES_DIR:=/sources}"
 export BUILD_DIR="${BUILD_DIR:=$SOURCES_DIR/build}"
 export OUTPUT_DIR="${OUTPUT_DIR:=$SOURCES_DIR/build/output}"
 
+# Specify a folder with read/write access to NPM
+export NPM_DIR="$BUILD_DIR/npm"
+export npm_config_cache="${NPM_DIR}"
+
 export BUILD_TYPE=${BUILD_TYPE:=Release}
 export GCC_ARM_VER=${GCC_ARM_VER:="10.3-2021.10"}
 export NRF_SDK_VER=${NRF_SDK_VER:="nRF5_SDK_15.3.0_59ac345"}
@@ -62,7 +66,8 @@     -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
     -DUSE_OPENOCD=1 \
     -DARM_NONE_EABI_TOOLCHAIN_PATH="$TOOLS_DIR/$GCC_ARM_PATH" \
     -DNRF5_SDK_PATH="$TOOLS_DIR/$NRF_SDK_VER" \
-    -DBUILD_DFU=1
+    -DBUILD_DFU=1 \
+    -DBUILD_RESOURCES=1
 }
 
 CmakeBuild() {




diff --git a/docker/post_build.sh.in b/docker/post_build.sh.in
index 8c94471a38ce2b742d5ff29e15c505a025d125cc..5d82f3be9bdb7a3b409e9b30d4f6ff73c110beed 100755
--- a/docker/post_build.sh.in
+++ b/docker/post_build.sh.in
@@ -15,6 +15,8 @@
 cp "$BUILD_DIR/src/pinetime-mcuboot-recovery-loader-image-$PROJECT_VERSION.bin" "$OUTPUT_DIR/pinetime-mcuboot-recovery-loader-image-$PROJECT_VERSION.bin"
 cp "$BUILD_DIR/src/pinetime-mcuboot-recovery-loader-dfu-$PROJECT_VERSION.zip" "$OUTPUT_DIR/pinetime-mcuboot-recovery-loader-dfu-$PROJECT_VERSION.zip"
 
+cp "$BUILD_DIR/src/resources/infinitime-resources-$PROJECT_VERSION.zip" "$OUTPUT_DIR/infinitime-resources-$PROJECT_VERSION.zip"
+
 mkdir -p "$OUTPUT_DIR/src"
 cp $BUILD_DIR/src/*.bin "$OUTPUT_DIR/src/"
 cp $BUILD_DIR/src/*.hex "$OUTPUT_DIR/src/"




diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f81e7026a5a209b908e8d687453e245fe019469b..92f309a12e118a592638a62ed37138f68c5dce04 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -940,6 +940,10 @@         COMMAND ${CMAKE_OBJCOPY} -O binary ${EXECUTABLE_FILE_NAME}.out "${EXECUTABLE_FILE_NAME}.bin"
         COMMAND ${CMAKE_OBJCOPY} -O ihex ${EXECUTABLE_FILE_NAME}.out "${EXECUTABLE_FILE_NAME}.hex"
         COMMENT "post build steps for ${EXECUTABLE_FILE_NAME}")
 
+if(BUILD_RESOURCES)
+  add_dependencies(${EXECUTABLE_NAME} GenerateResources)
+endif()
+
 # Build binary intended to be used by bootloader
 set(EXECUTABLE_MCUBOOT_NAME "pinetime-mcuboot-app")
 set(EXECUTABLE_MCUBOOT_FILE_NAME ${EXECUTABLE_MCUBOOT_NAME}-${pinetime_VERSION_MAJOR}.${pinetime_VERSION_MINOR}.${pinetime_VERSION_PATCH})
@@ -972,6 +976,10 @@         COMMAND ${CMAKE_SOURCE_DIR}/tools/mcuboot/imgtool.py create --align 4 --version 1.0.0 --header-size 32 --slot-size 475136 --pad-header ${EXECUTABLE_MCUBOOT_FILE_NAME}.hex ${IMAGE_MCUBOOT_FILE_NAME_HEX}
         COMMAND ${CMAKE_SOURCE_DIR}/tools/mcuboot/imgtool.py create --align 4 --version 1.0.0 --header-size 32 --slot-size 475136 --pad-header ${EXECUTABLE_MCUBOOT_FILE_NAME}.bin ${IMAGE_MCUBOOT_FILE_NAME_BIN}
         COMMENT "post build steps for ${EXECUTABLE_MCUBOOT_FILE_NAME}"
         )
+
+if(BUILD_RESOURCES)
+  add_dependencies(${EXECUTABLE_MCUBOOT_NAME} GenerateResources)
+endif()
 
 if(BUILD_DFU)
   add_custom_command(TARGET ${EXECUTABLE_MCUBOOT_NAME}
@@ -1127,7 +1135,9 @@           COMMENT "post build (DFU) steps for ${EXECUTABLE_MCUBOOT_RECOVERYLOADER_FILE_NAME}"
           )
 endif()
 
-add_subdirectory(resources)
+if(BUILD_RESOURCES)
+  add_subdirectory(resources)
+endif()
 
 
 # FLASH




diff --git a/src/resources/generate-fonts.py b/src/resources/generate-fonts.py
index d6b47ab2021b54fcf45bd7c29d2f54796cad750a..20408166d328d88683e62e0114a7bcada1bd194d 100755
--- a/src/resources/generate-fonts.py
+++ b/src/resources/generate-fonts.py
@@ -20,7 +20,7 @@
 
 def gen_lvconv_line(lv_font_conv: str, dest: str, size: int, bpp: int, format: str, sources: typing.List[Source], compress:bool=False):
     if format != "lvgl" and format != "bin":
-        format = "lvgl"
+        format = "bin" if dest.lower().endswith(".bin") else "lvgl"
 
     args = [lv_font_conv, '--size', str(size), '--output', dest, '--bpp', str(bpp), '--format', format]
     if not compress: