TeaSpeak/client-root
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor update

Browse Source
This commit is contained in:
WolverinDEV 2019-07-03 13:32:55 +02:00
parent 6934b8266c
commit 2cc1476b04
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build_client.sh
View File

@ -6,11 +6,10 @@ tearoot_cmake_config="`pwd`/cmake/config/tearoot-client.cmake"
tearoot_cmake_module="`pwd`/cmake/" tearoot_cmake_module="`pwd`/cmake/"
traroot_library="`pwd`/third_party" traroot_library="`pwd`/third_party"
shared_path="client"
source scripts/build_helper.sh source scripts/build_helper.sh
begin_task "build_client" "Building client" begin_task "build_client" "Building client"
./client/jenkins/create_build.sh ./client/jenkins/create_build.sh
check_err_exit ${shared_path} "Failed to build client!" check_err_exit "__build_client" "Failed to build client!"
end_task "build_client" "Client build finished" end_task "build_client" "Client build finished"

4
scripts/build_helper.sh
View File

@ -228,7 +228,11 @@ function cmake_build() {
function check_err_exit() { function check_err_exit() {
error_code=$? error_code=$?
[[ ${error_code} -eq 0 || "${error_code}" == "0" ]] && return 0 [[ ${error_code} -eq 0 || "${error_code}" == "0" ]] && return 0
if [[ ${1} =~ __* ]]; then
echo -e "\e[1;31mFailed to build project ${1:2}. Status code: ${error_code}"
else
echo -e "\e[1;31mFailed to build project $1 at $(realpath $1). Status code: ${error_code}" echo -e "\e[1;31mFailed to build project $1 at $(realpath $1). Status code: ${error_code}"
fi
[[ ${#@} -gt 1 ]] && echo "${@:2}" [[ ${#@} -gt 1 ]] && echo "${@:2}"
echo -e "Aborting build\e[0;39m" echo -e "Aborting build\e[0;39m"
exit 1 exit 1