Updating revs

This commit is contained in:
WolverinDEV 2019-10-24 19:19:22 +01:00
parent 3dd09c9bec
commit 7abb1b79c3
6 changed files with 84 additions and 8 deletions

78
.gitmodules.orig Normal file
View File

@ -0,0 +1,78 @@
#The TeaClient itself
[submodule "client"]
path = client
url = https://git.did.science/WolverinDEV/TeaSpeak-Client.git
#All third party libraries used by TeaSpeak
[submodule "third_party/breakpad"]
path = third_party/breakpad
url = https://github.com/google/breakpad.git
[submodule "third_party/DataPipes"]
path = third_party/DataPipes
url = https://github.com/WolverinDEV/DataPipes.git
[submodule "third_party/ed25519"]
path = third_party/ed25519
url = https://github.com/WolverinDEV/ed25519.git
[submodule "third_party/libevent"]
path = third_party/libevent
url = https://github.com/libevent/libevent.git
[submodule "third_party/libfvad"]
path = third_party/libfvad
url = https://github.com/WolverinDEV/libfvad
[submodule "third_party/opus"]
path = third_party/opus
url = https://github.com/xiph/opus.git
[submodule "third_party/portaudio"]
path = third_party/portaudio
url = https://git.assembla.com/portaudio.git
[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/WolverinDEV/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/Thread-Pool.git
[submodule "third_party/tomcrypt"]
path = third_party/tomcrypt
url = https://git.did.science/WolverinDEV/tomcrypt.git
[submodule "third_party/tommath"]
path = third_party/tommath
url = https://git.did.science/WolverinDEV/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/mysqlconnector"]
path = third_party/mysqlconnector
url = https://github.com/mysql/mysql-connector-cpp.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/WolverinDEV/TeaSpeak-SharedLib.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
<<<<<<< HEAD
[submodule "scripts"]
path = scripts
url = https://github.com/WolverinDEV/build-helpers.git
=======
[submodule "third_party/unbound"]
path = third_party/unbound
url = https://github.com/NLnetLabs/unbound.git
>>>>>>> 67839ab85eedb795a76c857ddb8c929b731cac23

View File

@ -1,8 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Enter third_party/ directory
cd $(dirname $0) cd $(dirname $0)
#Depends on a lot so rebuild as soon anything changed! We still have to implement that dependecy stuff! #Depends on a lot so rebuild as soon anything changed! We still have to implement that dependecy stuff!
tearoot_cmake_config="`pwd`/cmake/config/tearoot-client.cmake" tearoot_cmake_config="`pwd`/cmake/config/tearoot-client.cmake"
@ -10,7 +8,7 @@ tearoot_cmake_module="`pwd`/cmake/"
traroot_library="`pwd`/third_party" traroot_library="`pwd`/third_party"
shared_path="shared" shared_path="shared"
source scripts/build_helper.sh source `pwd`/scripts/build_helper.sh
begin_task "build_shared" "Building shared library" begin_task "build_shared" "Building shared library"
requires_rebuild ${shared_path} requires_rebuild ${shared_path}
[[ $? -eq 0 ]] && { [[ $? -eq 0 ]] && {
@ -33,4 +31,4 @@ cmake_build ${shared_path} -DCMAKE_MODULE_PATH="$tearoot_cmake_module" -DCMAKE_P
check_err_exit ${shared_path} "Failed to build TeaSpeak shared library!" check_err_exit ${shared_path} "Failed to build TeaSpeak shared library!"
set_build_successful ${shared_path} set_build_successful ${shared_path}
end_task "build_shared" "Shared build finished" end_task "build_shared" "Shared build finished"

2
client

@ -1 +1 @@
Subproject commit a39f573a5fedb43167ce841f51b30d7d75905135 Subproject commit 604ca9c98881d3350b4a34c1d6ba2d3c78e619f1

2
shared

@ -1 +1 @@
Subproject commit c532266cb8b1ba577e063c6ed14a810374c8c84f Subproject commit 5fff4369ef7fad88d6872e3ce7d92e4b88c000c6

@ -1 +1 @@
Subproject commit 6f3e034fe58ce3bca3c1c32be6d603a6206c89af Subproject commit 8289fee35e8ba5d6acebe0a217618aca66658c2c

@ -1 +1 @@
Subproject commit a2310a14c314ea5c488b69422fd207bc239e4923 Subproject commit 0ff2920957a1687dd3804275fd3f29f41bfd7dd1