From 7a293b459f52f9bb7709f11914a31db8a56c3495 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 2 Aug 2021 20:22:12 +0200 Subject: [PATCH] updated build scripts --- ...cmake_build_config.py => cmake-build-cfg.py} | 0 .../{make_debug_cfg.sh => make-debug-cfg.sh} | 4 ++-- .../{make_size_cfg.sh => make-release-cfg.sh} | 17 +++++++++-------- .../{make_release_cfg.sh => make-size-cfg.sh} | 17 +++++++++-------- .../{ninja_debug_cfg.sh => ninja-debug-cfg.sh} | 17 +++++++++-------- example_common | 2 +- fsfw | 2 +- 7 files changed, 31 insertions(+), 28 deletions(-) rename cmake/scripts/{cmake_build_config.py => cmake-build-cfg.py} (100%) rename cmake/scripts/{make_debug_cfg.sh => make-debug-cfg.sh} (84%) rename cmake/scripts/{make_size_cfg.sh => make-release-cfg.sh} (56%) rename cmake/scripts/{make_release_cfg.sh => make-size-cfg.sh} (56%) rename cmake/scripts/{ninja_debug_cfg.sh => ninja-debug-cfg.sh} (53%) 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 diff --git a/cmake/scripts/make_debug_cfg.sh b/cmake/scripts/make-debug-cfg.sh similarity index 84% rename from cmake/scripts/make_debug_cfg.sh rename to cmake/scripts/make-debug-cfg.sh index fbced84..6a465c1 100755 --- a/cmake/scripts/make_debug_cfg.sh +++ b/cmake/scripts/make-debug-cfg.sh @@ -28,5 +28,5 @@ fi echo "Running command (without the leading +):" set -x # Print command -${python} cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -l "${builddir}" -# set +x \ No newline at end of file +${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "debug" -l "${builddir}" +# set +x diff --git a/cmake/scripts/make_size_cfg.sh b/cmake/scripts/make-release-cfg.sh similarity index 56% rename from cmake/scripts/make_size_cfg.sh rename to cmake/scripts/make-release-cfg.sh index 146e00d..35b2b9c 100755 --- a/cmake/scripts/make_size_cfg.sh +++ b/cmake/scripts/make-release-cfg.sh @@ -1,17 +1,18 @@ #!/bin/sh counter=0 +cfg_script_name="cmake-build-cfg.py" while [ ${counter} -lt 5 ] do - 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)) + 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="" @@ -28,5 +29,5 @@ fi echo "Running command (without the leading +):" set -x # Print command -${python} cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "size" -l "${builddir}" +${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_release_cfg.sh b/cmake/scripts/make-size-cfg.sh similarity index 56% rename from cmake/scripts/make_release_cfg.sh rename to cmake/scripts/make-size-cfg.sh index 7b213a4..a9fb4ca 100755 --- a/cmake/scripts/make_release_cfg.sh +++ b/cmake/scripts/make-size-cfg.sh @@ -1,17 +1,18 @@ #!/bin/sh counter=0 +cfg_script_name="cmake-build-cfg.py" while [ ${counter} -lt 5 ] do - 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)) + 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="" @@ -28,5 +29,5 @@ fi echo "Running command (without the leading +):" set -x # Print command -${python} cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "release" -l "${builddir}" +${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 similarity index 53% rename from cmake/scripts/ninja_debug_cfg.sh rename to cmake/scripts/ninja-debug-cfg.sh index d4c2dc7..b8c328b 100755 --- a/cmake/scripts/ninja_debug_cfg.sh +++ b/cmake/scripts/ninja-debug-cfg.sh @@ -1,17 +1,18 @@ #!/bin/sh counter=0 +cfg_script_name="cmake-build-cfg.py" while [ ${counter} -lt 5 ] do - 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)) + 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="" @@ -27,5 +28,5 @@ fi echo "Running command (without the leading +):" set -x # Print command -${python} cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -l "${builddir}" +${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/example_common b/example_common index 253780d..5526abb 160000 --- a/example_common +++ b/example_common @@ -1 +1 @@ -Subproject commit 253780d5d40c08284788b74e5964f6210ab4d641 +Subproject commit 5526abb8fb36b3678ebbd0a470e0f8b866a686ff diff --git a/fsfw b/fsfw index ee4449b..0e5cfcf 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit ee4449b74d29cadd6e250d9ef11f796d33befb42 +Subproject commit 0e5cfcf28f0183d7286d1160a40dcff2017f7795