repared the build script bug

This commit is contained in:
Robin Müller 2021-08-04 17:49:47 +02:00
parent 6648fbc5b6
commit 018efba6b2
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
7 changed files with 54 additions and 32 deletions

View File

@ -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=""
@ -28,6 +29,6 @@ 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}"
# Use this if commands are added which should not be printed
# set +x

View File

@ -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=""
@ -28,6 +29,6 @@ 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 "release" -l "${builddir}"
# Use this if commands are added which should not be printed
# set +x

View File

@ -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=""
@ -27,6 +28,6 @@ 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}"
# Use this if commands are added which should not be printed
# set +x

View File

@ -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=""
@ -27,6 +28,6 @@ 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 "release" -l "${builddir}"
# Use this if commands are added which should not be printed
# set +x

View File

@ -18,6 +18,12 @@ fi
build_generator="Unix Makefiles"
os_fsfw="linux"
builddir="build-Debug"
if [ "${OS}" = "Windows_NT" ]; then
python="py"
# Could be other OS but this works for now.
else
python="python3"
fi
echo "Running command (without the leading +):"
set -x # Print command

View File

@ -18,6 +18,12 @@ fi
build_generator="Unix Makefiles"
os_fsfw="linux"
builddir="build-Release"
if [ "${OS}" = "Windows_NT" ]; then
python="py"
# Could be other OS but this works for now.
else
python="python3"
fi
echo "Running command (without the leading +):"
set -x # Print command

View File

@ -18,6 +18,12 @@ fi
build_generator="Ninja"
os_fsfw="linux"
builddir="build-Debug"
if [ "${OS}" = "Windows_NT" ]; then
python="py"
# Could be other OS but this works for now.
else
python="python3"
fi
echo "Running command (without the leading +):"
set -x # Print command