Some updates for automated building
This commit is contained in:
parent
f16eb68a50
commit
6934b8266c
16
build_client.sh
Executable file
16
build_client.sh
Executable file
@ -0,0 +1,16 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
cd $(dirname $0)
|
||||
|
||||
tearoot_cmake_config="`pwd`/cmake/config/tearoot-client.cmake"
|
||||
tearoot_cmake_module="`pwd`/cmake/"
|
||||
traroot_library="`pwd`/third_party"
|
||||
|
||||
shared_path="client"
|
||||
source scripts/build_helper.sh
|
||||
begin_task "build_client" "Building client"
|
||||
|
||||
./client/jenkins/create_build.sh
|
||||
check_err_exit ${shared_path} "Failed to build client!"
|
||||
|
||||
end_task "build_client" "Client build finished"
|
2
client
2
client
@ -1 +1 @@
|
||||
Subproject commit 4606504266dfddd043f738f85a34896335ec3803
|
||||
Subproject commit 732b956fd898e4e73f04e0380181e6839f029ac1
|
@ -32,7 +32,7 @@ find_path(ed25519_INCLUDE_DIR
|
||||
)
|
||||
|
||||
find_library(ed25519_LIBRARIES_STATIC
|
||||
NAMES ed25519.lib ed25519.a
|
||||
NAMES ed25519.lib ed25519.a libed25519.a
|
||||
HINTS ${ed25519_ROOT_DIR} ${ed25519_ROOT_DIR}/lib
|
||||
)
|
||||
|
||||
|
@ -32,12 +32,12 @@ find_path(opus_INCLUDE_DIR
|
||||
)
|
||||
|
||||
find_library(opus_LIBRARIES_STATIC
|
||||
NAMES opus.a opus.lib
|
||||
NAMES libopus.a opus.a opus.lib
|
||||
HINTS ${opus_ROOT_DIR} ${opus_ROOT_DIR}/lib
|
||||
)
|
||||
|
||||
find_library(opus_LIBRARIES_SHARED
|
||||
NAMES opus.dll opus.so
|
||||
NAMES opus.dll libopus.so opus.so
|
||||
HINTS ${opus_ROOT_DIR} ${opus_ROOT_DIR}/lib
|
||||
)
|
||||
|
||||
|
@ -32,12 +32,12 @@ find_path(PortAudio_INCLUDE_DIR
|
||||
)
|
||||
|
||||
find_library(PortAudio_LIBRARIES_STATIC
|
||||
NAMES portaudio_static_x64.a portaudio_static_x64.lib
|
||||
NAMES libportaudio.a portaudio_static_x64.a portaudio_static_x64.lib
|
||||
HINTS ${PortAudio_ROOT_DIR} ${PortAudio_ROOT_DIR}/lib
|
||||
)
|
||||
|
||||
find_library(PortAudio_LIBRARIES_SHARED
|
||||
NAMES portaudio_shared_x64.dll portaudio_shared_x64.so
|
||||
NAMES libportaudio.so portaudio_shared_x64.dll portaudio_shared_x64.so
|
||||
HINTS ${PortAudio_ROOT_DIR} ${PortAudio_ROOT_DIR}/lib
|
||||
)
|
||||
|
||||
|
@ -22,7 +22,7 @@ include(tearoot-helper)
|
||||
include(FindPackageHandleStandardArgs)
|
||||
|
||||
find_path(soxr_ROOT_DIR
|
||||
NAMES src/Definitions.h CMakeLists.txt
|
||||
NAMES include/soxr.h
|
||||
HINTS ${soxr_ROOT_DIR} ${soxr_ROOT_DIR}/${BUILD_OUTPUT}
|
||||
)
|
||||
|
||||
@ -32,12 +32,12 @@ find_path(soxr_INCLUDE_DIR
|
||||
)
|
||||
|
||||
find_library(soxr_LIBRARIES_STATIC
|
||||
NAMES soxr.a soxr.lib
|
||||
NAMES libsoxr.a soxr.a soxr.lib
|
||||
HINTS ${soxr_ROOT_DIR} ${soxr_ROOT_DIR}/lib
|
||||
)
|
||||
|
||||
find_library(soxr_LIBRARIES_SHARED
|
||||
NAMES soxr.dll soxr.so
|
||||
NAMES soxr.dll libsoxr.so soxr.so
|
||||
HINTS ${soxr_ROOT_DIR} ${soxr_ROOT_DIR}/lib
|
||||
)
|
||||
|
||||
|
@ -32,12 +32,12 @@ find_path(StringVariable_INCLUDE_DIR
|
||||
)
|
||||
|
||||
find_library(StringVariable_LIBRARIES_STATIC
|
||||
NAMES StringVariablesStatic.lib StringVariablesStatic.a
|
||||
NAMES StringVariablesStatic.lib libStringVariablesStatic.a StringVariablesStatic.a
|
||||
HINTS ${StringVariable_ROOT_DIR} ${StringVariable_ROOT_DIR}/lib
|
||||
)
|
||||
|
||||
find_library(StringVariable_LIBRARIES_SHARED
|
||||
NAMES StringVariable.dll StringVariable.so
|
||||
NAMES StringVariable.dll libStringVariable.so StringVariable.so
|
||||
HINTS ${StringVariable_ROOT_DIR} ${StringVariable_ROOT_DIR}/lib
|
||||
)
|
||||
|
||||
|
@ -33,20 +33,13 @@ find_path(TeaSpeak_SharedLib_INCLUDE_DIR
|
||||
)
|
||||
|
||||
find_library(TeaSpeak_SharedLib_LIBRARIES_STATIC
|
||||
NAMES TeaSpeak.a TeaSpeak.lib
|
||||
PATH_SUFFIXES out/win32_amd64/RelWithDebInfo out/win32/Release
|
||||
HINTS
|
||||
${TeaSpeak_SharedLib_ROOT_DIR}
|
||||
${TeaSpeak_SharedLib_ROOT_DIR}/build
|
||||
${TeaSpeak_SharedLib_ROOT_DIR}/libs
|
||||
${TeaSpeak_SharedLib_ROOT_DIR}/out/
|
||||
${TeaSpeak_SharedLib_ROOT_DIR}/cmake-build-relwithdebinfo
|
||||
NAMES libTeaSpeak.a TeaSpeak.a TeaSpeak.lib
|
||||
HINTS ${TeaSpeak_SharedLib_ROOT_DIR}/cmake-build-debug/ ${TeaSpeak_SharedLib_ROOT_DIR}/cmake-build-relwithdebinfo/ ${TeaSpeak_SharedLib_ROOT_DIR}/${BUILD_OUTPUT}/lib
|
||||
)
|
||||
|
||||
find_library(TeaSpeak_SharedLib_LIBRARIES_SHARED
|
||||
NAMES TeaSpeak.dll TeaSpeak.so
|
||||
PATH_SUFFIXES out/win32_amd64/RelWithDebInfo out/win32/Release
|
||||
HINTS ${TeaSpeak_SharedLib_ROOT_DIR} ${TeaSpeak_SharedLib_ROOT_DIR}/build ${TeaSpeak_SharedLib_ROOT_DIR}/libs ${TeaSpeak_SharedLib_ROOT_DIR}/out/
|
||||
NAMES TeaSpeak.dll libTeaSpeak.so TeaSpeak.so
|
||||
HINTS ${TeaSpeak_SharedLib_ROOT_DIR}/cmake-build-debug/ ${TeaSpeak_SharedLib_ROOT_DIR}/cmake-build-relwithdebinfo/ ${TeaSpeak_SharedLib_ROOT_DIR}/${BUILD_OUTPUT}/lib
|
||||
)
|
||||
|
||||
find_package_handle_standard_args(TeaSpeak_SharedLib DEFAULT_MSG
|
||||
|
@ -33,7 +33,7 @@ find_path(ThreadPool_INCLUDE_DIR
|
||||
)
|
||||
|
||||
find_library(ThreadPool_LIBRARIES_STATIC
|
||||
NAMES ThreadPoolStatic.lib ThreadPoolStatic.a
|
||||
NAMES ThreadPoolStatic.lib ThreadPoolStatic.a libThreadPoolStatic.a
|
||||
HINTS ${ThreadPool_ROOT_DIR} ${ThreadPool_ROOT_DIR}/lib
|
||||
)
|
||||
|
||||
|
@ -22,13 +22,13 @@ include(tearoot-helper)
|
||||
include(FindPackageHandleStandardArgs)
|
||||
|
||||
find_path(TomCrypt_ROOT_DIR
|
||||
NAMES src/headers/tomcrypt.h makefile LICENSE
|
||||
NAMES include/tomcrypt.h
|
||||
HINTS ${TomCrypt_ROOT_DIR} ${TomCrypt_ROOT_DIR}/${BUILD_OUTPUT}
|
||||
)
|
||||
|
||||
find_path(TomCrypt_INCLUDE_DIR
|
||||
NAMES tomcrypt.h tomcrypt_cfg.h
|
||||
HINTS ${TomCrypt_ROOT_DIR} ${TomCrypt_ROOT_DIR}/include/ ${TomCrypt_ROOT_DIR}/src/headers
|
||||
HINTS ${TomCrypt_ROOT_DIR} ${TomCrypt_ROOT_DIR}/include/
|
||||
)
|
||||
|
||||
find_library(TomCrypt_LIBRARIES_STATIC
|
||||
|
@ -27,13 +27,13 @@ find_path(TomMath_INCLUDE_DIR
|
||||
)
|
||||
|
||||
find_library(TomMath_LIBRARIES_STATIC
|
||||
NAMES tommath.lib tommath.a
|
||||
HINTS ${TomMath_ROOT_DIR} ${TomMath_ROOT_DIR}/lib
|
||||
NAMES tommath.lib tommath.a libtommath.a libtommathStatic.a
|
||||
HINTS ${TomMath_ROOT_DIR} ${TomMath_ROOT_DIR}/${BUILD_OUTPUT} ${TomMath_ROOT_DIR}/lib
|
||||
)
|
||||
|
||||
find_library(TomMath_LIBRARIES_SHARED
|
||||
NAMES tommath.dll tommath.so
|
||||
HINTS ${TomMath_ROOT_DIR} ${TomMath_ROOT_DIR}/lib
|
||||
NAMES tommath.dll libtommath.so tommath.so libtommathShared.so
|
||||
HINTS ${TomMath_ROOT_DIR} ${TomMath_ROOT_DIR}/${BUILD_OUTPUT} ${TomMath_ROOT_DIR} ${TomMath_ROOT_DIR}/lib
|
||||
)
|
||||
|
||||
find_package_handle_standard_args(TomMath DEFAULT_MSG
|
||||
|
@ -18,6 +18,6 @@ SET(PortAudio_ROOT_DIR "${LIBRARY_PATH}/portaudio/${BUILD_OUTPUT}")
|
||||
SET(fvad_ROOT_DIR "${LIBRARY_PATH}/libfvad/${BUILD_OUTPUT}")
|
||||
SET(opus_ROOT_DIR "${LIBRARY_PATH}/opus/${BUILD_OUTPUT}")
|
||||
SET(breakpad_ROOT_DIR "${LIBRARY_PATH}/breakpad/${BUILD_OUTPUT}")
|
||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${LIBRARY_PATH}/spdlog/${BUILD_OUTPUT}")
|
||||
SET(TeaSpeak_SharedLib_ROOT_DIR "${LIBRARY_PATH}/../shared/")
|
||||
|
||||
#SET(TeaSpeak_SharedLib_ROOT_DIR "C:/Users/WolverinDEV/TeaSpeak/TeaSpeak-SharedLib")
|
||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${LIBRARY_PATH}/spdlog/${BUILD_OUTPUT}")
|
2
third_party/CXXTerminal
vendored
2
third_party/CXXTerminal
vendored
@ -1 +1 @@
|
||||
Subproject commit d47b5d14e362eff7ae50c9040f9a4cf6b80b237e
|
||||
Subproject commit a765e5688c7c54f2c57d0074d5aee22f2e7eb8d4
|
2
third_party/DataPipes
vendored
2
third_party/DataPipes
vendored
@ -1 +1 @@
|
||||
Subproject commit 6e22ff0611b3fd4eacdbe59be8c7f060f0ab32c4
|
||||
Subproject commit af3e81fae5ea68f9b617821c148f2a44baafc84d
|
2
third_party/Thread-Pool
vendored
2
third_party/Thread-Pool
vendored
@ -1 +1 @@
|
||||
Subproject commit 9ce59992ee8a538aad54911d0b5883333be95d7e
|
||||
Subproject commit 30e8c6f36fe246aa8974c9b1748621b19b66c552
|
2
third_party/boringssl
vendored
2
third_party/boringssl
vendored
@ -1 +1 @@
|
||||
Subproject commit d72738afe17a5ed64d8c1d606105dabec51d8754
|
||||
Subproject commit 8289fee35e8ba5d6acebe0a217618aca66658c2c
|
2
third_party/build.sh
vendored
2
third_party/build.sh
vendored
@ -31,6 +31,8 @@ exec_script build_ed25519.sh
|
||||
exec_script build_jsoncpp.sh
|
||||
#exec_script build_mysqlconnector.sh
|
||||
exec_script build_opus.sh
|
||||
exec_script build_soxr.sh
|
||||
exec_script build_portaudio.sh
|
||||
exec_script build_protobuf.sh
|
||||
exec_script build_spdlog.sh
|
||||
exec_script build_stringvariable.sh
|
||||
|
2
third_party/build_event.sh
vendored
2
third_party/build_event.sh
vendored
@ -6,6 +6,6 @@ library_path="libevent"
|
||||
requires_rebuild ${library_path}
|
||||
[[ $? -eq 0 ]] && exit 0
|
||||
|
||||
cmake_build ${library_path} -DCMAKE_C_FLAGS="-fPIC -I../../boringssl/include/" -DEVENT__DISABLE_TESTS=ON -DEVENT__DISABLE_OPENSSL=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo
|
||||
cmake_build ${library_path} -DCMAKE_C_FLAGS="-fPIC -I../../boringssl/include/" -DEVENT__DISABLE_TESTS=ON -DEVENT__DISABLE_OPENSSL=ON -DEVENT__DISABLE_THREAD_SUPPORT=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo
|
||||
check_err_exit ${library_path} "Failed to build libevent!"
|
||||
set_build_successful ${library_path}
|
2
third_party/build_opus.sh
vendored
2
third_party/build_opus.sh
vendored
@ -6,6 +6,6 @@ library_path="opus"
|
||||
requires_rebuild ${library_path}
|
||||
[[ $? -eq 0 ]] && exit 0
|
||||
|
||||
cmake_build ${library_path} -DOPUS_X86_PRESUME_AVX=OFF -DOPUS_X86_PRESUME_SSE4_1=OFF
|
||||
cmake_build ${library_path} -DCMAKE_C_FLAGS="-fPIC" -DOPUS_X86_PRESUME_AVX=OFF -DOPUS_X86_PRESUME_SSE4_1=OFF
|
||||
check_err_exit ${library_path} "Failed to build opus!"
|
||||
set_build_successful ${library_path}
|
11
third_party/build_portaudio.sh
vendored
Executable file
11
third_party/build_portaudio.sh
vendored
Executable file
@ -0,0 +1,11 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
source ../scripts/build_helper.sh
|
||||
|
||||
library_path="portaudio"
|
||||
requires_rebuild ${library_path}
|
||||
[[ $? -eq 0 ]] && exit 0
|
||||
|
||||
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}
|
11
third_party/build_soxr.sh
vendored
Executable file
11
third_party/build_soxr.sh
vendored
Executable file
@ -0,0 +1,11 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
source ../scripts/build_helper.sh
|
||||
|
||||
library_path="soxr"
|
||||
requires_rebuild ${library_path}
|
||||
[[ $? -eq 0 ]] && exit 0
|
||||
|
||||
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}
|
4
third_party/build_tom.sh
vendored
4
third_party/build_tom.sh
vendored
@ -17,10 +17,8 @@ requires_rebuild ${library_path}
|
||||
export tommath_library="`pwd`/tommath/out/${build_os_type}_${build_os_arch}/libtommathStatic.a"
|
||||
export tommath_include="`pwd`/tommath/out/${build_os_type}_${build_os_arch}/include/"
|
||||
|
||||
cd tomcrypt/
|
||||
chmod +x create_build.sh && ./create_build.sh
|
||||
cmake_build ${library_path} -DCMAKE_C_FLAGS="-fPIC -DUSE_LTM -DLTM_DESC -I$tommath_include" -DCMAKE_BUILD_TYPE=RelWithDebInfo
|
||||
check_err_exit ${library_path} "Failed to build tomcrypt!"
|
||||
cd ..
|
||||
set_build_successful ${library_path}
|
||||
}
|
||||
exit 0
|
2
third_party/mysqlconnector
vendored
2
third_party/mysqlconnector
vendored
@ -1 +1 @@
|
||||
Subproject commit 7abcdc88c8235f02096e21b5bcd72e8312508f61
|
||||
Subproject commit a27b1bbb16578806c564405ebb372d800d062514
|
2
third_party/protobuf
vendored
2
third_party/protobuf
vendored
@ -1 +1 @@
|
||||
Subproject commit 8b0968625331457e79ba2e7eef5b35af3a95129e
|
||||
Subproject commit 01ede6049bbc38e610cf2d03f366d8ad6ab1c83d
|
2
third_party/tomcrypt
vendored
2
third_party/tomcrypt
vendored
@ -1 +1 @@
|
||||
Subproject commit 4879783917775339a3dcd95cd71d4e8ff27523c2
|
||||
Subproject commit fa24dec9349ba9b13ac49746b219f1e852829774
|
Loading…
Reference in New Issue
Block a user