From dc02c22695f158967062e8d0e240db55066411f9 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Sat, 26 Oct 2019 00:56:05 +0100 Subject: [PATCH 1/6] Updated shared rev --- shared | 2 +- third_party/CXXTerminal | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 160000 third_party/CXXTerminal diff --git a/shared b/shared index c532266..a6bbe0c 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit c532266cb8b1ba577e063c6ed14a810374c8c84f +Subproject commit a6bbe0c5579f7d5e14b61ecdf5db413444165a75 diff --git a/third_party/CXXTerminal b/third_party/CXXTerminal deleted file mode 160000 index d93597c..0000000 --- a/third_party/CXXTerminal +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d93597ce7e5bd0f22bf27be5d89535e34de70fd1 From 36016897b63902e4d79f9f63b93bdd37416dd853 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Sat, 26 Oct 2019 00:58:16 +0100 Subject: [PATCH 2/6] Fixed invalid bordingssl url --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 66fa112..62e75cf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -68,7 +68,7 @@ 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 + url = https://boringssl.googlesource.com/boringssl [submodule "build-helpers"] path = build-helpers url = https://github.com/WolverinDEV/build-helpers.git From b350f5eed03ddb1f0c1c9913c81adac53f0936b8 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Sun, 27 Oct 2019 13:00:24 +0100 Subject: [PATCH 3/6] Updated bordingssl rev --- third_party/boringssl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/boringssl b/third_party/boringssl index 6f3e034..8289fee 160000 --- a/third_party/boringssl +++ b/third_party/boringssl @@ -1 +1 @@ -Subproject commit 6f3e034fe58ce3bca3c1c32be6d603a6206c89af +Subproject commit 8289fee35e8ba5d6acebe0a217618aca66658c2c From 086e054c4b1b5fd3af65cb45b6ba6edff7326e87 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Sun, 27 Oct 2019 18:22:44 +0100 Subject: [PATCH 4/6] Updated tomcrypt rev --- third_party/tomcrypt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/tomcrypt b/third_party/tomcrypt index a2310a1..0ff2920 160000 --- a/third_party/tomcrypt +++ b/third_party/tomcrypt @@ -1 +1 @@ -Subproject commit a2310a14c314ea5c488b69422fd207bc239e4923 +Subproject commit 0ff2920957a1687dd3804275fd3f29f41bfd7dd1 From ac4051100e22fdeb20394cf8b623ecae02e5082d Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Sun, 3 Nov 2019 15:59:08 +0100 Subject: [PATCH 5/6] updated revs --- client | 2 +- helper.txt | 4 + third_party/CMakeCache.txt | 95 +++++++++++++++++++ .../CMakeFiles/3.11.1/CMakeSystem.cmake | 15 +++ third_party/CMakeFiles/CMakeOutput.log | 1 + third_party/CMakeFiles/cmake.check_cache | 1 + third_party/CXXTerminal | 1 + 7 files changed, 118 insertions(+), 1 deletion(-) create mode 100644 third_party/CMakeCache.txt create mode 100644 third_party/CMakeFiles/3.11.1/CMakeSystem.cmake create mode 100644 third_party/CMakeFiles/CMakeOutput.log create mode 100644 third_party/CMakeFiles/cmake.check_cache create mode 160000 third_party/CXXTerminal diff --git a/client b/client index 3280a9d..9f4470d 160000 --- a/client +++ b/client @@ -1 +1 @@ -Subproject commit 3280a9d398deb4bf62f0377058dc652fc8564db9 +Subproject commit 9f4470dacb58e6d4838bd678b85b7841923c0ba9 diff --git a/helper.txt b/helper.txt index d8d9e8b..e634552 100644 --- a/helper.txt +++ b/helper.txt @@ -1,3 +1,7 @@ +Windows: + Make sure you have MSBuild.exe within your PATH variable! + "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" + Update/initialize git submodules (Using the refs given!): #Update the module git submodule update --init --recursive -f diff --git a/third_party/CMakeCache.txt b/third_party/CMakeCache.txt new file mode 100644 index 0000000..845fc01 --- /dev/null +++ b/third_party/CMakeCache.txt @@ -0,0 +1,95 @@ +# This is the CMakeCache file. +# For build in directory: c:/Users/WolverinDEV/TeaRoot-Client/third_party +# It was generated by CMake: C:/Program Files/CMake/bin/cmake.exe +# You can edit this file to change values found and used by cmake. +# If you do not want to change any of the values, simply exit the editor. +# If you do want to change a value, simply edit, save, and exit the editor. +# The syntax for the file is as follows: +# KEY:TYPE=VALUE +# KEY is the name of a variable in the cache. +# TYPE is a hint to GUIs for the type of VALUE, DO NOT EDIT TYPE!. +# VALUE is the current value for the KEY. + +######################## +# EXTERNAL cache entries +######################## + +//No help, variable specified on the command line. +CMAKE_BUILD_TYPE:UNINITIALIZED=Release + +//Limited configurations +CMAKE_CONFIGURATION_TYPES:STRING=Debug;Release + +//No help, variable specified on the command line. +CMAKE_C_FLAGS:UNINITIALIZED= -I../../boringssl/include/ + +//No help, variable specified on the command line. +CMAKE_INSTALL_PREFIX:UNINITIALIZED=C:/Users/WolverinDEV/TeaRoot-Client/third_party/libevent/out/win32_amd64/ + +//Value Computed by CMake +CMAKE_PROJECT_NAME:STATIC=libevent + +//No help, variable specified on the command line. +EVENT__DISABLE_BENCHMARK:UNINITIALIZED=ON + +//No help, variable specified on the command line. +EVENT__DISABLE_OPENSSL:UNINITIALIZED=ON + +//No help, variable specified on the command line. +EVENT__DISABLE_SAMPLES:UNINITIALIZED=ON + +//No help, variable specified on the command line. +EVENT__DISABLE_TESTS:UNINITIALIZED=ON + +//Set library type to SHARED/STATIC/BOTH (default SHARED for MSVC, +// otherwise BOTH) +EVENT__LIBRARY_TYPE:STRING=STATIC + +//No help, variable specified on the command line. +EVENT__MSVC_STATIC_RUNTIME:UNINITIALIZED=ON + +//Value Computed by CMake +libevent_BINARY_DIR:STATIC=C:/Users/WolverinDEV/TeaRoot-Client/third_party + +//Value Computed by CMake +libevent_SOURCE_DIR:STATIC=C:/Users/WolverinDEV/TeaRoot-Client/third_party/libevent + + +######################## +# INTERNAL cache entries +######################## + +//This is the directory where this CMakeCache.txt was created +CMAKE_CACHEFILE_DIR:INTERNAL=c:/Users/WolverinDEV/TeaRoot-Client/third_party +//Major version of cmake used to create the current loaded cache +CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3 +//Minor version of cmake used to create the current loaded cache +CMAKE_CACHE_MINOR_VERSION:INTERNAL=11 +//Patch version of cmake used to create the current loaded cache +CMAKE_CACHE_PATCH_VERSION:INTERNAL=1 +//Path to CMake executable. +CMAKE_COMMAND:INTERNAL=C:/Program Files/CMake/bin/cmake.exe +//Path to cpack program executable. +CMAKE_CPACK_COMMAND:INTERNAL=C:/Program Files/CMake/bin/cpack.exe +//Path to ctest program executable. +CMAKE_CTEST_COMMAND:INTERNAL=C:/Program Files/CMake/bin/ctest.exe +//Name of external makefile project generator. +CMAKE_EXTRA_GENERATOR:INTERNAL= +//Name of generator. +CMAKE_GENERATOR:INTERNAL=Visual Studio 15 2017 Win64 +//Generator instance identifier. +CMAKE_GENERATOR_INSTANCE:INTERNAL= +//Name of generator platform. +CMAKE_GENERATOR_PLATFORM:INTERNAL= +//Name of generator toolset. +CMAKE_GENERATOR_TOOLSET:INTERNAL= +//Source directory with the top level CMakeLists.txt file for this +// project +CMAKE_HOME_DIRECTORY:INTERNAL=C:/Users/WolverinDEV/TeaRoot-Client/third_party/libevent +//number of local generators +CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=1 +//Platform information initialized +CMAKE_PLATFORM_INFO_INITIALIZED:INTERNAL=1 +//Path to CMake installation. +CMAKE_ROOT:INTERNAL=C:/Program Files/CMake/share/cmake-3.11 + diff --git a/third_party/CMakeFiles/3.11.1/CMakeSystem.cmake b/third_party/CMakeFiles/3.11.1/CMakeSystem.cmake new file mode 100644 index 0000000..d49f395 --- /dev/null +++ b/third_party/CMakeFiles/3.11.1/CMakeSystem.cmake @@ -0,0 +1,15 @@ +set(CMAKE_HOST_SYSTEM "Windows-6.1.7601") +set(CMAKE_HOST_SYSTEM_NAME "Windows") +set(CMAKE_HOST_SYSTEM_VERSION "6.1.7601") +set(CMAKE_HOST_SYSTEM_PROCESSOR "AMD64") + + + +set(CMAKE_SYSTEM "Windows-6.1.7601") +set(CMAKE_SYSTEM_NAME "Windows") +set(CMAKE_SYSTEM_VERSION "6.1.7601") +set(CMAKE_SYSTEM_PROCESSOR "AMD64") + +set(CMAKE_CROSSCOMPILING "FALSE") + +set(CMAKE_SYSTEM_LOADED 1) diff --git a/third_party/CMakeFiles/CMakeOutput.log b/third_party/CMakeFiles/CMakeOutput.log new file mode 100644 index 0000000..248f256 --- /dev/null +++ b/third_party/CMakeFiles/CMakeOutput.log @@ -0,0 +1 @@ +The system is: Windows - 6.1.7601 - AMD64 diff --git a/third_party/CMakeFiles/cmake.check_cache b/third_party/CMakeFiles/cmake.check_cache new file mode 100644 index 0000000..3dccd73 --- /dev/null +++ b/third_party/CMakeFiles/cmake.check_cache @@ -0,0 +1 @@ +# This file is generated by cmake for dependency checking of the CMakeCache.txt file diff --git a/third_party/CXXTerminal b/third_party/CXXTerminal new file mode 160000 index 0000000..d93597c --- /dev/null +++ b/third_party/CXXTerminal @@ -0,0 +1 @@ +Subproject commit d93597ce7e5bd0f22bf27be5d89535e34de70fd1 From 9ff5024d39d5bc59ca478e61d50fe2cde750b61d Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Sun, 3 Nov 2019 15:59:51 +0100 Subject: [PATCH 6/6] Removed CMakeFiles --- third_party/CMakeCache.txt | 95 ------------------- .../CMakeFiles/3.11.1/CMakeSystem.cmake | 15 --- third_party/CMakeFiles/CMakeOutput.log | 1 - third_party/CMakeFiles/cmake.check_cache | 1 - 4 files changed, 112 deletions(-) delete mode 100644 third_party/CMakeCache.txt delete mode 100644 third_party/CMakeFiles/3.11.1/CMakeSystem.cmake delete mode 100644 third_party/CMakeFiles/CMakeOutput.log delete mode 100644 third_party/CMakeFiles/cmake.check_cache diff --git a/third_party/CMakeCache.txt b/third_party/CMakeCache.txt deleted file mode 100644 index 845fc01..0000000 --- a/third_party/CMakeCache.txt +++ /dev/null @@ -1,95 +0,0 @@ -# This is the CMakeCache file. -# For build in directory: c:/Users/WolverinDEV/TeaRoot-Client/third_party -# It was generated by CMake: C:/Program Files/CMake/bin/cmake.exe -# You can edit this file to change values found and used by cmake. -# If you do not want to change any of the values, simply exit the editor. -# If you do want to change a value, simply edit, save, and exit the editor. -# The syntax for the file is as follows: -# KEY:TYPE=VALUE -# KEY is the name of a variable in the cache. -# TYPE is a hint to GUIs for the type of VALUE, DO NOT EDIT TYPE!. -# VALUE is the current value for the KEY. - -######################## -# EXTERNAL cache entries -######################## - -//No help, variable specified on the command line. -CMAKE_BUILD_TYPE:UNINITIALIZED=Release - -//Limited configurations -CMAKE_CONFIGURATION_TYPES:STRING=Debug;Release - -//No help, variable specified on the command line. -CMAKE_C_FLAGS:UNINITIALIZED= -I../../boringssl/include/ - -//No help, variable specified on the command line. -CMAKE_INSTALL_PREFIX:UNINITIALIZED=C:/Users/WolverinDEV/TeaRoot-Client/third_party/libevent/out/win32_amd64/ - -//Value Computed by CMake -CMAKE_PROJECT_NAME:STATIC=libevent - -//No help, variable specified on the command line. -EVENT__DISABLE_BENCHMARK:UNINITIALIZED=ON - -//No help, variable specified on the command line. -EVENT__DISABLE_OPENSSL:UNINITIALIZED=ON - -//No help, variable specified on the command line. -EVENT__DISABLE_SAMPLES:UNINITIALIZED=ON - -//No help, variable specified on the command line. -EVENT__DISABLE_TESTS:UNINITIALIZED=ON - -//Set library type to SHARED/STATIC/BOTH (default SHARED for MSVC, -// otherwise BOTH) -EVENT__LIBRARY_TYPE:STRING=STATIC - -//No help, variable specified on the command line. -EVENT__MSVC_STATIC_RUNTIME:UNINITIALIZED=ON - -//Value Computed by CMake -libevent_BINARY_DIR:STATIC=C:/Users/WolverinDEV/TeaRoot-Client/third_party - -//Value Computed by CMake -libevent_SOURCE_DIR:STATIC=C:/Users/WolverinDEV/TeaRoot-Client/third_party/libevent - - -######################## -# INTERNAL cache entries -######################## - -//This is the directory where this CMakeCache.txt was created -CMAKE_CACHEFILE_DIR:INTERNAL=c:/Users/WolverinDEV/TeaRoot-Client/third_party -//Major version of cmake used to create the current loaded cache -CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3 -//Minor version of cmake used to create the current loaded cache -CMAKE_CACHE_MINOR_VERSION:INTERNAL=11 -//Patch version of cmake used to create the current loaded cache -CMAKE_CACHE_PATCH_VERSION:INTERNAL=1 -//Path to CMake executable. -CMAKE_COMMAND:INTERNAL=C:/Program Files/CMake/bin/cmake.exe -//Path to cpack program executable. -CMAKE_CPACK_COMMAND:INTERNAL=C:/Program Files/CMake/bin/cpack.exe -//Path to ctest program executable. -CMAKE_CTEST_COMMAND:INTERNAL=C:/Program Files/CMake/bin/ctest.exe -//Name of external makefile project generator. -CMAKE_EXTRA_GENERATOR:INTERNAL= -//Name of generator. -CMAKE_GENERATOR:INTERNAL=Visual Studio 15 2017 Win64 -//Generator instance identifier. -CMAKE_GENERATOR_INSTANCE:INTERNAL= -//Name of generator platform. -CMAKE_GENERATOR_PLATFORM:INTERNAL= -//Name of generator toolset. -CMAKE_GENERATOR_TOOLSET:INTERNAL= -//Source directory with the top level CMakeLists.txt file for this -// project -CMAKE_HOME_DIRECTORY:INTERNAL=C:/Users/WolverinDEV/TeaRoot-Client/third_party/libevent -//number of local generators -CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=1 -//Platform information initialized -CMAKE_PLATFORM_INFO_INITIALIZED:INTERNAL=1 -//Path to CMake installation. -CMAKE_ROOT:INTERNAL=C:/Program Files/CMake/share/cmake-3.11 - diff --git a/third_party/CMakeFiles/3.11.1/CMakeSystem.cmake b/third_party/CMakeFiles/3.11.1/CMakeSystem.cmake deleted file mode 100644 index d49f395..0000000 --- a/third_party/CMakeFiles/3.11.1/CMakeSystem.cmake +++ /dev/null @@ -1,15 +0,0 @@ -set(CMAKE_HOST_SYSTEM "Windows-6.1.7601") -set(CMAKE_HOST_SYSTEM_NAME "Windows") -set(CMAKE_HOST_SYSTEM_VERSION "6.1.7601") -set(CMAKE_HOST_SYSTEM_PROCESSOR "AMD64") - - - -set(CMAKE_SYSTEM "Windows-6.1.7601") -set(CMAKE_SYSTEM_NAME "Windows") -set(CMAKE_SYSTEM_VERSION "6.1.7601") -set(CMAKE_SYSTEM_PROCESSOR "AMD64") - -set(CMAKE_CROSSCOMPILING "FALSE") - -set(CMAKE_SYSTEM_LOADED 1) diff --git a/third_party/CMakeFiles/CMakeOutput.log b/third_party/CMakeFiles/CMakeOutput.log deleted file mode 100644 index 248f256..0000000 --- a/third_party/CMakeFiles/CMakeOutput.log +++ /dev/null @@ -1 +0,0 @@ -The system is: Windows - 6.1.7601 - AMD64 diff --git a/third_party/CMakeFiles/cmake.check_cache b/third_party/CMakeFiles/cmake.check_cache deleted file mode 100644 index 3dccd73..0000000 --- a/third_party/CMakeFiles/cmake.check_cache +++ /dev/null @@ -1 +0,0 @@ -# This file is generated by cmake for dependency checking of the CMakeCache.txt file