From 5c1ee234324c1cdf26209f4e35e240602f0d6b69 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 22 May 2022 16:48:04 +0200 Subject: [PATCH] update helper scripts --- cmake/scripts/make-release-cfg.sh | 33 --------------------- cmake/scripts/make-size-cfg.sh | 33 --------------------- cmake/scripts/ninja-debug-cfg.sh | 32 -------------------- cmake/scripts/stm32h7-make-release.sh | 42 +++++++++++++++++++++++++++ cmake/scripts/stm32h7-make-size.sh | 42 +++++++++++++++++++++++++++ cmake/scripts/stm32h7-ninja-debug.sh | 41 ++++++++++++++++++++++++++ 6 files changed, 125 insertions(+), 98 deletions(-) delete mode 100755 cmake/scripts/make-release-cfg.sh delete mode 100755 cmake/scripts/make-size-cfg.sh delete mode 100755 cmake/scripts/ninja-debug-cfg.sh create mode 100755 cmake/scripts/stm32h7-make-release.sh create mode 100755 cmake/scripts/stm32h7-make-size.sh create mode 100755 cmake/scripts/stm32h7-ninja-debug.sh diff --git a/cmake/scripts/make-release-cfg.sh b/cmake/scripts/make-release-cfg.sh deleted file mode 100755 index 35b2b9c..0000000 --- a/cmake/scripts/make-release-cfg.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -counter=0 -cfg_script_name="cmake-build-cfg.py" -while [ ${counter} -lt 5 ] -do - if [ -f ${cfg_script_name} ];then - break - fi - counter=$((counter=counter + 1)) - cd .. -done - -if [ "${counter}" -ge 5 ];then - echo "${cfg_script_name} not found in upper directories!" - exit 1 -fi - -build_generator="" -os_fsfw="freertos" -builddir="build-Release" -if [ "${OS}" = "Windows_NT" ]; then - build_generator="MinGW Makefiles" - python="py" -# Could be other OS but this works for now. -else - build_generator="Unix Makefiles" - python="python3" -fi - -echo "Running command (without the leading +):" -set -x # Print command -${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "release" -l "${builddir}" -# set +x \ No newline at end of file diff --git a/cmake/scripts/make-size-cfg.sh b/cmake/scripts/make-size-cfg.sh deleted file mode 100755 index a9fb4ca..0000000 --- a/cmake/scripts/make-size-cfg.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -counter=0 -cfg_script_name="cmake-build-cfg.py" -while [ ${counter} -lt 5 ] -do - if [ -f ${cfg_script_name} ];then - break - fi - counter=$((counter=counter + 1)) - cd .. -done - -if [ "${counter}" -ge 5 ];then - echo "${cfg_script_name} not found in upper directories!" - exit 1 -fi - -build_generator="" -os_fsfw="freertos" -builddir="build-Release" -if [ "${OS}" = "Windows_NT" ]; then - build_generator="MinGW Makefiles" - python="py" -# Could be other OS but this works for now. -else - build_generator="Unix Makefiles" - python="python3" -fi - -echo "Running command (without the leading +):" -set -x # Print command -${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "size" -l "${builddir}" -# set +x \ No newline at end of file diff --git a/cmake/scripts/ninja-debug-cfg.sh b/cmake/scripts/ninja-debug-cfg.sh deleted file mode 100755 index b8c328b..0000000 --- a/cmake/scripts/ninja-debug-cfg.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -counter=0 -cfg_script_name="cmake-build-cfg.py" -while [ ${counter} -lt 5 ] -do - if [ -f ${cfg_script_name} ];then - break - fi - counter=$((counter=counter + 1)) - cd .. -done - -if [ "${counter}" -ge 5 ];then - echo "${cfg_script_name} not found in upper directories!" - exit 1 -fi - -build_generator="" -os_fsfw="freertos" -builddir="build-Debug" -build_generator="Ninja" -if [ "${OS}" = "Windows_NT" ]; then - python="py" -# Could be other OS but this works for now. -else - python="python3" -fi - -echo "Running command (without the leading +):" -set -x # Print command -${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "debug" -l "${builddir}" -# set +x \ No newline at end of file diff --git a/cmake/scripts/stm32h7-make-release.sh b/cmake/scripts/stm32h7-make-release.sh new file mode 100755 index 0000000..6fca058 --- /dev/null +++ b/cmake/scripts/stm32h7-make-release.sh @@ -0,0 +1,42 @@ +#!/bin/sh +counter=0 +init_dir=$(pwd) +cfg_script_name="cmake-build-cfg.py" +cfg_script="" +if [ ! -z ${REPO_ROOT} ]; then + cfg_script=${REPO_ROOT}/cmake/${cfg_script_name} +else + while [ ${counter} -lt 5 ] + do + if [ -f ${cfg_script_name} ];then + cfg_script=$(pwd)/${cfg_script_name} + break + fi + counter=$((counter=counter + 1)) + cd .. + done + + if [ "${counter}" -ge 5 ];then + echo "${cfg_script_name} not found in upper directories!" + cd ${init_dir} + exit 1 + fi + cd ${init_dir} +fi + +build_generator="" +os_fsfw="freertos" +builddir="cmake-build-release" +if [ "${OS}" = "Windows_NT" ]; then + build_generator="MinGW Makefiles" + python="py" +# Could be other OS but this works for now. +else + build_generator="Unix Makefiles" + python="python3" +fi + +echo "Running command (without the leading +):" +set -x # Print command +${python} ${cfg_script} -o "${os_fsfw}" -g "${build_generator}" -b "release" -l "${builddir}" +# set +x diff --git a/cmake/scripts/stm32h7-make-size.sh b/cmake/scripts/stm32h7-make-size.sh new file mode 100755 index 0000000..25d6891 --- /dev/null +++ b/cmake/scripts/stm32h7-make-size.sh @@ -0,0 +1,42 @@ +#!/bin/sh +counter=0 +init_dir=$(pwd) +cfg_script_name="cmake-build-cfg.py" +cfg_script="" +if [ ! -z ${REPO_ROOT} ]; then + cfg_script=${REPO_ROOT}/cmake/${cfg_script_name} +else + while [ ${counter} -lt 5 ] + do + if [ -f ${cfg_script_name} ];then + cfg_script=$(pwd)/${cfg_script_name} + break + fi + counter=$((counter=counter + 1)) + cd .. + done + + if [ "${counter}" -ge 5 ];then + echo "${cfg_script_name} not found in upper directories!" + cd ${init_dir} + exit 1 + fi + cd ${init_dir} +fi + +build_generator="" +os_fsfw="freertos" +builddir="cmake-build-size" +if [ "${OS}" = "Windows_NT" ]; then + build_generator="MinGW Makefiles" + python="py" +# Could be other OS but this works for now. +else + build_generator="Unix Makefiles" + python="python3" +fi + +echo "Running command (without the leading +):" +set -x # Print command +${python} ${cfg_script} -o "${os_fsfw}" -g "${build_generator}" -b "size" -l "${builddir}" +# set +x diff --git a/cmake/scripts/stm32h7-ninja-debug.sh b/cmake/scripts/stm32h7-ninja-debug.sh new file mode 100755 index 0000000..c24f29b --- /dev/null +++ b/cmake/scripts/stm32h7-ninja-debug.sh @@ -0,0 +1,41 @@ +#!/bin/sh +counter=0 +init_dir=$(pwd) +cfg_script_name="cmake-build-cfg.py" +cfg_script="" +if [ ! -z ${REPO_ROOT} ]; then + cfg_script=${REPO_ROOT}/cmake/${cfg_script_name} +else + while [ ${counter} -lt 5 ] + do + if [ -f ${cfg_script_name} ];then + cfg_script=$(pwd)/${cfg_script_name} + break + fi + counter=$((counter=counter + 1)) + cd .. + done + + if [ "${counter}" -ge 5 ];then + echo "${cfg_script_name} not found in upper directories!" + cd ${init_dir} + exit 1 + fi + cd ${init_dir} +fi + +build_generator="" +os_fsfw="freertos" +builddir="cmake-build-debug" +build_generator="Ninja" +if [ "${OS}" = "Windows_NT" ]; then + python="py" +# Could be other OS but this works for now. +else + python="python3" +fi + +echo "Running command (without the leading +):" +set -x # Print command +${python} ${cfg_script} -o "${os_fsfw}" -g "${build_generator}" -b "debug" -l "${builddir}" +# set +x