From 92aff34c34494f5159ac12c662c3ad64618b70f8 Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Mon, 2 Mar 2020 17:14:36 +0100
Subject: [PATCH] Update pre-build recipe

Create prebuild.sh script to perform all required actions.
Same script for all supported host OS.
Fixes #957 when path contains space.

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
 platform.txt              | 20 ++++----------------
 system/extras/prebuild.sh | 17 +++++++++++++++++
 2 files changed, 21 insertions(+), 16 deletions(-)
 create mode 100755 system/extras/prebuild.sh

diff --git a/platform.txt b/platform.txt
index 7dcec41104..ff4fb18822 100644
--- a/platform.txt
+++ b/platform.txt
@@ -99,25 +99,13 @@ build.flash_offset=0
 
 # Pre and post build hooks
 build.opt.name=build_opt.h
-build.opt.sourcepath={build.source.path}/{build.opt.name}
 build.opt.path={build.path}/sketch/{build.opt.name}
 
-build.src_wrapper.path={build.path}/sketch/SrcWrapper.cpp
+extras.path={build.system.path}/extras
 
-# Create sketch dir if not exists
-recipe.hooks.prebuild.1.pattern.windows=cmd /c if not exist "{build.path}\sketch" mkdir "{build.path}\sketch"
-recipe.hooks.prebuild.1.pattern.linux=bash -c "[ -f {build.path}/sketch ] || mkdir -p {build.path}/sketch"
-recipe.hooks.prebuild.1.pattern.macosx=bash -c "[ -f {build.path}/sketch ] || mkdir -p {build.path}/sketch"
-
-# Create empty {build.opt} if not exists in the sketch dir
-recipe.hooks.prebuild.2.pattern.windows=cmd /c if not exist "{build.opt.sourcepath}" type NUL > "{build.opt.path}"
-recipe.hooks.prebuild.2.pattern.linux=bash -c "[ -f {build.opt.sourcepath} ] || touch {build.opt.path}"
-recipe.hooks.prebuild.2.pattern.macosx=bash -c "[ -f {build.opt.sourcepath} ] || touch {build.opt.path}"
-
-# Force include of SrcWrapper library
-recipe.hooks.prebuild.3.pattern.windows=cmd /c echo #include ^<SrcWrapper.h^> > "{build.src_wrapper.path}"
-recipe.hooks.prebuild.3.pattern.linux=bash -c "echo $0 > {build.src_wrapper.path}" "#include <SrcWrapper.h>"
-recipe.hooks.prebuild.3.pattern.macosx=bash -c "echo $0 > {build.src_wrapper.path}" "#include <SrcWrapper.h>"
+# Create empty {build.opt} if not exists in the output sketch dir and force include of SrcWrapper library
+recipe.hooks.prebuild.1.pattern="{extras.path}/prebuild.sh" "{build.path}" "{build.source.path}" 
+recipe.hooks.prebuild.1.pattern.windows="{runtime.tools.STM32Tools.path}/tools/win/busybox.exe" sh "{extras.path}/prebuild.sh" "{build.path}" "{build.source.path}"
 
 # compile patterns
 # ---------------------
diff --git a/system/extras/prebuild.sh b/system/extras/prebuild.sh
new file mode 100755
index 0000000000..2b5076a8ae
--- /dev/null
+++ b/system/extras/prebuild.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+BUILD_PATH="$1"
+BUILD_SOURCE_PATH="$2"
+
+# Create sketch dir if not exists
+if [ ! -f "$BUILD_PATH/sketch" ]; then
+  mkdir -p "$BUILD_PATH/sketch"
+fi
+
+# Create empty build.opt.h if not exists in the original sketch dir
+if [ ! -f "$BUILD_SOURCE_PATH/build_opt.h" ]; then
+  touch "$BUILD_PATH/sketch/build_opt.h"
+fi
+
+# Force include of SrcWrapper library
+echo "#include <SrcWrapper.h>" >"$BUILD_PATH/sketch/SrcWrapper.cpp"