diff --git a/jenkins/create_build.sh b/jenkins/create_build.sh index db5e491..7b9a5f6 100755 --- a/jenkins/create_build.sh +++ b/jenkins/create_build.sh @@ -11,7 +11,7 @@ function install_npm() { check_err_exit ${project_name} "Failed to install nodejs files!" npm update check_err_exit ${project_name} "Failed to update nodejs files!" - begin_task "${project_name}_update" "NPM installed" + end_task "${project_name}_update" "NPM installed" } function compile_scripts() { @@ -23,7 +23,7 @@ function compile_scripts() { npm run compile-sass check_err_exit ${project_name} "Failed to compile sass files!" - begin_task "${project_name}_tsc_sass" "TypeScript & SASS compiled" + end_task "${project_name}_tsc_sass" "TypeScript & SASS compiled" echo "" } @@ -38,7 +38,11 @@ function compile_native() { cd ${build_path} check_err_exit ${project_name} "Failed to enter build directory!" - cmake ../../ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_MODULE_PATH="/home/wolverindev/TeaSpeak-Client/cmake/" -DCMAKE_PLATFORM_INCLUDE="/home/wolverindev/TeaSpeak-Client/cmake/config/tearoot-client.cmake" -DLIBRARY_PATH="/home/wolverindev/TeaSpeak-Client/third_party/" + local _arguments="" + [[ ! -z "$module_path" ]] && _arguments="${_arguments} -DCMAKE_MODULE_PATH=\"$module_path\"" + [[ ! -z "$platform_include" ]] && _arguments="${_arguments} -DCMAKE_PLATFORM_INCLUDE=\"$platform_include\"" + [[ ! -z "$library_path" ]] && _arguments="${_arguments} -DLIBRARY_PATH=\"$library_path\"" + cmake ../../ -DCMAKE_BUILD_TYPE=RelWithDebInfo ${_arguments} check_err_exit ${project_name} "Failed create build targets!" cmake --build `pwd` --target teaclient_connection -- -j 12 @@ -50,7 +54,7 @@ function compile_native() { cmake --build `pwd` --target teaclient_ppt -- -j 12 check_err_exit ${project_name} "Failed build teaclient ppt!" - begin_task "${project_name}_native" "Native extensions compiled" + end_task "${project_name}_native" "Native extensions compiled" } install_npm