diff --git a/cmake/scripts/Linux/make_debug_cfg.sh b/cmake/scripts/Linux/make-debug-cfg.sh similarity index 53% rename from cmake/scripts/Linux/make_debug_cfg.sh rename to cmake/scripts/Linux/make-debug-cfg.sh index 39c9652..b5de37c 100755 --- a/cmake/scripts/Linux/make_debug_cfg.sh +++ b/cmake/scripts/Linux/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)) + if [ -f ${cfg_script_name} ];then + break + fi + counter=$((counter=counter + 1)) + cd .. done if [ "${counter}" -ge 5 ];then - echo "create_cmake_cfg.sh not found in upper directories!" - exit 1 + echo "${cfg_script_name} not found in upper directories!" + exit 1 fi build_generator="Unix Makefiles" @@ -20,7 +21,7 @@ builddir="build-Debug" echo "Running command (without the leading +):" set -x # Print command -python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" \ +${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "debug" \ -t "host/none" -l "${builddir}" # Use this if commands are added which should not be printed # set +x diff --git a/cmake/scripts/Linux/make_release_cfg.sh b/cmake/scripts/Linux/make-release-cfg.sh similarity index 53% rename from cmake/scripts/Linux/make_release_cfg.sh rename to cmake/scripts/Linux/make-release-cfg.sh index 4003a98..e5baa23 100755 --- a/cmake/scripts/Linux/make_release_cfg.sh +++ b/cmake/scripts/Linux/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 "create_cmake_cfg.sh not found in upper directories!" - exit 1 + echo "${cfg_script_name} not found in upper directories!" + exit 1 fi build_generator="Unix Makefiles" @@ -20,7 +21,7 @@ builddir="build-Release" echo "Running command (without the leading +):" set -x # Print command -python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "release" \ +${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "release" \ -t "host/none" -l "${builddir}" # Use this if commands are added which should not be printed # set +x diff --git a/cmake/scripts/Linux/make_size_cfg.sh b/cmake/scripts/Linux/make_size_cfg.sh deleted file mode 100755 index 7c5cc17..0000000 --- a/cmake/scripts/Linux/make_size_cfg.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/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 "create_cmake_cfg.sh not found in upper directories!" - exit 1 -fi - -build_generator="Unix Makefiles" -os_fsfw="linux" -builddir="build-Release" - -echo "Running command (without the leading +):" -set -x # Print command -python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "size"\ - -t "host/none" -l "${builddir}" -# Use this if commands are added which should not be printed -# set +x diff --git a/cmake/scripts/Linux/ninja_debug_cfg.sh b/cmake/scripts/Linux/ninja-debug-cfg.sh similarity index 52% rename from cmake/scripts/Linux/ninja_debug_cfg.sh rename to cmake/scripts/Linux/ninja-debug-cfg.sh index e8bd483..e1ef45f 100755 --- a/cmake/scripts/Linux/ninja_debug_cfg.sh +++ b/cmake/scripts/Linux/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)) + if [ -f ${cfg_script_name} ];then + break + fi + counter=$((counter=counter + 1)) + cd .. done if [ "${counter}" -ge 5 ];then - echo "create_cmake_cfg.sh not found in upper directories!" - exit 1 + echo "${cfg_script_name} not found in upper directories!" + exit 1 fi build_generator="Ninja" @@ -20,7 +21,7 @@ builddir="build-Debug" echo "Running command (without the leading +):" set -x # Print command -python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" \ +${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "debug" \ -t "host/none" -l "${builddir}" # Use this if commands are added which should not be printed # 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