TeaSpeak/Server-Root
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch '1.4.10-openssl' of https://git.did.science/TeaSpeak/server/root into 1.4.10-openssl

Browse Source
This commit is contained in:
WolverinDEV 2021-04-15 19:42:00 +02:00
commit 931e1c270b
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
build_teaspeak.sh
View File

@ -10,6 +10,15 @@ if [[ -n "$1" ]]; then
export _build_type="Debug" export _build_type="Debug"
# shellcheck disable=SC2089 # shellcheck disable=SC2089
export TEASPEAK_DEPLOY_TYPE_SPECIFIER="-DBUILD_TYPE=1 -DBUILD_TYPE_NAME=beta" 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 elif [[ "$1" == "optimized" ]]; then
echo "Initializing optimized session." echo "Initializing optimized session."
export _build_type="RelWithDebInfo" export _build_type="RelWithDebInfo"
@ -36,15 +45,22 @@ else
_web_flag="ON" _web_flag="ON"
fi 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 cd TeaSpeak || exit 1
if [[ -d build ]]; then if [[ -d build && $teaspeak_clean_build -eq 1 ]]; then
rm -r build rm -r build
fi fi
mkdir build || exit 1 [[ ! -d build ]] && { mkdir build || exit 1; }
cd build || exit 1 cd build || exit 1
echo "Build type: $_build_type" 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" echo "> $_command"
eval $_command eval $_command
_code=$? _code=$?
@ -64,7 +80,7 @@ if [[ $_code -ne 0 ]]; then
exit 1 exit 1
fi fi
cmake --build "$(pwd)" --target TeaSpeakServer -- -j 12; _code=$? cmake --build "$(pwd)" --target TeaSpeakServer -- -j 6; _code=$?
if [[ $_code -ne 0 ]]; then if [[ $_code -ne 0 ]]; then
echo "Failed to build server ($_code)" echo "Failed to build server ($_code)"
exit 1 exit 1

2
libraries/glibc

@ -1 +1 @@
Subproject commit 3396416fab69945f420f31dea30850806e199984 Subproject commit b4277aac2ecf8189004984cab91a759d9d85b4dc

2
libraries/openssl-prebuild

@ -1 +1 @@
Subproject commit 8171e857544d604abdf980f27239884d9f102523 Subproject commit 034ea35d38b11cba6c0e50e8685bbb71f8e030be