From 99cf25e050d20eca87c7c8a2257eb79654447fad Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Sun, 6 Sep 2020 13:37:14 +0200 Subject: [PATCH] Attempt to build all --- tools/make-all | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/tools/make-all b/tools/make-all index 0020102d0..78384ce19 100755 --- a/tools/make-all +++ b/tools/make-all @@ -8,18 +8,23 @@ else MAKE=make fi -if [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then - PRJMAKEFILEGENERATOR=prjMakefilesGenerator.sh -else - PRJMAKEFILEGENERATOR=prjMakefilesGenerator.bat -fi +unameOut="$(uname -s)" +case "${unameOut}" in + Linux*) PRJMAKEFILEGENERATOR=prjMakefilesGenerator.sh;; + Darwin*) PRJMAKEFILEGENERATOR=prjMakefilesGenerator.sh;; + CYGWIN*) PRJMAKEFILEGENERATOR=prjMakefilesGenerator.sh;; + //MINGW*) PRJMAKEFILEGENERATOR=prjMakefilesGenerator.sh;; + *) PRJMAKEFILEGENERATOR=prjMakefilesGenerator.bat +esac + +echo PRJMAKEFILEGENERATOR=$PRJMAKEFILEGENERATOR for PROJ in $PROJECTS; do echo =========================================== - echo $PROJ + echo "$PROJ" echo =========================================== - if ! $PRJMAKEFILEGENERATOR firmware/$PROJ; then echo "WARNING: failed to regenerate Makefiles."; fi - if ! $MAKE -C firmware/$PROJ "$@"; then echo FAILURE ; exit 1 ; fi + if ! $PRJMAKEFILEGENERATOR firmware/"$PROJ"; then echo "WARNING: failed to regenerate Makefiles."; fi + if ! $MAKE -C firmware/"$PROJ" "$@"; then echo FAILURE ; exit 1 ; fi done echo SUCCESS