From 6bcd1d36cc0b8ee8b38154ccc8c67fd42da9a664 Mon Sep 17 00:00:00 2001 From: David Galiffi Date: Wed, 1 May 2024 22:15:20 -0400 Subject: [PATCH] Update CPack packaging for ROCm release support (#339) * Update CPack packaging variables. Look for ROCM_LIBPATH_VERSION environment variable to patch the CPACK_PACKAGE_VERSION. Add some status logs to output packaging information. Signed-off-by: David Galiffi * Add CPack variables to "omnitrace_add_feature". --------- Signed-off-by: David Galiffi --- cmake/ConfigCPack.cmake | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/cmake/ConfigCPack.cmake b/cmake/ConfigCPack.cmake index 9f760933fd..37ff4ff606 100644 --- a/cmake/ConfigCPack.cmake +++ b/cmake/ConfigCPack.cmake @@ -41,6 +41,7 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY set(CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}") set(CPACK_PACKAGE_VERSION_MINOR "${PROJECT_VERSION_MINOR}") set(CPACK_PACKAGE_VERSION_PATCH "${PROJECT_VERSION_PATCH}") + set(CPACK_PACKAGE_CONTACT "jonathan.madsen@amd.com") set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE") set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY OFF) @@ -131,9 +132,6 @@ set(CPACK_DEBIAN_PACKAGE_RELEASE string(REGEX REPLACE "([a-zA-Z])-([0-9])" "\\1\\2" CPACK_DEBIAN_PACKAGE_RELEASE "${CPACK_DEBIAN_PACKAGE_RELEASE}") string(REPLACE "-" "~" CPACK_DEBIAN_PACKAGE_RELEASE "${CPACK_DEBIAN_PACKAGE_RELEASE}") -if(DEFINED ENV{CPACK_DEBIAN_PACKAGE_RELEASE}) - set(CPACK_DEBIAN_PACKAGE_RELEASE $ENV{CPACK_DEBIAN_PACKAGE_RELEASE}) -endif() set(_DEBIAN_PACKAGE_DEPENDS "") if(DYNINST_USE_OpenMP) @@ -182,7 +180,6 @@ string(REPLACE ";" ", " _DEBIAN_PACKAGE_DEPENDS "${_DEBIAN_PACKAGE_DEPENDS}") set(CPACK_DEBIAN_PACKAGE_DEPENDS "${_DEBIAN_PACKAGE_DEPENDS}" CACHE STRING "Debian package dependencies" FORCE) -omnitrace_add_feature(CPACK_DEBIAN_PACKAGE_DEPENDS "Debian package dependencies") set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT") # -------------------------------------------------------------------------------------- # @@ -200,19 +197,13 @@ set(CPACK_RPM_PACKAGE_RELEASE string(REGEX REPLACE "([a-zA-Z])-([0-9])" "\\1\\2" CPACK_RPM_PACKAGE_RELEASE "${CPACK_RPM_PACKAGE_RELEASE}") string(REPLACE "-" "~" CPACK_RPM_PACKAGE_RELEASE "${CPACK_RPM_PACKAGE_RELEASE}") -if(DEFINED ENV{CPACK_RPM_PACKAGE_RELEASE}) - set(CPACK_RPM_PACKAGE_RELEASE $ENV{CPACK_RPM_PACKAGE_RELEASE}) -endif() -# Get rpm distro -if(CPACK_RPM_PACKAGE_RELEASE) - set(CPACK_RPM_PACKAGE_RELEASE_DIST ON) -endif() set(CPACK_RPM_FILE_NAME "RPM-DEFAULT") +set(CPACK_RPM_PACKAGE_RELEASE_DIST ON) # -------------------------------------------------------------------------------------- # # -# Prepare final version for the CPACK use +# Prepare final CPACK parameters # # -------------------------------------------------------------------------------------- # @@ -220,4 +211,28 @@ set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}" ) +if(DEFINED ENV{ROCM_LIBPATCH_VERSION}) + set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}.$ENV{ROCM_LIBPATCH_VERSION}") +endif() + +if(DEFINED ENV{CPACK_DEBIAN_PACKAGE_RELEASE}) + set(CPACK_DEBIAN_PACKAGE_RELEASE $ENV{CPACK_DEBIAN_PACKAGE_RELEASE}) +endif() + +if(DEFINED ENV{CPACK_RPM_PACKAGE_RELEASE}) + set(CPACK_RPM_PACKAGE_RELEASE $ENV{CPACK_RPM_PACKAGE_RELEASE}) +endif() + +omnitrace_add_feature(CPACK_PACKAGE_NAME "Package name") +omnitrace_add_feature(CPACK_PACKAGE_VERSION "Package version") +omnitrace_add_feature(CPACK_PACKAGING_INSTALL_PREFIX "Package installation prefix") + +omnitrace_add_feature(CPACK_DEBIAN_FILE_NAME "Debian file name") +omnitrace_add_feature(CPACK_DEBIAN_PACKAGE_RELEASE "Debian package release version") +omnitrace_add_feature(CPACK_DEBIAN_PACKAGE_DEPENDS "Debian package dependencies") + +omnitrace_add_feature(CPACK_RPM_FILE_NAME "RPM file name") +omnitrace_add_feature(CPACK_RPM_PACKAGE_RELEASE "RPM package release version") +omnitrace_add_feature(CPACK_RPM_PACKAGE_REQUIRES "RPM package dependencies") + include(CPack)