Updated the client for linux
This commit is contained in:
WolverinDEV
parent
38c8c7a377
commit
7aa8c310d9
2
client
2
client
@ -1 +1 @@
|
|||||||
Subproject commit 6393d79f54a1a13300c5117bd3eecd44b909ecc3
|
Subproject commit 24c6c4d32c23ea51c547ae0ecd13e66cd2587e4e
|
||||||
2
third_party/Thread-Pool
vendored
2
third_party/Thread-Pool
vendored
@ -1 +1 @@
|
|||||||
Subproject commit d858eb8b3aec7f9d2e9d308d0564a8a267710f64
|
Subproject commit df14b580d9f15d7a0b16a8bfc8b906f2608d192c
|
||||||
174
third_party/build.sh
vendored
174
third_party/build.sh
vendored
@ -1,87 +1,87 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Enter third_party/ directory
|
# Enter third_party/ directory
|
||||||
cd $(dirname $0)
|
cd $(dirname $0)
|
||||||
|
|
||||||
export build_helper_file="../build-helpers/build_helper.sh"
|
export build_helper_file="../build-helpers/build_helper.sh"
|
||||||
build_helper_scripts="../build-helpers/libraries"
|
build_helper_scripts="../build-helpers/libraries"
|
||||||
|
|
||||||
source ${build_helper_file}
|
source ${build_helper_file}
|
||||||
[[ $build_helpers_defined -ne 1 ]] && {
|
[[ $build_helpers_defined -ne 1 ]] && {
|
||||||
echo "Failed to include build helpers."
|
echo "Failed to include build helpers."
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
[[ -z "${build_os_type}" ]] && {
|
[[ -z "${build_os_type}" ]] && {
|
||||||
echo "Missing build os type. Using \"linux\""
|
echo "Missing build os type. Using \"linux\""
|
||||||
export build_os_type="linux"
|
export build_os_type="linux"
|
||||||
}
|
}
|
||||||
|
|
||||||
[[ -z "${build_os_arch}" ]] && {
|
[[ -z "${build_os_arch}" ]] && {
|
||||||
echo "Missing build os arch. Using \"amd64\""
|
echo "Missing build os arch. Using \"amd64\""
|
||||||
export build_os_arch="amd64"
|
export build_os_arch="amd64"
|
||||||
}
|
}
|
||||||
|
|
||||||
begin_task "build_third_party" "Building libraries"
|
begin_task "build_third_party" "Building libraries"
|
||||||
|
|
||||||
function exec_script() {
|
function exec_script() {
|
||||||
name=$(echo "$1" | sed -n -E 's:^build_(.*)\.sh:\1:p')
|
name=$(echo "$1" | sed -n -E 's:^build_(.*)\.sh:\1:p')
|
||||||
begin_task "build_$name" "Building $name"
|
begin_task "build_$name" "Building $name"
|
||||||
|
|
||||||
echo -e "Building library with script $color_green${1}$color_normal"
|
echo -e "Building library with script $color_green${1}$color_normal"
|
||||||
./${1}
|
./${1}
|
||||||
_code=$?
|
_code=$?
|
||||||
if [[ $_code -ne 0 ]]; then
|
if [[ $_code -ne 0 ]]; then
|
||||||
echo "Failed to build library $name. Status code: $_code"
|
echo "Failed to build library $name. Status code: $_code"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#Log the result
|
#Log the result
|
||||||
end_task "build_$name" "Finished $name"
|
end_task "build_$name" "Finished $name"
|
||||||
echo ""
|
echo ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function exec_script_external() {
|
function exec_script_external() {
|
||||||
name=$(echo "$1" | sed -n -E 's:^build_(.*)\.sh:\1:p')
|
name=$(echo "$1" | sed -n -E 's:^build_(.*)\.sh:\1:p')
|
||||||
begin_task "build_$name" "Building $name"
|
begin_task "build_$name" "Building $name"
|
||||||
|
|
||||||
echo -e "Building library with script $color_green${1}$color_normal"
|
echo -e "Building library with script $color_green${1}$color_normal"
|
||||||
_prefix="library_path=\"$2\" ${*:3}"
|
_prefix="library_path=\"$2\" ${*:3}"
|
||||||
eval $_prefix ./${build_helper_scripts}/"${1}"
|
eval $_prefix ./${build_helper_scripts}/"${1}"
|
||||||
code=$?
|
code=$?
|
||||||
if [[ $code -ne 0 ]]; then
|
if [[ $code -ne 0 ]]; then
|
||||||
echo "Failed to build library $name. Status code: $code"
|
echo "Failed to build library $name. Status code: $code"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#Log the result
|
#Log the result
|
||||||
end_task "build_$name" "Finished $name"
|
end_task "build_$name" "Finished $name"
|
||||||
echo ""
|
echo ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
exec_script build_boringssl.sh
|
exec_script build_boringssl.sh
|
||||||
[[ ${build_os_type} != "win32" ]] && exec_script build_breakpad.sh #Not required for windows TeaClient
|
[[ ${build_os_type} != "win32" ]] && exec_script build_breakpad.sh #Not required for windows TeaClient
|
||||||
exec_script build_libevent.sh
|
exec_script build_libevent.sh
|
||||||
#exec_script build_cxxterminal.sh #Depends on libevent; Not required for TeaClient
|
#exec_script build_cxxterminal.sh #Depends on libevent; Not required for TeaClient
|
||||||
exec_script build_datapipes.sh
|
exec_script build_datapipes.sh
|
||||||
exec_script build_ed25519.sh
|
exec_script build_ed25519.sh
|
||||||
exec_script build_jsoncpp.sh
|
exec_script build_jsoncpp.sh
|
||||||
#exec_script build_mysqlconnector.sh
|
#exec_script build_mysqlconnector.sh
|
||||||
exec_script build_opus.sh
|
exec_script build_opus.sh
|
||||||
exec_script build_libfvad.sh
|
exec_script build_libfvad.sh
|
||||||
exec_script build_soxr.sh
|
exec_script build_soxr.sh
|
||||||
exec_script build_portaudio.sh
|
exec_script build_portaudio.sh
|
||||||
exec_script_external build_protobuf.sh protobuf
|
exec_script_external build_protobuf.sh protobuf
|
||||||
exec_script build_unbound.sh
|
exec_script build_unbound.sh
|
||||||
exec_script build_spdlog.sh
|
exec_script build_spdlog.sh
|
||||||
exec_script build_stringvariable.sh
|
exec_script build_stringvariable.sh
|
||||||
exec_script build_threadpool.sh
|
exec_script build_threadpool.sh
|
||||||
exec_script build_soundio.sh
|
exec_script build_soundio.sh
|
||||||
exec_script build_tom.sh
|
exec_script build_tom.sh
|
||||||
exec_script build_yaml.sh
|
exec_script build_yaml.sh
|
||||||
[[ ${build_os_type} != "win32" ]] && exec_script build_jemalloc.sh #Not required for TeaClient
|
[[ ${build_os_type} != "win32" ]] && exec_script build_jemalloc.sh #Not required for TeaClient
|
||||||
|
|
||||||
#Log the result
|
#Log the result
|
||||||
end_task "build_third_party" "Build all libraries successfully"
|
end_task "build_third_party" "Build all libraries successfully"
|
||||||
|
|||||||
6
third_party/build_boringssl.sh
vendored
6
third_party/build_boringssl.sh
vendored
@ -21,8 +21,10 @@ if [[ ${build_os_type} == "linux" ]]; then
|
|||||||
|
|
||||||
cd boringssl/
|
cd boringssl/
|
||||||
[[ $? -ne 0 ]] && exit 1
|
[[ $? -ne 0 ]] && exit 1
|
||||||
[[ -d lib ]] && rm -r lib
|
[[ -d lib ]] && {
|
||||||
[[ $? -ne 0 ]] && exit 2
|
rm -r lib
|
||||||
|
[[ $? -ne 0 ]] && exit 2
|
||||||
|
}
|
||||||
|
|
||||||
mkdir lib && cd lib
|
mkdir lib && cd lib
|
||||||
ln -s ../build/ssl/libssl.so .
|
ln -s ../build/ssl/libssl.so .
|
||||||
|
|||||||
46
third_party/build_soundio.sh
vendored
46
third_party/build_soundio.sh
vendored
@ -1,23 +1,23 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
[[ -z "${build_helper_file}" ]] && {
|
[[ -z "${build_helper_file}" ]] && {
|
||||||
echo "Missing build helper file. Please define \"build_helper_file\""
|
echo "Missing build helper file. Please define \"build_helper_file\""
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
source ${build_helper_file}
|
source ${build_helper_file}
|
||||||
[[ $build_helpers_defined -ne 1 ]] && {
|
[[ $build_helpers_defined -ne 1 ]] && {
|
||||||
echo "Failed to include build helpers."
|
echo "Failed to include build helpers."
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
library_path="soundio"
|
library_path="soundio"
|
||||||
requires_rebuild ${library_path}
|
requires_rebuild ${library_path}
|
||||||
[[ $? -eq 0 ]] && exit 0
|
[[ $? -eq 0 ]] && exit 0
|
||||||
|
|
||||||
_fpic=""
|
_fpic=""
|
||||||
[[ ${build_os_type} == "linux" ]] && _fpic="-fPIC"
|
[[ ${build_os_type} == "linux" ]] && _fpic="-fPIC"
|
||||||
|
|
||||||
cmake_build ${library_path} -DBUILD_DYNAMIC_LIBS=OFF -DBUILD_STATIC_LIBS=ON -DBUILD_EXAMPLE_PROGRAMS=OFF -DBUILD_TESTS=OFF -DCMAKE_BUILD_TYPE="Debug"
|
cmake_build ${library_path} -DBUILD_DYNAMIC_LIBS=OFF -DBUILD_STATIC_LIBS=ON -DBUILD_EXAMPLE_PROGRAMS=OFF -DBUILD_TESTS=OFF -DCMAKE_BUILD_TYPE="Debug"
|
||||||
check_err_exit ${library_path} "Failed to build libsoundio!"
|
check_err_exit ${library_path} "Failed to build libsoundio!"
|
||||||
set_build_successful ${library_path}
|
set_build_successful ${library_path}
|
||||||
|
|||||||
11
third_party/build_unbound.sh
vendored
11
third_party/build_unbound.sh
vendored
@ -31,15 +31,12 @@ if [[ -d ${build_path} ]]; then
|
|||||||
rm -r ${build_path}
|
rm -r ${build_path}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mkdir -p ${build_path}
|
cd ${library_path}
|
||||||
check_err_exit ${library_path} "Failed to create build directory"
|
|
||||||
cd ${build_path}
|
|
||||||
check_err_exit ${library_path} "Failed to enter build directory"
|
|
||||||
|
|
||||||
if [[ ${build_os_type} == "linux" ]]; then
|
if [[ ${build_os_type} == "linux" ]]; then
|
||||||
#Failed to build with BoringSSL, so we using openssl. No ABI stuff should be changed!
|
#Failed to build with BoringSSL, so we using openssl. No ABI stuff should be changed!
|
||||||
# --with-ssl=${library_boringssl}
|
# --with-ssl=${library_boringssl}
|
||||||
../../configure --with-libunbound-only --with-libevent=${library_event} --enable-event-api --enable-shared=yes --enable-static=yes --with-pthreads --prefix=`pwd`
|
echo "Install build to ${build_path}"
|
||||||
|
./configure --prefix="${build_path}" --with-libunbound-only --with-libevent=${library_event} --enable-event-api --enable-shared=yes --enable-static=yes --with-pthreads
|
||||||
check_err_exit ${library_path} "Failed to configure build"
|
check_err_exit ${library_path} "Failed to configure build"
|
||||||
make CXXFLAGS="${CXX_FLAGS}" CFLAGS="${C_FLAGS} -fPIC" ${MAKE_OPTIONS}
|
make CXXFLAGS="${CXX_FLAGS}" CFLAGS="${C_FLAGS} -fPIC" ${MAKE_OPTIONS}
|
||||||
check_err_exit ${library_path} "Failed to build"
|
check_err_exit ${library_path} "Failed to build"
|
||||||
@ -49,7 +46,7 @@ else
|
|||||||
echo "Invalid OS!"
|
echo "Invalid OS!"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
cd ../../../
|
cd ../
|
||||||
|
|
||||||
set_build_successful ${library_path}
|
set_build_successful ${library_path}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user