From 2a01de731fa51fd0d2c811b0223790c7b60d5994 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 24 Jun 2021 11:23:49 +0200 Subject: [PATCH] added ninja scripts --- ...e_cmake_debug_cfg.sh => make_debug_cfg.sh} | 0 ...e_relwithdeb_cfg.sh => make_reldeb_cfg.sh} | 0 ...ake_release_cfg.sh => make_release_cfg.sh} | 0 cmake/scripts/Q7S/ninja_debug_cfg.sh | 23 +++++++++++++++++++ ...e_cmake_debug_cfg.sh => make_debug_cfg.sh} | 0 ...e_relwithdeb_cfg.sh => make_reldeb_cfg.sh} | 0 ...ake_release_cfg.sh => make_release_cfg.sh} | 0 ...e_cmake_size_cfg.sh => ninja_debug_cfg.sh} | 12 ++++------ 8 files changed, 27 insertions(+), 8 deletions(-) rename cmake/scripts/Q7S/{create_cmake_debug_cfg.sh => make_debug_cfg.sh} (100%) rename cmake/scripts/Q7S/{create_cmake_relwithdeb_cfg.sh => make_reldeb_cfg.sh} (100%) rename cmake/scripts/Q7S/{create_cmake_release_cfg.sh => make_release_cfg.sh} (100%) create mode 100755 cmake/scripts/Q7S/ninja_debug_cfg.sh rename cmake/scripts/RPi/{create_cmake_debug_cfg.sh => make_debug_cfg.sh} (100%) rename cmake/scripts/RPi/{create_cmake_relwithdeb_cfg.sh => make_reldeb_cfg.sh} (100%) rename cmake/scripts/RPi/{create_cmake_release_cfg.sh => make_release_cfg.sh} (100%) rename cmake/scripts/RPi/{create_cmake_size_cfg.sh => ninja_debug_cfg.sh} (63%) diff --git a/cmake/scripts/Q7S/create_cmake_debug_cfg.sh b/cmake/scripts/Q7S/make_debug_cfg.sh similarity index 100% rename from cmake/scripts/Q7S/create_cmake_debug_cfg.sh rename to cmake/scripts/Q7S/make_debug_cfg.sh diff --git a/cmake/scripts/Q7S/create_cmake_relwithdeb_cfg.sh b/cmake/scripts/Q7S/make_reldeb_cfg.sh similarity index 100% rename from cmake/scripts/Q7S/create_cmake_relwithdeb_cfg.sh rename to cmake/scripts/Q7S/make_reldeb_cfg.sh diff --git a/cmake/scripts/Q7S/create_cmake_release_cfg.sh b/cmake/scripts/Q7S/make_release_cfg.sh similarity index 100% rename from cmake/scripts/Q7S/create_cmake_release_cfg.sh rename to cmake/scripts/Q7S/make_release_cfg.sh diff --git a/cmake/scripts/Q7S/ninja_debug_cfg.sh b/cmake/scripts/Q7S/ninja_debug_cfg.sh new file mode 100755 index 00000000..3a8ac631 --- /dev/null +++ b/cmake/scripts/Q7S/ninja_debug_cfg.sh @@ -0,0 +1,23 @@ +#!/bin/sh +counter=0 +while [ ${counter} -lt 5 ] +do + cd .. + if [ -f "cmake_build_config.py" ];then + break + fi + counter=$((counter=counter + 1)) +done + +if [ "${counter}" -ge 5 ];then + echo "cmake_build_config.py not found in upper directories!" + exit 1 +fi + +os_fsfw="linux" +tgt_bsp="arm/q7s" +build_dir="build-Debug-Q7S" +build_generator="Ninja" + +python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \ + -l"${build_dir}" diff --git a/cmake/scripts/RPi/create_cmake_debug_cfg.sh b/cmake/scripts/RPi/make_debug_cfg.sh similarity index 100% rename from cmake/scripts/RPi/create_cmake_debug_cfg.sh rename to cmake/scripts/RPi/make_debug_cfg.sh diff --git a/cmake/scripts/RPi/create_cmake_relwithdeb_cfg.sh b/cmake/scripts/RPi/make_reldeb_cfg.sh similarity index 100% rename from cmake/scripts/RPi/create_cmake_relwithdeb_cfg.sh rename to cmake/scripts/RPi/make_reldeb_cfg.sh diff --git a/cmake/scripts/RPi/create_cmake_release_cfg.sh b/cmake/scripts/RPi/make_release_cfg.sh similarity index 100% rename from cmake/scripts/RPi/create_cmake_release_cfg.sh rename to cmake/scripts/RPi/make_release_cfg.sh diff --git a/cmake/scripts/RPi/create_cmake_size_cfg.sh b/cmake/scripts/RPi/ninja_debug_cfg.sh similarity index 63% rename from cmake/scripts/RPi/create_cmake_size_cfg.sh rename to cmake/scripts/RPi/ninja_debug_cfg.sh index f7bad84e..c05ae446 100755 --- a/cmake/scripts/RPi/create_cmake_size_cfg.sh +++ b/cmake/scripts/RPi/ninja_debug_cfg.sh @@ -16,12 +16,8 @@ fi os_fsfw="linux" tgt_bsp="arm/raspberrypi" -build_generator="" -if [ "${OS}" = "Windows_NT" ]; then - build_generator="MinGW Makefiles" -# Could be other OS but this works for now. -else - build_generator="Unix Makefiles" -fi +build_generator="Ninja" +build_dir="build-Debug-RPi" -python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "size" -t "${tgt_bsp}" +python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \ + -l"${build_dir}"