TeaSpeak/Server-Root
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed DP script

Browse Source
This commit is contained in:
WolverinDEV 2020-01-25 16:29:16 +01:00
parent b9a3229e2e
commit aaa5c4f843
3 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Jenkinsfile vendored
View File

@ -2,8 +2,6 @@ pipeline {
agent any agent any
parameters { 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') 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') 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')
} }
@ -35,23 +33,13 @@ pipeline {
} }
stages { stages {
/* first of all we have to update our libraries */
stage ('libraries::update') {
steps {
sh './attach_modules.sh'
}
}
stage ('build::x64::libraries') { stage ('build::x64::libraries') {
when {
expression { params.build_libraries }
}
environment { environment {
CMAKE_BUILD_TYPE="RelWithDebInfo" /* we build out libraries every time in release mode! (Performance improve) */ CMAKE_BUILD_TYPE="RelWithDebInfo" /* we build out libraries every time in release mode! (Performance improve) */
} }
steps { steps {
sh './attach_modules.sh'
sh 'cd libraries; ./build.sh' sh 'cd libraries; ./build.sh'
} }
} }
@ -167,24 +155,14 @@ pipeline {
} }
stages { stages {
/* first of all we have to update our libraries */
stage ('libraries::update') {
steps {
sh './attach_modules.sh'
}
}
stage ('build::x86::libraries') { stage ('build::x86::libraries') {
when {
expression { params.build_libraries }
}
environment { environment {
CMAKE_BUILD_TYPE="RelWithDebInfo" /* we build out libraries every time in release mode! (Performance improve) */ CMAKE_BUILD_TYPE="RelWithDebInfo" /* we build out libraries every time in release mode! (Performance improve) */
BUILD_ARCH_TARGET="x86" BUILD_ARCH_TARGET="x86"
} }
steps { steps {
sh './attach_modules.sh'
sh 'cd libraries; ./build.sh' sh 'cd libraries; ./build.sh'
} }
} }

5
build_nice.md
View File

@ -84,10 +84,13 @@ make -j32
Build libnice Build libnice
```shell script ```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 apt-get install -y gtk-doc-tools
git clone https://github.com/libnice/libnice.git && cd libnice 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 glib20_lib_path=$(realpath "$glib20_dir/lib/"*"/")
export boringssl_path="`pwd`/../boringssl/" export boringssl_path="`pwd`/../boringssl/"

4
libraries/build_datapipes.sh
View File

@ -29,9 +29,9 @@ if [[ ${build_os_type} != "win32" && "${_datapipes_webrtc}" == "ON" ]]; then
#fi #fi
echo "Building dependencies" echo "Building dependencies"
#./build_usrsctp.sh ./build_usrsctp.sh
check_err_exit ${library_path} "Failed to build usrsctp!" check_err_exit ${library_path} "Failed to build usrsctp!"
#./build_srtp.sh ./build_srtp.sh
check_err_exit ${library_path} "Failed to build srtp!" check_err_exit ${library_path} "Failed to build srtp!"
cd .. cd ..