From 0e0c4646b50bf49520b04b263e060f281c9c1425 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 2 Aug 2021 19:53:54 +0200 Subject: [PATCH] updated all build scripts --- .../{make_debug_cfg.sh => make-debug-cfg.sh} | 17 +++++++++-------- ...{make_release_cfg.sh => make-release-cfg.sh} | 0 .../{ninja_debug_cfg.sh => ninja-debug-cfg.sh} | 17 +++++++++-------- ...inja_release_cfg.sh => ninja-release-cfg.sh} | 17 +++++++++-------- .../{cmake_debug_cfg.sh => make-debug-cfg.sh} | 17 +++++++++-------- .../{make_debug_cfg.sh => make-debug-cfg.sh} | 17 +++++++++-------- ...{make_release_cfg.sh => make-release-cfg.sh} | 17 +++++++++-------- .../{ninja_debug_cfg.sh => ninja-debug-cfg.sh} | 17 +++++++++-------- ...inja_release_cfg.sh => ninja-release-cfg.sh} | 17 +++++++++-------- .../{cmake_debug_cfg.sh => make-debug-cfg.sh} | 17 +++++++++-------- ...cmake_build_config.py => cmake-build-cfg.py} | 0 11 files changed, 81 insertions(+), 72 deletions(-) rename cmake/scripts/BeagleBoneBlack/crosscompile/{make_debug_cfg.sh => make-debug-cfg.sh} (62%) rename cmake/scripts/BeagleBoneBlack/crosscompile/{make_release_cfg.sh => make-release-cfg.sh} (100%) rename cmake/scripts/BeagleBoneBlack/crosscompile/{ninja_debug_cfg.sh => ninja-debug-cfg.sh} (60%) rename cmake/scripts/BeagleBoneBlack/crosscompile/{ninja_release_cfg.sh => ninja-release-cfg.sh} (60%) rename cmake/scripts/BeagleBoneBlack/{cmake_debug_cfg.sh => make-debug-cfg.sh} (62%) rename cmake/scripts/RPi/crosscompile/{make_debug_cfg.sh => make-debug-cfg.sh} (62%) rename cmake/scripts/RPi/crosscompile/{make_release_cfg.sh => make-release-cfg.sh} (61%) rename cmake/scripts/RPi/crosscompile/{ninja_debug_cfg.sh => ninja-debug-cfg.sh} (59%) rename cmake/scripts/RPi/crosscompile/{ninja_release_cfg.sh => ninja-release-cfg.sh} (59%) rename cmake/scripts/RPi/{cmake_debug_cfg.sh => make-debug-cfg.sh} (62%) rename cmake/scripts/{cmake_build_config.py => cmake-build-cfg.py} (100%) diff --git a/cmake/scripts/BeagleBoneBlack/crosscompile/make_debug_cfg.sh b/cmake/scripts/BeagleBoneBlack/crosscompile/make-debug-cfg.sh similarity index 62% rename from cmake/scripts/BeagleBoneBlack/crosscompile/make_debug_cfg.sh rename to cmake/scripts/BeagleBoneBlack/crosscompile/make-debug-cfg.sh index bcab548..6661ad0 100755 --- a/cmake/scripts/BeagleBoneBlack/crosscompile/make_debug_cfg.sh +++ b/cmake/scripts/BeagleBoneBlack/crosscompile/make-debug-cfg.sh @@ -1,17 +1,18 @@ #!/bin/sh counter=0 +cfg_script_name="cmake-build-cfg.py" while [ ${counter} -lt 5 ] do - cd .. - if [ -f "cmake_build_config.py" ];then - break - fi - counter=$((counter=counter + 1)) + cd .. + if [ -f ${cfg_script_name} ];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 + echo "${cfg_script_name} not found in upper directories!" + exit 1 fi os_fsfw="linux" @@ -30,6 +31,6 @@ fi echo "Running command (without the leading +):" set -x # Print command -python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \ +${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \ -l "${builddir}" -d "${defines}" # set +x diff --git a/cmake/scripts/BeagleBoneBlack/crosscompile/make_release_cfg.sh b/cmake/scripts/BeagleBoneBlack/crosscompile/make-release-cfg.sh similarity index 100% rename from cmake/scripts/BeagleBoneBlack/crosscompile/make_release_cfg.sh rename to cmake/scripts/BeagleBoneBlack/crosscompile/make-release-cfg.sh diff --git a/cmake/scripts/BeagleBoneBlack/crosscompile/ninja_debug_cfg.sh b/cmake/scripts/BeagleBoneBlack/crosscompile/ninja-debug-cfg.sh similarity index 60% rename from cmake/scripts/BeagleBoneBlack/crosscompile/ninja_debug_cfg.sh rename to cmake/scripts/BeagleBoneBlack/crosscompile/ninja-debug-cfg.sh index c897b6a..d9a4d16 100755 --- a/cmake/scripts/BeagleBoneBlack/crosscompile/ninja_debug_cfg.sh +++ b/cmake/scripts/BeagleBoneBlack/crosscompile/ninja-debug-cfg.sh @@ -1,17 +1,18 @@ #!/bin/sh counter=0 +cfg_script_name="cmake-build-cfg.py" while [ ${counter} -lt 5 ] do - cd .. - if [ -f "cmake_build_config.py" ];then - break - fi - counter=$((counter=counter + 1)) + cd .. + if [ -f ${cfg_script_name} ];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 + echo "${cfg_script_name} not found in upper directories!" + exit 1 fi os_fsfw="linux" @@ -30,6 +31,6 @@ fi echo "Running command (without the leading +):" set -x # Print command -python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \ +${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \ -l "${builddir}" -d "${defines}" # set +x diff --git a/cmake/scripts/BeagleBoneBlack/crosscompile/ninja_release_cfg.sh b/cmake/scripts/BeagleBoneBlack/crosscompile/ninja-release-cfg.sh similarity index 60% rename from cmake/scripts/BeagleBoneBlack/crosscompile/ninja_release_cfg.sh rename to cmake/scripts/BeagleBoneBlack/crosscompile/ninja-release-cfg.sh index c79d369..d57d3cc 100755 --- a/cmake/scripts/BeagleBoneBlack/crosscompile/ninja_release_cfg.sh +++ b/cmake/scripts/BeagleBoneBlack/crosscompile/ninja-release-cfg.sh @@ -1,17 +1,18 @@ #!/bin/sh counter=0 +cfg_script_name="cmake-build-cfg.py" while [ ${counter} -lt 5 ] do - cd .. - if [ -f "cmake_build_config.py" ];then - break - fi - counter=$((counter=counter + 1)) + cd .. + if [ -f ${cfg_script_name} ];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 + echo "${cfg_script_name} not found in upper directories!" + exit 1 fi os_fsfw="linux" @@ -30,6 +31,6 @@ fi echo "Running command (without the leading +):" set -x # Print command -python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "release" -t "${tgt_bsp}" \ +${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "release" -t "${tgt_bsp}" \ -l "${builddir}" -d "${defines}" # set +x diff --git a/cmake/scripts/BeagleBoneBlack/cmake_debug_cfg.sh b/cmake/scripts/BeagleBoneBlack/make-debug-cfg.sh similarity index 62% rename from cmake/scripts/BeagleBoneBlack/cmake_debug_cfg.sh rename to cmake/scripts/BeagleBoneBlack/make-debug-cfg.sh index 6c4d63e..fd818d6 100755 --- a/cmake/scripts/BeagleBoneBlack/cmake_debug_cfg.sh +++ b/cmake/scripts/BeagleBoneBlack/make-debug-cfg.sh @@ -1,17 +1,18 @@ #!/bin/sh counter=0 +cfg_script_name="cmake-build-cfg.py" while [ ${counter} -lt 5 ] do - cd .. - if [ -f "cmake_build_config.py" ];then - break - fi - counter=$((counter=counter + 1)) + cd .. + if [ -f ${cfg_script_name} ];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 + echo "${cfg_script_name} not found in upper directories!" + exit 1 fi os_fsfw="linux" @@ -29,6 +30,6 @@ else fi echo "Running command (without the leading +):" set -x # Print command -${python} cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \ +${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \ -l "${builddir}" -d "${defines}" # set +x diff --git a/cmake/scripts/RPi/crosscompile/make_debug_cfg.sh b/cmake/scripts/RPi/crosscompile/make-debug-cfg.sh similarity index 62% rename from cmake/scripts/RPi/crosscompile/make_debug_cfg.sh rename to cmake/scripts/RPi/crosscompile/make-debug-cfg.sh index 2c3e868..6b6c4e9 100755 --- a/cmake/scripts/RPi/crosscompile/make_debug_cfg.sh +++ b/cmake/scripts/RPi/crosscompile/make-debug-cfg.sh @@ -1,17 +1,18 @@ #!/bin/sh counter=0 +cfg_script_name="cmake-build-cfg.py" while [ ${counter} -lt 5 ] do - cd .. - if [ -f "cmake_build_config.py" ];then - break - fi - counter=$((counter=counter + 1)) + cd .. + if [ -f ${cfg_script_name} ];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 + echo "${cfg_script_name} not found in upper directories!" + exit 1 fi os_fsfw="linux" @@ -30,6 +31,6 @@ fi echo "Running command (without the leading +):" set -x # Print command -python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \ +${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \ -l "${builddir}" -d "${defines}" # set +x diff --git a/cmake/scripts/RPi/crosscompile/make_release_cfg.sh b/cmake/scripts/RPi/crosscompile/make-release-cfg.sh similarity index 61% rename from cmake/scripts/RPi/crosscompile/make_release_cfg.sh rename to cmake/scripts/RPi/crosscompile/make-release-cfg.sh index 470c6f1..2e4ad29 100755 --- a/cmake/scripts/RPi/crosscompile/make_release_cfg.sh +++ b/cmake/scripts/RPi/crosscompile/make-release-cfg.sh @@ -1,17 +1,18 @@ #!/bin/sh counter=0 +cfg_script_name="cmake-build-cfg.py" while [ ${counter} -lt 5 ] do - cd .. - if [ -f "cmake_build_config.py" ];then - break - fi - counter=$((counter=counter + 1)) + cd .. + if [ -f ${cfg_script_name} ];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 + echo "${cfg_script_name} not found in upper directories!" + exit 1 fi os_fsfw="linux" @@ -30,6 +31,6 @@ fi echo "Running command (without the leading +):" set -x # Print command -python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "release" -t "${tgt_bsp}" \ +${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "release" -t "${tgt_bsp}" \ -l "${builddir}" -d "${defines}" # set +x diff --git a/cmake/scripts/RPi/crosscompile/ninja_debug_cfg.sh b/cmake/scripts/RPi/crosscompile/ninja-debug-cfg.sh similarity index 59% rename from cmake/scripts/RPi/crosscompile/ninja_debug_cfg.sh rename to cmake/scripts/RPi/crosscompile/ninja-debug-cfg.sh index 165b2b6..3125455 100755 --- a/cmake/scripts/RPi/crosscompile/ninja_debug_cfg.sh +++ b/cmake/scripts/RPi/crosscompile/ninja-debug-cfg.sh @@ -1,17 +1,18 @@ #!/bin/sh counter=0 +cfg_script_name="cmake-build-cfg.py" while [ ${counter} -lt 5 ] do - cd .. - if [ -f "cmake_build_config.py" ];then - break - fi - counter=$((counter=counter + 1)) + cd .. + if [ -f ${cfg_script_name} ];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 + echo "${cfg_script_name} not found in upper directories!" + exit 1 fi os_fsfw="linux" @@ -30,6 +31,6 @@ fi echo "Running command (without the leading +):" set -x # Print command -python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \ +${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \ -l "${builddir}" -d "${defines}" # set +x diff --git a/cmake/scripts/RPi/crosscompile/ninja_release_cfg.sh b/cmake/scripts/RPi/crosscompile/ninja-release-cfg.sh similarity index 59% rename from cmake/scripts/RPi/crosscompile/ninja_release_cfg.sh rename to cmake/scripts/RPi/crosscompile/ninja-release-cfg.sh index 927a554..a08a9d9 100755 --- a/cmake/scripts/RPi/crosscompile/ninja_release_cfg.sh +++ b/cmake/scripts/RPi/crosscompile/ninja-release-cfg.sh @@ -1,17 +1,18 @@ #!/bin/sh counter=0 +cfg_script_name="cmake-build-cfg.py" while [ ${counter} -lt 5 ] do - cd .. - if [ -f "cmake_build_config.py" ];then - break - fi - counter=$((counter=counter + 1)) + cd .. + if [ -f ${cfg_script_name} ];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 + echo "${cfg_script_name} not found in upper directories!" + exit 1 fi os_fsfw="linux" @@ -30,6 +31,6 @@ fi echo "Running command (without the leading +):" set -x # Print command -python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "release" -t "${tgt_bsp}" \ +${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "release" -t "${tgt_bsp}" \ -l "${builddir}" -d "${defines}" # set +x diff --git a/cmake/scripts/RPi/cmake_debug_cfg.sh b/cmake/scripts/RPi/make-debug-cfg.sh similarity index 62% rename from cmake/scripts/RPi/cmake_debug_cfg.sh rename to cmake/scripts/RPi/make-debug-cfg.sh index 2d4f57d..9bc0d59 100755 --- a/cmake/scripts/RPi/cmake_debug_cfg.sh +++ b/cmake/scripts/RPi/make-debug-cfg.sh @@ -1,17 +1,18 @@ #!/bin/sh counter=0 +cfg_script_name="cmake-build-cfg.py" while [ ${counter} -lt 5 ] do - cd .. - if [ -f "cmake_build_config.py" ];then - break - fi - counter=$((counter=counter + 1)) + cd .. + if [ -f ${cfg_script_name} ];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 + echo "${cfg_script_name} not found in upper directories!" + exit 1 fi os_fsfw="linux" @@ -29,6 +30,6 @@ else fi echo "Running command (without the leading +):" set -x # Print command -${python} cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \ +${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \ -l "${builddir}" -d "${defines}" # set +x diff --git a/cmake/scripts/cmake_build_config.py b/cmake/scripts/cmake-build-cfg.py similarity index 100% rename from cmake/scripts/cmake_build_config.py rename to cmake/scripts/cmake-build-cfg.py