repared the build script bug
This commit is contained in:
parent
6648fbc5b6
commit
018efba6b2
|
@ -1,17 +1,18 @@
|
||||||
#!/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
|
||||||
cd ..
|
if [ -f ${cfg_script_name} ];then
|
||||||
if [ -f "cmake_build_config.py" ];then
|
break
|
||||||
break
|
fi
|
||||||
fi
|
counter=$((counter=counter + 1))
|
||||||
counter=$((counter=counter + 1))
|
cd ..
|
||||||
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
|
||||||
|
|
||||||
build_generator=""
|
build_generator=""
|
||||||
|
@ -28,6 +29,6 @@ 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}"
|
||||||
# Use this if commands are added which should not be printed
|
# Use this if commands are added which should not be printed
|
||||||
# set +x
|
# set +x
|
|
@ -1,17 +1,18 @@
|
||||||
#!/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
|
||||||
cd ..
|
if [ -f ${cfg_script_name} ];then
|
||||||
if [ -f "cmake_build_config.py" ];then
|
break
|
||||||
break
|
fi
|
||||||
fi
|
counter=$((counter=counter + 1))
|
||||||
counter=$((counter=counter + 1))
|
cd ..
|
||||||
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
|
||||||
|
|
||||||
build_generator=""
|
build_generator=""
|
||||||
|
@ -28,6 +29,6 @@ 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 "release" -l "${builddir}"
|
||||||
# Use this if commands are added which should not be printed
|
# Use this if commands are added which should not be printed
|
||||||
# set +x
|
# set +x
|
|
@ -1,17 +1,18 @@
|
||||||
#!/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
|
||||||
cd ..
|
if [ -f ${cfg_script_name} ];then
|
||||||
if [ -f "cmake_build_config.py" ];then
|
break
|
||||||
break
|
fi
|
||||||
fi
|
counter=$((counter=counter + 1))
|
||||||
counter=$((counter=counter + 1))
|
cd ..
|
||||||
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
|
||||||
|
|
||||||
build_generator=""
|
build_generator=""
|
||||||
|
@ -27,6 +28,6 @@ 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}"
|
||||||
# Use this if commands are added which should not be printed
|
# Use this if commands are added which should not be printed
|
||||||
# set +x
|
# set +x
|
|
@ -1,17 +1,18 @@
|
||||||
#!/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
|
||||||
cd ..
|
if [ -f ${cfg_script_name} ];then
|
||||||
if [ -f "cmake_build_config.py" ];then
|
break
|
||||||
break
|
fi
|
||||||
fi
|
counter=$((counter=counter + 1))
|
||||||
counter=$((counter=counter + 1))
|
cd ..
|
||||||
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
|
||||||
|
|
||||||
build_generator=""
|
build_generator=""
|
||||||
|
@ -27,6 +28,6 @@ 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 "release" -l "${builddir}"
|
||||||
# Use this if commands are added which should not be printed
|
# Use this if commands are added which should not be printed
|
||||||
# set +x
|
# set +x
|
|
@ -18,6 +18,12 @@ fi
|
||||||
build_generator="Unix Makefiles"
|
build_generator="Unix Makefiles"
|
||||||
os_fsfw="linux"
|
os_fsfw="linux"
|
||||||
builddir="build-Debug"
|
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 +):"
|
echo "Running command (without the leading +):"
|
||||||
set -x # Print command
|
set -x # Print command
|
||||||
|
|
|
@ -18,6 +18,12 @@ fi
|
||||||
build_generator="Unix Makefiles"
|
build_generator="Unix Makefiles"
|
||||||
os_fsfw="linux"
|
os_fsfw="linux"
|
||||||
builddir="build-Release"
|
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 +):"
|
echo "Running command (without the leading +):"
|
||||||
set -x # Print command
|
set -x # Print command
|
||||||
|
|
|
@ -18,6 +18,12 @@ fi
|
||||||
build_generator="Ninja"
|
build_generator="Ninja"
|
||||||
os_fsfw="linux"
|
os_fsfw="linux"
|
||||||
builddir="build-Debug"
|
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 +):"
|
echo "Running command (without the leading +):"
|
||||||
set -x # Print command
|
set -x # Print command
|
||||||
|
|
Loading…
Reference in New Issue