diff --git a/CMakeLists.txt b/CMakeLists.txt index f79c1ce..d595911 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,9 @@ if (UNIX AND NOT MINGW) set(CPACK_RPM_PACKAGE_LICENSE "MPL-2.0") set(CPACK_RPM_PACKAGE_VERSION ${PROJECT_VERSION}) set(CPACK_RPM_PACKAGE_RELEASE ${TIME}) - set(CPACK_GENERATOR TGZ;STGZ;DEB;RPM) + if (NOT DEFINED CPACK_GENERATOR) + set(CPACK_GENERATOR TGZ;STGZ;DEB;RPM) + endif() install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ybcon PERMISSIONS OWNER_WRITE diff --git a/Jenkinsfile b/Jenkinsfile index 685ebcb..1c281ab 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,23 +12,23 @@ pipeline { steps { echo 'Building..' cmakeBuild buildDir: 'cmake-build-release', buildType: 'release', cleanBuild: true, installation: 'Main' + cmakeBuild buildDir: 'cmake-build-release-arm', buildType: 'release', cleanBuild: true, installation: 'Main', + cmakeArgs: '-DCMAKE_C_COMPILER=/usr/bin/arm-linux-gnueabi-gcc -DCMAKE_CXX_COMPILER=/usr/bin/arm-linux-gnueabi-g++ -DCMAKE_LINKER=/usr/bin/arm-linux-gnueabi-ld.gold -DCMAKE_AR=/usr/bin/arm-linux-gnueabi-ar -DCPACK_GENERATOR="TGZ;STGZ"' cmakeBuild buildDir: 'cmake-build-release-win32', buildType: 'release', cleanBuild: true, installation: 'Main', cmakeArgs: '-DCMAKE_C_COMPILER=/usr/bin/i686-w64-mingw32-gcc -DCMAKE_CXX_COMPILER=/usr/bin/i686-w64-mingw32-c++' cmake arguments: '--build ./cmake-build-release --target ybcon -- -j 9', installation: 'Main' cmake arguments: '--build ./cmake-build-release-win32 --target ybcon -- -j 9', installation: 'Main' cpack installation: 'Main', workingDir: 'cmake-build-release' + cpack installation: 'Main', workingDir: 'cmake-build-release-arm' cpack installation: 'Main', workingDir: 'cmake-build-release-win32' } } stage('Deploy') { steps { echo 'Deploying....' - dir('cmake-build-release') { - archiveArtifacts artifacts:'*.deb, *.rpm, *.tar.gz, *.sh', fingerprint: false - } - dir('cmake-build-release-win32') { - archiveArtifacts artifacts:'*.exe', fingerprint: false - } + dir('cmake-build-release') { archiveArtifacts artifacts:'*.deb, *.rpm, *.tar.gz, *.sh', fingerprint: false } + dir('cmake-build-release-arm') { archiveArtifacts artifacts:'*.tar.gz, *.sh', fingerprint: false } + dir('cmake-build-release-win32') { archiveArtifacts artifacts:'*.exe', fingerprint: false } } } }