build.sh: get the variant name from the Zephyr build system

Get the variant name (NORMALIZED_BOARD_TARGET) from the Zephyr build
system as early as possible. This allows to have per-target build
directories.

Note that a bug with the shield specifiers does not currently allow to
reuse the same build directory multiple times.

Author: pillo79

extra/build.sh

@@ -21,29 +21,45 @@ fi
 
 source venv/bin/activate
 
-rm -rf build
+ZEPHYR_BASE=$(west topdir)/zephyr
+
+# Get the variant name (NORMALIZED_BOARD_TARGET in Zephyr)
+tmpdir=$(mktemp -d)
+variant=$(cmake -DBOARD=$board -S loader -DMODULES=boards -B${tmpdir} -P ${ZEPHYR_BASE}/cmake/package_helper.cmake -R $(pwd)/extra/get_variant_name.cmake | grep 'VARIANT=' | cut -d '=' -f 2)
+rm -rf ${tmpdir}
+
+if [ -z "${variant}" ] ; then
+	echo "Failed to get variant name from '$board'"
+	exit 1
+fi
 
 echo && echo && echo
+echo ${variant}
+echo ${variant} | sed -e 's/./=/g'
+echo
 
-west build loader -b $board -t llext-edk $*
-tar xfp build/zephyr/llext-edk.tar.Z
-variant=$(cat llext-edk/Makefile.cflags | grep BOARD_TARGET | cut -d'=' -f2 | tr -d '" ')
+# Build the loader
+BUILD_DIR=build/${variant}
+VARIANT_DIR=variants/${variant}
+rm -rf ${BUILD_DIR}
+west build -d ${BUILD_DIR} -b ${board} loader -t llext-edk $*
+
+# Extract the generated EDK tarball and copy it to the variant directory
+mkdir -p ${VARIANT_DIR} firmwares
+(set -e ; cd ${BUILD_DIR} && rm -rf llext-edk && tar xf zephyr/llext-edk.tar.Z)
+rsync -a --delete ${BUILD_DIR}/llext-edk ${VARIANT_DIR}/
 
 # remove all inline comments in macro definitions
 # (especially from devicetree_generated.h and sys/util_internal.h)
 line_preproc_ok='^\s*#\s*(if|else|elif|endif)' # match conditional preproc lines
 line_comment_only='^\s*\/\*' # match lines starting with comment
 line_continuation='\\$' # match lines ending with '\'
 c_comment='\s*\/\*.*?\*\/' # match C-style comments and any preceding space
-perl -i -pe "s/${c_comment}//gs unless /${line_preproc_ok}/ || (/${line_comment_only}/ && !/${line_continuation}/)" $(find llext-edk/include/ -type f)
-
-mkdir -p firmwares variants/$variant
-rm -rf variants/$variant/llext-edk
-mv llext-edk variants/$variant/
+perl -i -pe "s/${c_comment}//gs unless /${line_preproc_ok}/ || (/${line_comment_only}/ && !/${line_continuation}/)" $(find ${VARIANT_DIR}/llext-edk/include/ -type f)
 for ext in elf bin hex; do
-    rm -f build/zephyr/zephyr-$variant.$ext
-    if [ -f build/zephyr/zephyr.$ext ]; then
-        cp build/zephyr/zephyr.$ext firmwares/zephyr-$variant.$ext
+    rm -f firmwares/zephyr-$variant.$ext
+    if [ -f ${BUILD_DIR}/zephyr/zephyr.$ext ]; then
+        cp ${BUILD_DIR}/zephyr/zephyr.$ext firmwares/zephyr-$variant.$ext
     fi
 done
 

extra/get_variant_name.cmake

@@ -0,0 +1 @@
+message(STATUS "VARIANT=${NORMALIZED_BOARD_TARGET}")