From e6a1aff6cee374d8888d89ec03e604f19a0a450d Mon Sep 17 00:00:00 2001
From: JF <jf@codingfield.com>
Date: Thu, 20 Aug 2020 09:38:10 +0200
Subject: [PATCH] Docker build : split build.sh into 2 scripts : build.sh that
 always exists and post_build.sh that is generated by cmake build.sh

---
 .gitignore                               |  2 +-
 docker/build.sh                          | 12 ++++++++++++
 docker/{build.sh.in => post_build.sh.in} | 11 ++---------
 src/CMakeLists.txt                       |  2 +-
 4 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100755 docker/build.sh
 rename docker/{build.sh.in => post_build.sh.in} (60%)

diff --git a/.gitignore b/.gitignore
index f21089e3..0cbee675 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@ cmake-build-*
 core
 sdk
 src/Version.h
-docker/build.sh
+docker/post_build.sh
diff --git a/docker/build.sh b/docker/build.sh
new file mode 100755
index 00000000..fcb819a6
--- /dev/null
+++ b/docker/build.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+export LC_ALL=C.UTF-8
+export LANG=C.UTF-8
+set -x
+
+mkdir /sources/build
+cd /sources/build
+
+cmake -DARM_NONE_EABI_TOOLCHAIN_PATH=/opt/gcc-arm-none-eabi-9-2020-q2-update -DNRF5_SDK_PATH=/opt/nRF5_SDK_15.3.0_59ac345 -DUSE_OPENOCD=1 ../
+make -j$(nproc)
+
+sh /sources/docker/post_build.sh
diff --git a/docker/build.sh.in b/docker/post_build.sh.in
similarity index 60%
rename from docker/build.sh.in
rename to docker/post_build.sh.in
index a5940e73..f5bf32fa 100755
--- a/docker/build.sh.in
+++ b/docker/post_build.sh.in
@@ -3,15 +3,9 @@ export LC_ALL=C.UTF-8
 export LANG=C.UTF-8
 set -x
 
-mkdir /sources/build
-cd /sources/build
-
-cmake -DARM_NONE_EABI_TOOLCHAIN_PATH=/opt/gcc-arm-none-eabi-9-2020-q2-update -DNRF5_SDK_PATH=/opt/nRF5_SDK_15.3.0_59ac345 -DUSE_OPENOCD=1 ../
-make -j$(nproc)
-
 mkdir -p /sources/build/output
-/opt/mcuboot/scripts/imgtool.py create --align 4 --version 1.0.0 --header-size 32 --slot-size 475136 --pad-header /sources/build/src/@EXECUTABLE_MCUBOOT_FILE_NAME@.bin /sources/build/output/@IMAGE_MCUBOOT_FILE_NAME@
-adafruit-nrfutil dfu genpkg --dev-type 0x0052 --application /sources/build/output/@IMAGE_MCUBOOT_FILE_NAME@ /sources/build/output/@DFU_FILE_NAME@
+/opt/mcuboot/scripts/imgtool.py create --align 4 --version 1.0.0 --header-size 32 --slot-size 475136 --pad-header /sources/build/src/pinetime-mcuboot-app-0.8.0.bin /sources/build/output/image-0.8.0.bin
+adafruit-nrfutil dfu genpkg --dev-type 0x0052 --application /sources/build/output/image-0.8.0.bin /sources/build/output/dfu-0.8.0.zip
 
 cp /sources/build/src/*.bin /sources/build/output/
 cp /sources/build/src/*.hex /sources/build/output/
@@ -20,4 +14,3 @@ cp /sources/build/src/*.map /sources/build/output/
 cp /sources/bootloader/mynewt_nosemi_4.1.7.elf.bin /sources/build/output/bootloader.bin
 
 
-
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9bd81842..63bb0591 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -721,4 +721,4 @@ elseif(USE_OPENOCD)
 
 endif()
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../docker/build.sh.in ${CMAKE_CURRENT_SOURCE_DIR}/../docker/build.sh)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../docker/post_build.sh.in ${CMAKE_CURRENT_SOURCE_DIR}/../docker/post_build.sh)