From e0ab61fa60af03b2c3cb1afd69918258cc634d0b Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Tue, 28 May 2019 17:49:03 +0200 Subject: [PATCH] fixed build script --- Web-Client | 1 + attach_modules.sh | 14 +++----------- libraries/build_mysqlconnector.sh | 2 +- libraries/mysqlconnector | 2 +- 4 files changed, 6 insertions(+), 13 deletions(-) create mode 160000 Web-Client diff --git a/Web-Client b/Web-Client new file mode 160000 index 0000000..2b00136 --- /dev/null +++ b/Web-Client @@ -0,0 +1 @@ +Subproject commit 2b00136e6eb724deb0c92e643441391212f7109f diff --git a/attach_modules.sh b/attach_modules.sh index b11accc..ac6baa0 100755 --- a/attach_modules.sh +++ b/attach_modules.sh @@ -1,5 +1,7 @@ #!/bin/bash +#The libs have no need to be attach to the master :) +cd TeaSpeak git submodule foreach -q --recursive ' echo "Updating $name"; BRANCH=$(git config -f $toplevel/.gitmodules submodule.$name.branch || echo master) @@ -8,14 +10,4 @@ if [ -z ${BRANCH} ]; then fi git checkout ${BRANCH}; echo "git pull origin ${BRANCH}" -git pull origin ${BRANCH}' - -git submodule foreach -q --recursive ' -echo "Updating $name"; -CHECKOUT=$(git config -f $toplevel/.gitmodules submodule.$name.checkout) -if [ ! -z ${CHECKOUT} ]; then - git checkout ${CHECKOUT}; - echo "Checking out ${CHECKOUT} for $name" -fi -' - +git pull origin ${BRANCH}' \ No newline at end of file diff --git a/libraries/build_mysqlconnector.sh b/libraries/build_mysqlconnector.sh index f36d0d6..832bfa4 100755 --- a/libraries/build_mysqlconnector.sh +++ b/libraries/build_mysqlconnector.sh @@ -11,6 +11,6 @@ if ! [ "${HEADER:0:34}" == "#if !defined(SSL_ERROR_WANT_ASYNC)" ]; then `cat cdk/foundation/connection_openssl.cc`" > cdk/foundation/connection_openssl.cc fi cd build -cmake .. -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -I../../boringssl/include/ ${CXX_FLAGS}" -DWITH_JDBC=ON -DWITH_SSL="`pwd`/../../boringssl/" -DOPENSSL_ROOT_DIR="`pwd`/../../boringssl/" -DCMAKE_C_FLAGS="${C_FLAGS}" -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_OPTIONS} +cmake .. -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -I../../boringssl/include/ ${CXX_FLAGS}" -DWITH_JDBC=OFF -DWITH_SSL="`pwd`/../../boringssl/" -DOPENSSL_ROOT_DIR="`pwd`/../../boringssl/" -DCMAKE_C_FLAGS="${C_FLAGS}" -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_OPTIONS} make ${CMAKE_MAKE_OPTIONS} sudo make install diff --git a/libraries/mysqlconnector b/libraries/mysqlconnector index 7abcdc8..c836e39 160000 --- a/libraries/mysqlconnector +++ b/libraries/mysqlconnector @@ -1 +1 @@ -Subproject commit 7abcdc88c8235f02096e21b5bcd72e8312508f61 +Subproject commit c836e39f4623ae39a9701e74873e4f33f9285780