From e4dde2d0e86e5ed6e99e57fbf730bf6a9f726cf4 Mon Sep 17 00:00:00 2001 From: Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch> Date: Thu, 23 Nov 2017 17:52:32 +0100 Subject: [PATCH] Updated the Gaudi and Athena build scripts to make use the new ability of the CMake/CPack configuration of producing debug RPMs off of RelWithDebInfo builds. Former-commit-id: 65aa13e26f52b46195dd613c3c2ec243afb57e2f --- Build/AtlasBuildScripts/build_Gaudi.sh | 3 +++ Projects/Athena/build.sh | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Build/AtlasBuildScripts/build_Gaudi.sh b/Build/AtlasBuildScripts/build_Gaudi.sh index cae26318903..6576d026f23 100755 --- a/Build/AtlasBuildScripts/build_Gaudi.sh +++ b/Build/AtlasBuildScripts/build_Gaudi.sh @@ -126,6 +126,9 @@ fi error_stamp=`mktemp .tmp.error.XXXXX` ; rm -f $error_stamp { cpack || touch $error_stamp +if [ "$BUILDTYPE" = "RelWithDebInfo" ]; then + cpack --config CPackDbgRPMConfig.cmake || touch $error_stamp +fi } 2>&1 | tee cmake_cpack.log test -f $error_stamp && ((ERROR_COUNT++)) rm -f $error_stamp diff --git a/Projects/Athena/build.sh b/Projects/Athena/build.sh index b0ca09166a4..6de0a809a4a 100755 --- a/Projects/Athena/build.sh +++ b/Projects/Athena/build.sh @@ -178,6 +178,9 @@ fi # Build an RPM for the release: if [ -n "$EXE_CPACK" ]; then { time cpack; } 2>&1 | tee cmake_cpack.log + if [ "$BUILDTYPE" = "RelWithDebInfo" ]; then + { time cpack --config CPackDbgRPMConfig.cmake; } 2>&1 | tee -a cmake_cpack.log + fi cp Athena*.rpm ${BUILDDIR}/ fi -- GitLab