From c48eece590d392e3f822af316c89557f54bb8415 Mon Sep 17 00:00:00 2001 From: Mason Donahue Date: Sun, 18 Oct 2015 14:40:18 -0500 Subject: [PATCH] Exit quickly when cmake or make fail The compilation process itself doesn't take very long, but it's weird to let it continue trying to build when we've encountered an error worthy of changing cmake/make's return codes. This gives clear indication of a failed build as the last line of the script's output. --- Keyboards/cmake.bash | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Keyboards/cmake.bash b/Keyboards/cmake.bash index 9142526..3a1b6e4 100644 --- a/Keyboards/cmake.bash +++ b/Keyboards/cmake.bash @@ -82,7 +82,18 @@ done mkdir -p "${BuildPath}" cd "${BuildPath}" cmake -DCHIP="${Chip}" -DCOMPILER="${Compiler}" -DScanModule="${ScanModule}" -DMacroModule="${MacroModule}" -DOutputModule="${OutputModule}" -DDebugModule="${DebugModule}" -DBaseMap="${BaseMap}" -DDefaultMap="${DefaultMap}" -DPartialMaps="${PartialMapsExpanded}" "${CMakeListsPath}" +return_code=$? +if [ $return_code != 0 ] ; then + echo "Error in cmake. Exiting..." + exit $return_code +fi + make +return_code=$? +if [ $return_code != 0 ] ; then + echo "Error in make. Exiting..." + exit $return_code +fi echo "Firmware has been compiled into: '${BuildPath}'" cd -