updated build scripts
This commit is contained in:
parent
3d85bf0a29
commit
7a293b459f
@ -28,5 +28,5 @@ fi
|
|||||||
|
|
||||||
echo "Running command (without the leading +):"
|
echo "Running command (without the leading +):"
|
||||||
set -x # Print command
|
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
|
# set +x
|
@ -1,8 +1,9 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
counter=0
|
counter=0
|
||||||
|
cfg_script_name="cmake-build-cfg.py"
|
||||||
while [ ${counter} -lt 5 ]
|
while [ ${counter} -lt 5 ]
|
||||||
do
|
do
|
||||||
if [ -f "cmake_build_config.py" ];then
|
if [ -f ${cfg_script_name} ];then
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
counter=$((counter=counter + 1))
|
counter=$((counter=counter + 1))
|
||||||
@ -10,7 +11,7 @@ do
|
|||||||
done
|
done
|
||||||
|
|
||||||
if [ "${counter}" -ge 5 ];then
|
if [ "${counter}" -ge 5 ];then
|
||||||
echo "create_cmake_cfg.sh not found in upper directories!"
|
echo "${cfg_script_name} not found in upper directories!"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -28,5 +29,5 @@ fi
|
|||||||
|
|
||||||
echo "Running command (without the leading +):"
|
echo "Running command (without the leading +):"
|
||||||
set -x # Print command
|
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
|
# set +x
|
@ -1,8 +1,9 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
counter=0
|
counter=0
|
||||||
|
cfg_script_name="cmake-build-cfg.py"
|
||||||
while [ ${counter} -lt 5 ]
|
while [ ${counter} -lt 5 ]
|
||||||
do
|
do
|
||||||
if [ -f "cmake_build_config.py" ];then
|
if [ -f ${cfg_script_name} ];then
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
counter=$((counter=counter + 1))
|
counter=$((counter=counter + 1))
|
||||||
@ -10,7 +11,7 @@ do
|
|||||||
done
|
done
|
||||||
|
|
||||||
if [ "${counter}" -ge 5 ];then
|
if [ "${counter}" -ge 5 ];then
|
||||||
echo "create_cmake_cfg.sh not found in upper directories!"
|
echo "${cfg_script_name} not found in upper directories!"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -28,5 +29,5 @@ fi
|
|||||||
|
|
||||||
echo "Running command (without the leading +):"
|
echo "Running command (without the leading +):"
|
||||||
set -x # Print command
|
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
|
# set +x
|
@ -1,8 +1,9 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
counter=0
|
counter=0
|
||||||
|
cfg_script_name="cmake-build-cfg.py"
|
||||||
while [ ${counter} -lt 5 ]
|
while [ ${counter} -lt 5 ]
|
||||||
do
|
do
|
||||||
if [ -f "cmake_build_config.py" ];then
|
if [ -f ${cfg_script_name} ];then
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
counter=$((counter=counter + 1))
|
counter=$((counter=counter + 1))
|
||||||
@ -10,7 +11,7 @@ do
|
|||||||
done
|
done
|
||||||
|
|
||||||
if [ "${counter}" -ge 5 ];then
|
if [ "${counter}" -ge 5 ];then
|
||||||
echo "create_cmake_cfg.sh not found in upper directories!"
|
echo "${cfg_script_name} not found in upper directories!"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -27,5 +28,5 @@ fi
|
|||||||
|
|
||||||
echo "Running command (without the leading +):"
|
echo "Running command (without the leading +):"
|
||||||
set -x # Print command
|
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
|
# set +x
|
@ -1 +1 @@
|
|||||||
Subproject commit 253780d5d40c08284788b74e5964f6210ab4d641
|
Subproject commit 5526abb8fb36b3678ebbd0a470e0f8b866a686ff
|
2
fsfw
2
fsfw
@ -1 +1 @@
|
|||||||
Subproject commit ee4449b74d29cadd6e250d9ef11f796d33befb42
|
Subproject commit 0e5cfcf28f0183d7286d1160a40dcff2017f7795
|
Loading…
Reference in New Issue
Block a user