From aaa5c4f843c92f71e13883250b28c0ef49a6235e Mon Sep 17 00:00:00 2001
From: WolverinDEV <git@did.science>
Date: Sat, 25 Jan 2020 16:29:16 +0100
Subject: [PATCH] Fixed DP script

---
 Jenkinsfile                  | 28 +++-------------------------
 build_nice.md                |  5 ++++-
 libraries/build_datapipes.sh |  4 ++--
 3 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 34a24ec..d113464 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2,8 +2,6 @@ pipeline {
     agent any
 
     parameters {
-       booleanParam(defaultValue: false, description: 'Enabled/disables the building of an optimized build', name: 'build_optimized')
-       booleanParam(defaultValue: true, description: 'Build the libraries as well', name: 'build_libraries')
        booleanParam(defaultValue: true, description: 'Deploy this build', name: 'deploy_build')
        choice(choices: ['none', 'x86_debug', 'x86_release', 'x86_stable', 'x64_debug', 'x64_release', 'x64_stable'], description: 'Which target do you want to build?', name: 'target')
     }
@@ -34,24 +32,14 @@ pipeline {
 				build_os_arch="amd64"
 			}
 			
-			stages {	
-				/* first of all we have to update our libraries */
-				stage ('libraries::update') {
-					steps {
-						sh './attach_modules.sh'
-					}
-				}
-
+			stages {
 				stage ('build::x64::libraries') {
-					when {
-						expression { params.build_libraries }
-					}
-						
 					environment {
 						CMAKE_BUILD_TYPE="RelWithDebInfo" /* we build out libraries every time in release mode! (Performance improve) */
 					}
 
 					steps {
+						sh './attach_modules.sh'
 						sh 'cd libraries; ./build.sh'
 					}
 				}
@@ -167,24 +155,14 @@ pipeline {
 			}
 			
 			stages {
-				/* first of all we have to update our libraries */
-				stage ('libraries::update') {
-					steps {
-						sh './attach_modules.sh'
-					}
-				}
-				
 				stage ('build::x86::libraries') {
-					when {
-						expression { params.build_libraries }
-					}
-						
 					environment {
 						CMAKE_BUILD_TYPE="RelWithDebInfo" /* we build out libraries every time in release mode! (Performance improve) */
 						BUILD_ARCH_TARGET="x86"
 					}
 
 					steps {
+						sh './attach_modules.sh'
 						sh 'cd libraries; ./build.sh'
 					}
 				}
diff --git a/build_nice.md b/build_nice.md
index f591e5d..accdd4e 100644
--- a/build_nice.md
+++ b/build_nice.md
@@ -84,10 +84,13 @@ make -j32
 
 Build libnice
 ```shell script
+[[ -z "${build_os_type}" ]] && export build_os_type=linux
+[[ -z "${build_os_type}" ]] && export build_os_arch=amd64
+
 apt-get install -y gtk-doc-tools
 git clone https://github.com/libnice/libnice.git && cd libnice
 
-export glib20_dir="`pwd`/../glibc-prebuild/linux_amd64/"
+export glib20_dir="`pwd`/../glibc-prebuild/${build_os_type}_${build_os_arch}/"
 export glib20_lib_path=$(realpath "$glib20_dir/lib/"*"/")
 export boringssl_path="`pwd`/../boringssl/"
 
diff --git a/libraries/build_datapipes.sh b/libraries/build_datapipes.sh
index 8ab5ea6..85d4566 100755
--- a/libraries/build_datapipes.sh
+++ b/libraries/build_datapipes.sh
@@ -29,9 +29,9 @@ if [[ ${build_os_type} != "win32" && "${_datapipes_webrtc}" == "ON" ]]; then
     #fi
 
     echo "Building dependencies"
-    #./build_usrsctp.sh
+    ./build_usrsctp.sh
     check_err_exit ${library_path} "Failed to build usrsctp!"
-    #./build_srtp.sh
+    ./build_srtp.sh
     check_err_exit ${library_path} "Failed to build srtp!"
 
     cd ..