From 219fb02a57bf9845621c048f74a9f18abe1d2077 Mon Sep 17 00:00:00 2001 From: Username404 Date: Sun, 19 Jun 2022 11:51:45 +0200 Subject: [PATCH] Jenkinsfile: Use strip only because upx does not seem to work with stripped executables and therefore can't possibly save more memory Signed-off-by: Username404 --- Jenkinsfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e05dd43..427a641 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,16 +5,17 @@ def buildTarget(String path, String rpmArch = 'noarch', String debArch = 'noarch final String packageArch = isPackageArchDeb ? debArch : rpmArch; final String system_name = !path.contains('mingw') ? sh(returnStdout: true, script: 'uname -s').trim() : 'Windows' final String linker = "/usr/bin/${path}-ld" + final String strip = "/usr/bin/${path}-strip" final String build_directory = "cmake-build-${packageArch}${suffix}" final boolean upx_exists = fileExists('/usr/bin/upx') final boolean is_riscv = path.contains('riscv') // Note: CMake 3.20 or higher is needed cmakeBuild buildDir: build_directory, buildType: 'release', cleanBuild: true, installation: 'Latest', - cmakeArgs: "--no-warn-unused-cli -DCMAKE_SYSTEM_NAME=\"${system_name}\" -DCMAKE_C_COMPILER=/usr/bin/${path}-gcc -DCMAKE_CXX_COMPILER=/usr/bin/${path}-g++ -DCMAKE_LINKER=${fileExists("${linker}.gold") ? "${linker}.gold" : linker} -DCMAKE_AR=/usr/bin/${path}-ar -DCMAKE_RC_COMPILER=/usr/bin/${path}-windres -DCPACK_RPM_PACKAGE_ARCHITECTURE=${rpmArch} -DCPACK_DEBIAN_PACKAGE_ARCHITECTURE=${debArch} -DCXX_TARGET=${packageArch} -DCMAKE_EXE_LINKER_FLAGS=-static -DNO_SELF_PACKER=${!upx_exists || is_riscv ? 'ON' : 'OFF'} -DIGNORE_MINIMAL_COMPILER_VERSION=ON ${no_compilation_cache_flags()}", + cmakeArgs: "--no-warn-unused-cli -DCMAKE_SYSTEM_NAME=\"${system_name}\" -DCMAKE_C_COMPILER=/usr/bin/${path}-gcc -DCMAKE_CXX_COMPILER=/usr/bin/${path}-g++ -DCMAKE_LINKER=${fileExists("${linker}.gold") ? "${linker}.gold" : linker} -DCMAKE_AR=/usr/bin/${path}-ar -DCMAKE_RC_COMPILER=/usr/bin/${path}-windres -DCPACK_RPM_PACKAGE_ARCHITECTURE=${rpmArch} -DCPACK_DEBIAN_PACKAGE_ARCHITECTURE=${debArch} -DCXX_TARGET=${packageArch} -DCMAKE_EXE_LINKER_FLAGS=-static -DNO_SELF_PACKER=ON -DIGNORE_MINIMAL_COMPILER_VERSION=ON ${no_compilation_cache_flags()}", generator: cmake_generator() cmake arguments: "--build ./$build_directory --target ybcon", installation: 'Latest' - if (!upx_exists || is_riscv) { - sh "/usr/bin/${path}-strip -s ./$build_directory/ybcon*" + if (fileExists(strip)) { + sh "$strip -s ./$build_directory/ybcon*" } cpack installation: 'Latest', workingDir: build_directory }