Removed not needed submodules and cleaned up build screipts

This commit is contained in:
WolverinDEV
2021-02-07 00:11:34 +01:00
parent daaeff328a
commit ee6c53d179
24 changed files with 31 additions and 154 deletions
-18
View File
@@ -33,48 +33,30 @@
[submodule "third_party/soxr"]
path = third_party/soxr
url = https://git.code.sf.net/p/soxr/code
[submodule "third_party/spdlog"]
path = third_party/spdlog
url = https://git.did.science/TeaSpeak/libraries/spdlog.git
[submodule "third_party/StringVariable"]
path = third_party/StringVariable
url = https://github.com/WolverinDEV/StringVariable.git
[submodule "third_party/Thread-Pool"]
path = third_party/Thread-Pool
url = https://git.did.science/WolverinDEV/ThreadPool.git
[submodule "third_party/tomcrypt"]
path = third_party/tomcrypt
url = https://git.did.science/TeaSpeak/libraries/tomcrypt.git
[submodule "third_party/tommath"]
path = third_party/tommath
url = https://git.did.science/TeaSpeak/libraries/tommath.git
[submodule "third_party/jsoncpp"]
path = third_party/jsoncpp
url = https://github.com/open-source-parsers/jsoncpp.git
[submodule "third_party/protobuf"]
path = third_party/protobuf
url = https://github.com/google/protobuf.git
[submodule "third_party/yaml-cpp"]
path = third_party/yaml-cpp
url = https://github.com/jbeder/yaml-cpp.git
[submodule "third_party/jemalloc"]
path = third_party/jemalloc
url = https://github.com/jemalloc/jemalloc.git
[submodule "shared"]
path = shared
url = https://git.did.science/TeaSpeak/TeaSpeakLibrary.git
[submodule "third_party/boringssl"]
path = third_party/boringssl
url = https://git.did.science/WolverinDEV/boringssl.git
[submodule "build-helpers"]
path = build-helpers
url = https://github.com/WolverinDEV/build-helpers.git
[submodule "third_party/unbound"]
path = third_party/unbound
url = https://github.com/WolverinDEV/unbound.git
[submodule "third_party/CXXTerminal"]
path = third_party/CXXTerminal
url = https://github.com/WolverinDEV/CXXTerminal.git
[submodule "third_party/soundio"]
path = third_party/soundio
url = https://github.com/WolverinDEV/libsoundio.git
+6
View File
@@ -0,0 +1,6 @@
# Build the TeaSpeak - Client
___
# 1. Native modules
## 1.1 Required third party libraries
# 2. Client
+1 -1
Submodule client updated: 24c6c4d32c...bce53945e0
+1 -1
Submodule shared updated: 65dad8e9cb...f6f90f1196
Submodule third_party/boringssl deleted from 8289fee35e
+14 -22
View File
@@ -61,28 +61,20 @@ function exec_script_external() {
}
exec_script build_rnnoise.sh
exec_script build_boringssl.sh
[[ ${build_os_type} != "win32" ]] && exec_script build_breakpad.sh #Not required for windows TeaClient
exec_script build_libevent.sh
#exec_script build_cxxterminal.sh #Depends on libevent; Not required for TeaClient
exec_script build_datapipes.sh
exec_script build_ed25519.sh
exec_script build_jsoncpp.sh
#exec_script build_mysqlconnector.sh
exec_script build_opus.sh
exec_script build_libfvad.sh
exec_script build_soxr.sh
exec_script build_portaudio.sh
exec_script_external build_protobuf.sh protobuf
exec_script build_unbound.sh
exec_script build_spdlog.sh
exec_script build_stringvariable.sh
exec_script build_threadpool.sh
exec_script build_soundio.sh
exec_script build_tom.sh
exec_script build_yaml.sh
[[ ${build_os_type} != "win32" ]] && exec_script build_jemalloc.sh #Not required for TeaClient
exec_script_external build_rnnoise.sh rnnoise
exec_script_external build_libevent.sh libevent
exec_script_external build_datapipes.sh DataPipes
exec_script_external build_tommath.sh tommath
exec_script_external build_tomcrypt.sh tomcrypt "tommath_path=`pwd`/tommath/out/${build_os_type}_${build_os_arch}"
exec_script_external build_ed25519.sh ed25519
exec_script_external build_opus.sh opus
exec_script_external build_libfvad.sh libfvad
exec_script_external build_soxr.sh soxr
exec_script_external build_portaudio.sh portaudio
exec_script_external build_unbound.sh unbound
##[[ ${build_os_type} != "win32" ]] && exec_script build_breakpad.sh #Not required for windows TeaClient
##exec_script build_soundio.sh
##exec_script build_soundio.sh
#Log the result
end_task "build_third_party" "Build all libraries successfully"
-22
View File
@@ -1,22 +0,0 @@
#!/usr/bin/env bash
[[ -z "${build_helper_file}" ]] && {
echo "Missing build helper file. Please define \"build_helper_file\""
exit 1
}
source ${build_helper_file}
[[ $build_helpers_defined -ne 1 ]] && {
echo "Failed to include build helpers."
exit 1
}
library_path="portaudio"
requires_rebuild ${library_path}
[[ $? -eq 0 ]] && exit 0
_fpic=""
[[ ${build_os_type} == "linux" ]] && _fpic="-fPIC"
cmake_build ${library_path} -DCMAKE_C_FLAGS="${_fpic}" -DPA_BUILD_SHARED=OFF -DPA_BUILD_STATIC=ON -DPA_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo
check_err_exit ${library_path} "Failed to build portaudio!"
set_build_successful ${library_path}
-22
View File
@@ -1,22 +0,0 @@
#!/usr/bin/env bash
[[ -z "${build_helper_file}" ]] && {
echo "Missing build helper file. Please define \"build_helper_file\""
exit 1
}
source ${build_helper_file}
[[ $build_helpers_defined -ne 1 ]] && {
echo "Failed to include build helpers."
exit 1
}
library_path="soxr"
requires_rebuild ${library_path}
[[ $? -eq 0 ]] && exit 0
_fpic=""
[[ ${build_os_type} == "linux" ]] && _fpic="-fPIC"
cmake_build ${library_path} -DCMAKE_C_FLAGS="${_fpic}" -DBUILD_SHARED_RUNTIME=OFF -DWITH_OPENMP=OFF -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_EXAMPLES=OFF
check_err_exit ${library_path} "Failed to build soxr!"
set_build_successful ${library_path}
-52
View File
@@ -1,52 +0,0 @@
#!/usr/bin/env bash
[[ -z "${build_helper_file}" ]] && {
echo "Missing build helper file. Please define \"build_helper_file\""
exit 1
}
source ${build_helper_file}
[[ $build_helpers_defined -ne 1 ]] && {
echo "Failed to include build helpers."
exit 1
}
if [[ ${build_os_type} == "win32" ]]; then
echo "Windows does not require libunbound"
echo "Dont building library"
exit 0
fi
library_path="unbound"
requires_rebuild ${library_path}
[[ $? -eq 0 ]] && exit 0
generate_build_path "${library_path}"
library_event=`pwd`/libevent/out/${build_os_type}_${build_os_arch}/
library_boringssl=`pwd`/boringssl/lib/
if [[ -d ${build_path} ]]; then
echo "Removing old build directory"
rm -r ${build_path}
fi
cd ${library_path}
if [[ ${build_os_type} == "linux" ]]; then
#Failed to build with BoringSSL, so we using openssl. No ABI stuff should be changed!
# --with-ssl=${library_boringssl}
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"
make CXXFLAGS="${CXX_FLAGS}" CFLAGS="${C_FLAGS} -fPIC" ${MAKE_OPTIONS}
check_err_exit ${library_path} "Failed to build"
make install
check_err_exit ${library_path} "Failed to install"
else
echo "Invalid OS!"
exit 1
fi
cd ../
set_build_successful ${library_path}
Submodule third_party/jemalloc deleted from b0b3e49a54
Submodule third_party/jsoncpp deleted from 7924d3ff97
Submodule third_party/spdlog deleted from b7d56470c9