From e2a3d9f0c7a531d129501325e793fdd634babba8 Mon Sep 17 00:00:00 2001
From: Jean-François Milants <jf@codingfield.com>
Date: Sun, 11 Sep 2022 12:43:30 +0200
Subject: Small improvement in generate-fonts.py following code review. Add
 lv_img_conf in Docker image to build resources at build time.

---
 docker/Dockerfile       | 10 ++++++++++
 docker/build.sh         |  7 ++++++-
 docker/post_build.sh.in |  2 ++
 3 files changed, 18 insertions(+), 1 deletion(-)

(limited to 'docker')

diff --git a/docker/Dockerfile b/docker/Dockerfile
index f2d187d0..927160db 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -22,6 +22,12 @@ RUN apt-get update -qq \
       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/*;
@@ -33,6 +39,10 @@ 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 663390c4..58dcccc1 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 @@ CmakeGenerate() {
     -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 8c94471a..5d82f3be 100755
--- a/docker/post_build.sh.in
+++ b/docker/post_build.sh.in
@@ -15,6 +15,8 @@ cp "$BUILD_DIR/src/pinetime-mcuboot-app-dfu-$PROJECT_VERSION.zip" "$OUTPUT_DIR/p
 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/"
-- 
cgit v1.2.3