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
.gitmodules vendored
View File

@ -33,48 +33,30 @@
[submodule "third_party/soxr"] [submodule "third_party/soxr"]
path = third_party/soxr path = third_party/soxr
url = https://git.code.sf.net/p/soxr/code 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"] [submodule "third_party/StringVariable"]
path = third_party/StringVariable path = third_party/StringVariable
url = https://github.com/WolverinDEV/StringVariable.git 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"] [submodule "third_party/tomcrypt"]
path = third_party/tomcrypt path = third_party/tomcrypt
url = https://git.did.science/TeaSpeak/libraries/tomcrypt.git url = https://git.did.science/TeaSpeak/libraries/tomcrypt.git
[submodule "third_party/tommath"] [submodule "third_party/tommath"]
path = third_party/tommath path = third_party/tommath
url = https://git.did.science/TeaSpeak/libraries/tommath.git 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"] [submodule "third_party/protobuf"]
path = third_party/protobuf path = third_party/protobuf
url = https://github.com/google/protobuf.git url = https://github.com/google/protobuf.git
[submodule "third_party/yaml-cpp"] [submodule "third_party/yaml-cpp"]
path = third_party/yaml-cpp path = third_party/yaml-cpp
url = https://github.com/jbeder/yaml-cpp.git 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"] [submodule "shared"]
path = shared path = shared
url = https://git.did.science/TeaSpeak/TeaSpeakLibrary.git 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"] [submodule "build-helpers"]
path = build-helpers path = build-helpers
url = https://github.com/WolverinDEV/build-helpers.git url = https://github.com/WolverinDEV/build-helpers.git
[submodule "third_party/unbound"] [submodule "third_party/unbound"]
path = third_party/unbound path = third_party/unbound
url = https://github.com/WolverinDEV/unbound.git 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"] [submodule "third_party/soundio"]
path = third_party/soundio path = third_party/soundio
url = https://github.com/WolverinDEV/libsoundio.git url = https://github.com/WolverinDEV/libsoundio.git

@ -1 +1 @@
Subproject commit eb1a95318b358937e69ac6c8eadbfefd4ce21807 Subproject commit 62de553a11f63605355b436edbf6d62e994c9f1f

6
build_notes.md Normal file
View File

@ -0,0 +1,6 @@
# Build the TeaSpeak - Client
___
# 1. Native modules
## 1.1 Required third party libraries
# 2. Client

2
client

@ -1 +1 @@
Subproject commit 24c6c4d32c23ea51c547ae0ecd13e66cd2587e4e Subproject commit bce53945e0d2fa84879f4af7be9e128c94220610

2
shared

@ -1 +1 @@
Subproject commit 65dad8e9cb0e198688f68e49ea0f5def2113b4ae Subproject commit f6f90f1196afcaf21c31b93546e07c3d61d6e510

@ -1 +0,0 @@
Subproject commit d93597ce7e5bd0f22bf27be5d89535e34de70fd1

@ -1 +1 @@
Subproject commit 6803c93043aa1ec2ab962c99921e83144dc067ae Subproject commit 540238cdd0d9b3939199895244e786c316ba373a

@ -1 +0,0 @@
Subproject commit 6613f642a0b78bd850c5774298e5b6c24a673545

@ -1 +0,0 @@
Subproject commit df14b580d9f15d7a0b16a8bfc8b906f2608d192c

@ -1 +0,0 @@
Subproject commit 8289fee35e8ba5d6acebe0a217618aca66658c2c

@ -1 +1 @@
Subproject commit c46151db0ffd1a8dae914e45f1212ef427f61ed3 Subproject commit f195f0a55e4ad549c9a5bdf70ab24b65ba30db09

36
third_party/build.sh vendored
View File

@ -61,28 +61,20 @@ function exec_script_external() {
} }
exec_script build_rnnoise.sh exec_script_external build_rnnoise.sh rnnoise
exec_script build_boringssl.sh exec_script_external build_libevent.sh libevent
[[ ${build_os_type} != "win32" ]] && exec_script build_breakpad.sh #Not required for windows TeaClient exec_script_external build_datapipes.sh DataPipes
exec_script build_libevent.sh exec_script_external build_tommath.sh tommath
#exec_script build_cxxterminal.sh #Depends on libevent; Not required for TeaClient exec_script_external build_tomcrypt.sh tomcrypt "tommath_path=`pwd`/tommath/out/${build_os_type}_${build_os_arch}"
exec_script build_datapipes.sh exec_script_external build_ed25519.sh ed25519
exec_script build_ed25519.sh exec_script_external build_opus.sh opus
exec_script build_jsoncpp.sh exec_script_external build_libfvad.sh libfvad
#exec_script build_mysqlconnector.sh exec_script_external build_soxr.sh soxr
exec_script build_opus.sh exec_script_external build_portaudio.sh portaudio
exec_script build_libfvad.sh exec_script_external build_unbound.sh unbound
exec_script build_soxr.sh ##[[ ${build_os_type} != "win32" ]] && exec_script build_breakpad.sh #Not required for windows TeaClient
exec_script build_portaudio.sh ##exec_script build_soundio.sh
exec_script_external build_protobuf.sh protobuf ##exec_script build_soundio.sh
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
#Log the result #Log the result
end_task "build_third_party" "Build all libraries successfully" end_task "build_third_party" "Build all libraries successfully"

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}

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}

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}

@ -1 +0,0 @@
Subproject commit b0b3e49a54ec29e32636f4577d9d5a896d67fd20

1
third_party/jsoncpp vendored

@ -1 +0,0 @@
Subproject commit 7924d3ff9713f1a130ed5fe234d52d7176ae4d09

@ -1 +1 @@
Subproject commit 0d7d85c2083f7a4c9efe01c061486f332b576d28 Subproject commit bc25889fb3738cdd4d85e3ac162fd6cb2fde9839

2
third_party/opus vendored

@ -1 +1 @@
Subproject commit ad8fe90db79b7d2a135e3dfd2ed6631b0c5662ab Subproject commit d633f523e36e3b6d01cc6d57386458d770d618be

@ -1 +1 @@
Subproject commit c5d2c51bd6fe354d0ee1119ba932bfebd3ebfacc Subproject commit 09087cf5a63d6fdb6aca139331f017da970f8177

@ -1 +1 @@
Subproject commit 8b0968625331457e79ba2e7eef5b35af3a95129e Subproject commit 59b3d97f6d7e3ff67bc5d89f030017c60b483549

2
third_party/rnnoise vendored

@ -1 +1 @@
Subproject commit ad42339dbd66e09755c09ac90c1f38e00062d1ef Subproject commit eb3dde20fee65f921b0b66a7df217a91b8df5000

1
third_party/spdlog vendored

@ -1 +0,0 @@
Subproject commit b7d56470c94c742342f1895621b9ab5505cd8b00

@ -1 +1 @@
Subproject commit 012269756149ae99745b6dafefd415843d7420bb Subproject commit a6bbe0e50ac4074f0b9b44188c28cf00caf1a723