Fixed DP script
This commit is contained in:
		
							parent
							
								
									b9a3229e2e
								
							
						
					
					
						commit
						aaa5c4f843
					
				
							
								
								
									
										28
									
								
								Jenkinsfile
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										28
									
								
								Jenkinsfile
									
									
									
									
										vendored
									
									
								
							| @ -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' | ||||
| 					} | ||||
| 				} | ||||
|  | ||||
| @ -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/" | ||||
| 
 | ||||
|  | ||||
| @ -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 .. | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user