Updated build scripts

rtclib

@@ -1 +1 @@
-Subproject commit e48944c14b4e12a20f2d259e9ec4625c0aadc16b
+Subproject commit 35bbb45bc05fc79c0866cb3b949c7025b199957e

server/CMakeLists.txt

@@ -289,7 +289,7 @@ target_link_libraries(TeaSpeakServer
 
         #Require a so
         sqlite3
-        DataPipes::core::shared
+        DataPipes::core::static
 
         breakpad::static
         protobuf::libprotobuf
@@ -303,10 +303,10 @@ target_link_libraries(TeaSpeakServer
         zstd::libzstd_static
 )
 
-if(EXISTS "${CMAKE_SOURCE_DIR}/rtclib/librtc.so" AND NOT NO_RELEASE_RTC)
+if(EXISTS "${CMAKE_SOURCE_DIR}/rtclib/libteaspeak_rtc.so" AND NOT NO_RELEASE_RTC)
    message("Linking to release librtc file")
    target_link_libraries(TeaSpeakServer
-           ${CMAKE_SOURCE_DIR}/rtclib/librtc.so
+           ${CMAKE_SOURCE_DIR}/rtclib/libteaspeak_rtc.so
    )
 elseif(EXISTS "${CMAKE_SOURCE_DIR}/rtclib/target/debug/libteaspeak_rtc.so")
     message("Linkding against debug libteaspeak_rtc.so")
@@ -361,4 +361,4 @@ target_link_libraries(Snapshots-Permissions-Test PUBLIC
     tommath::static
     ${glib20_DIR}/lib/x86_64-linux-gnu/libffi.so.7 ${nice_DIR}/lib/libnice.so.10
 )
-target_include_directories(Snapshots-Permissions-Test PUBLIC ${CMAKE_SOURCE_DIR}/server/src/)
+target_include_directories(Snapshots-Permissions-Test PUBLIC ${CMAKE_SOURCE_DIR}/server/src/)

server/repro/generate_libraries.sh

@@ -3,15 +3,10 @@
 #Required libraries:
 # "libssl.so"
 # "libcrypto.so"
-# "libDataPipes-Rtc-Shared.so"
 # "libjemalloc.so.2"
 # "libsqlite3.so.0"
 # "libTeaMusic.so"
-# "libnice.so.10"
+# "libteaspeak_rtc.so"
-# "libpcre.so.3" (only for web)
-# "libgobject-2.0.so.0" (only for web)
-# "libglib-2.0.so.0" (only for web)
-# "libffi.so.7"
 
 [[ -z "${build_os_type}" ]] && { echo "missing build os type"; exit 1; }
 [[ -z "${build_os_arch}" ]] && { echo "missing build os arch"; exit 1; }
@@ -49,11 +44,6 @@ cp "${library_path}" . || { echo "failed to copy libssl.so.1.1"; exit 1; }
 query_system_link "libcrypto.so.1.1"
 cp "${library_path}" . || { echo "failed to copy libcrypto.so.1.1"; exit 1; }
 
-# Setting up DataPipes
-library_path=$(realpath "${library_base}/DataPipes/${build_path}/lib/libDataPipes-Rtc-Shared.so")
-cp "$library_path" . || { echo "failed to copy libDataPipes-Rtc-Shared.so"; exit 1; }
-_dp_path="$library_path"
-
 # Setting up Sqlite3
 query_system_link "libsqlite3.so.0"
 cp "${library_path}" . || { echo "failed to copy libsqlite3.so.0"; exit 1; }
@@ -66,34 +56,14 @@ cp "${library_path}" . || { echo "failed to copy libjemalloc.so.2"; exit 1; }
 library_path=$(realpath "../../../../MusicBot/libs/libTeaMusic.so")
 cp "$library_path" . || { echo "failed to copy libTeaMusic.so"; exit 1; }
 
-if ldd "../../../environment/TeaSpeakServer" | grep -q "libnice.so.10"; then
+query_system_link "libteaspeak_rtc.so"
-    echo "Adding web libraries"
+cp "${library_path}" . || { echo "failed to copy libteaspeak_rtc.so"; exit 1; }
-
-    # Setting up libnice
-    library_path=$(realpath "${library_base}/libnice/${build_os_type}_${build_os_arch}/lib/libnice.so.10")
-    cp "$library_path" libnice.so.10 || { echo "failed to copy libnice.so.10"; exit 1; }
-
-
-    glib_libs=$(realpath "${library_base}//glibc/${build_os_type}_${build_os_arch}/lib/"*"/")
-    cp "$glib_libs/libgobject-2.0.so.0" . || { echo "failed to copy libgobject-2.0.so.0"; exit 1; }
-    cp "$glib_libs/libgmodule-2.0.so.0" . || { echo "failed to copy libgmodule-2.0.so.0"; exit 1; }
-    cp "$glib_libs/libglib-2.0.so.0" . || { echo "failed to copy libglib-2.0.so.0"; exit 1; }
-    cp "$glib_libs/libgio-2.0.so.0" . || { echo "failed to copy libgio-2.0.so.0"; exit 1; }
-    cp "$glib_libs/libffi.so.7" . || { echo "failed to copy libffi.so.7"; exit 1; }
-
-    # "libgobject-2.0.so.0" (only for web)
-    # "libglib-2.0.so.0" (only for web)
-
-    # Setting up libpcre
-    query_system_link "libpcre.so.3" "$_dp_path"
-    cp "${library_path}" . || { echo "failed to copy libpcre.so.3"; exit 1; }
-fi
 
 # Doing some prostprocessing
 chmod 755 *
 for file in *.so*; do
     echo "Editing rpath for $file"
-    strip -s "$file"
+    strip --strip-all "$file"
     patchelf --set-rpath "./libs/:./" "$file"
 done
 

server/repro/make_symbol.sh

@@ -38,4 +38,5 @@ function create_dump() {
 create_dump "env" "TeaSpeakServer"
 create_dump "env/providers" "000ProviderFFMpeg.so"
 create_dump "env/providers" "001ProviderYT.so"
+create_dump "env/libs/" "libteaspeak_rtc.so"
 echo "Created dump symbols!"