From bc24c6d91f7d783074071020eba431321b9bd856 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Tue, 26 Jan 2021 13:33:44 +0000 Subject: [PATCH 1/2] Updated some refs --- TeaDNS | 2 +- TeaSpeak | 2 +- build_teaspeak.sh | 24 ++++++++++++++++++++---- libraries/DataPipes | 2 +- libraries/glibc | 2 +- 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/TeaDNS b/TeaDNS index c11c872..58c1ce1 160000 --- a/TeaDNS +++ b/TeaDNS @@ -1 +1 @@ -Subproject commit c11c87254c2836d0bca970a686406cb41dcebc0c +Subproject commit 58c1ce1185e32617870606e9926ab415418f984b diff --git a/TeaSpeak b/TeaSpeak index 3e36d70..9a5aa1d 160000 --- a/TeaSpeak +++ b/TeaSpeak @@ -1 +1 @@ -Subproject commit 3e36d7016446a643eba08b45fb97b0e11ef9b0bb +Subproject commit 9a5aa1d42bff393b18b6777f381b16f9112f50ad diff --git a/build_teaspeak.sh b/build_teaspeak.sh index 6b3982e..366205e 100755 --- a/build_teaspeak.sh +++ b/build_teaspeak.sh @@ -10,6 +10,15 @@ if [[ -n "$1" ]]; then export _build_type="Debug" # shellcheck disable=SC2089 export TEASPEAK_DEPLOY_TYPE_SPECIFIER="-DBUILD_TYPE=1 -DBUILD_TYPE_NAME=beta" + if [[ $i_really_wanna_debug -ne 1 ]]; then + echo "Please set the i_really_wanna_debug environment variable to one if you really want a debug build" + exit 1 + fi + elif [[ "$1" == "nightly" ]]; then + echo "Initializing nightly session." + export _build_type="RelWithDebInfo" + # shellcheck disable=SC2089 + export TEASPEAK_DEPLOY_TYPE_SPECIFIER="-DBUILD_TYPE=2 -DBUILD_TYPE_NAME=nightly" elif [[ "$1" == "optimized" ]]; then echo "Initializing optimized session." export _build_type="RelWithDebInfo" @@ -36,15 +45,22 @@ else _web_flag="ON" fi +crypto_library_path="$(pwd)/libraries/openssl-prebuild/${build_os_type}_${build_os_arch}/" \ +./TeaSpeak/rtclib/generate_shared_library.sh +if [ $? -ne 0 ]; then + exit 1 +fi + + cd TeaSpeak || exit 1 -if [[ -d build ]]; then +if [[ -d build && $teaspeak_clean_build -eq 1 ]]; then rm -r build fi -mkdir build || exit 1 +[[ ! -d build ]] && { mkdir build || exit 1; } cd build || exit 1 echo "Build type: $_build_type" -_command="cmake .. -DCMAKE_BUILD_TYPE=\"$_build_type\" -DCMAKE_CXX_FLAGS=\"${CXX_FLAGS}\" -DBUILD_INCLUDE_FILE=\"$_build_helper_dir/cmake/config/tearoot-server.cmake\" -DCMAKE_MODULE_PATH=\"$_build_helper_dir/cmake/\" -DDISABLE_QT=1 -DDISABLE_CUSTOM_OUTPUT=ON -DDISABLE_QT=ON -DCOMPILE_WEB_CLIENT=\"$_web_flag\" $TEASPEAK_DEPLOY_TYPE_SPECIFIER" +_command="cmake .. -DCMAKE_BUILD_TYPE=\"$_build_type\" -DCMAKE_CXX_FLAGS=\"${CXX_FLAGS}\" -DBUILD_INCLUDE_FILE=\"$_build_helper_dir/cmake/config/tearoot-server.cmake\" -DCMAKE_MODULE_PATH=\"$_build_helper_dir/cmake/\" -DDISABLE_QT=1 -DDISABLE_CUSTOM_OUTPUT=ON -DDISABLE_QT=ON -DCOMPILE_WEB_CLIENT=\"$_web_flag\" $TEASPEAK_DEPLOY_TYPE_SPECIFIER -Dmysql_ROOT_DIR=\"`pwd`/../../../mysql-server/out\"" echo "> $_command" eval $_command _code=$? @@ -64,7 +80,7 @@ if [[ $_code -ne 0 ]]; then exit 1 fi -cmake --build "$(pwd)" --target TeaSpeakServer -- -j 12; _code=$? +cmake --build "$(pwd)" --target TeaSpeakServer -- -j 6; _code=$? if [[ $_code -ne 0 ]]; then echo "Failed to build server ($_code)" exit 1 diff --git a/libraries/DataPipes b/libraries/DataPipes index 2c1dbc0..ddbb9ab 160000 --- a/libraries/DataPipes +++ b/libraries/DataPipes @@ -1 +1 @@ -Subproject commit 2c1dbc03447cedd240a3bd6e94dcb87ae91807ff +Subproject commit ddbb9ab66f673e85225c81d8a8205f0476e6d9c8 diff --git a/libraries/glibc b/libraries/glibc index 3396416..b4277aa 160000 --- a/libraries/glibc +++ b/libraries/glibc @@ -1 +1 @@ -Subproject commit 3396416fab69945f420f31dea30850806e199984 +Subproject commit b4277aac2ecf8189004984cab91a759d9d85b4dc From 0ccee27e6ac263b2413b0748ab995f6b2c86f5c7 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Tue, 26 Jan 2021 13:34:08 +0000 Subject: [PATCH 2/2] Updated openssl-prebuild rev --- libraries/openssl-prebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/openssl-prebuild b/libraries/openssl-prebuild index 8171e85..034ea35 160000 --- a/libraries/openssl-prebuild +++ b/libraries/openssl-prebuild @@ -1 +1 @@ -Subproject commit 8171e857544d604abdf980f27239884d9f102523 +Subproject commit 034ea35d38b11cba6c0e50e8685bbb71f8e030be