smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: update package names for linux to be more unified

Browse source 
We are not making offical packages
    we should not set a rpm or debian revision
    we should do not have to use 'correct' names for deb / rpm
This commit is contained in:
sithlord48 2024-10-25 11:00:44 -04:00 committed by Nick Bolton
parent 968037b85b
commit 077412f7ec
1 changed files with 20 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
cmake/Packaging.cmake
View file

@ -132,41 +132,38 @@ macro(configure_linux_package_name)
string(REPLACE "\"" "" DISTRO_VERSION_ID "${_DISTRO_VERSION_ID}") string(REPLACE "\"" "" DISTRO_VERSION_ID "${_DISTRO_VERSION_ID}")
message(STATUS "Distro ID: ${DISTRO_VERSION_ID}") message(STATUS "Distro ID: ${DISTRO_VERSION_ID}")
# Set Run Attempt portion of package name # Check if Debian-link
# GITHUB_RUN_ATTEMPT is set by GITHUB when a job is run
# It is equal to the number of times the job was run on the same hash
set(PACKAGE_BUILD_ATTEMPT $ENV{GITHUB_RUN_ATTEMPT})
if("$ENV{GITHUB_RUN_ATTEMPT}" STREQUAL "")
set(PACKAGE_BUILD_ATTEMPT 1)
endif()
# Check if Debian-like
string(REGEX MATCH debian|buntu DEBTYPE "${DISTRO_LIKE}") string(REGEX MATCH debian|buntu DEBTYPE "${DISTRO_LIKE}")
if((NOT ("${DEBTYPE}" STREQUAL "")) OR ("${DISTRO_NAME}" STREQUAL "debian")) if((NOT ("${DEBTYPE}" STREQUAL "")) OR ("${DISTRO_NAME}" STREQUAL "debian"))
if("${CPACK_DEBIAN_PACKAGE_RELEASE}" STREQUAL "")
set(CPACK_DEBIAN_PACKAGE_RELEASE
"${PACKAGE_BUILD_ATTEMPT}~${DISTRO_CODENAME}")
endif()
set(CPACK_GENERATOR "DEB") set(CPACK_GENERATOR "DEB")
message(STATUS "DEB Revision: ${CPACK_DEBIAN_PACKAGE_RELEASE}")
endif() endif()
check_is_rpm() # Check if Rpm-like
string(REGEX MATCH suse|fedora|rhel RPMTYPE "${DISTRO_LIKE}")
if("${DISTRO_NAME}" STREQUAL "arch") string(REGEX MATCH fedora|suse|rhel RPMNAME "${DISTRO_NAME}")
set(DISTRO_VERSION_ID "") if((NOT ("${RPMTYPE}" STREQUAL "")) OR (NOT ("${RPMNAME}" STREQUAL "")))
# Arch linux is rolling the version id reported is the date of last iso. set(CPACK_GENERATOR "RPM")
endif() endif()
# Determain the code name to be used # Disto specific name adjustments
if("${DISTRO_NAME}" STREQUAL "opensuse-tumbleweed")
set(DISTRO_NAME "opensuse")
set(DISTRO_CODENAME "tumbleweed")
elseif("${DISTRO_NAME}" STREQUAL "arch")
# Arch linux is rolling the version id reported is the date of last iso.
set(DISTRO_VERSION_ID "")
endif()
# Determain the code name to be used if any
if(NOT "${DISTRO_VERSION_ID}" STREQUAL "") if(NOT "${DISTRO_VERSION_ID}" STREQUAL "")
set(CN_STRING "${DISTRO_VERSION_ID}-") set(CN_STRING "${DISTRO_VERSION_ID}_")
endif() endif()
if(NOT "${DISTRO_CODENAME}" STREQUAL "") if(NOT "${DISTRO_CODENAME}" STREQUAL "")
set(CN_STRING "${DISTRO_CODENAME}-") set(CN_STRING "${DISTRO_CODENAME}_")
endif() endif()
set(OS_STRING "${DISTRO_NAME}-${CN_STRING}${CMAKE_SYSTEM_PROCESSOR}")
set(OS_STRING "${DISTRO_NAME}_${CN_STRING}${CMAKE_SYSTEM_PROCESSOR}")
endmacro() endmacro()
@ -176,12 +173,10 @@ macro(configure_linux_packaging)
# This is used in package names # This is used in package names
configure_linux_package_name() configure_linux_package_name()
set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
set(CPACK_DEBIAN_PACKAGE_MAINTAINER ${DESKFLOW_MAINTAINER}) set(CPACK_DEBIAN_PACKAGE_MAINTAINER ${DESKFLOW_MAINTAINER})
set(CPACK_DEBIAN_PACKAGE_SECTION "utils") set(CPACK_DEBIAN_PACKAGE_SECTION "utils")
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
set(CPACK_RPM_FILE_NAME RPM-DEFAULT)
set(CPACK_RPM_PACKAGE_LICENSE "GPLv2") set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
set(CPACK_RPM_PACKAGE_GROUP "Applications/System") set(CPACK_RPM_PACKAGE_GROUP "Applications/System")
@ -256,37 +251,6 @@ endmacro(configure_files)
macro(check_is_rpm) macro(check_is_rpm)
# Check if RPM-like. # Check if RPM-like.
string(REGEX MATCH suse|fedora|rhel RPMTYPE "${DISTRO_LIKE}")
string(REGEX MATCH fedora|suse|rhel RPMNAME "${DISTRO_NAME}")
if((NOT ("${RPMTYPE}" STREQUAL "")) OR (NOT ("${RPMNAME}" STREQUAL "")))
if("${DISTRO_NAME}" STREQUAL "opensuse-tumbleweed")
set(DISTRO_NAME "opensuse")
set(DISTRO_CODENAME "tumbleweed")
elseif(${DISTRO_NAME} STREQUAL "fedora")
set(RPM_CN "fc${DISTRO_VERSION_ID}")
elseif(("${DISTRO_NAME}" STREQUAL "almalinux") OR ("${DISTRO_NAME}" STREQUAL "rocky"))
string(REGEX MATCH [0-9]+ V "${DISTRO_VERSION_ID}")
set(RPM_CN "${DISTRO_NAME}${V}")
endif()
# Determine if we hsould use
if ("${RPM_CN}" STREQUAL "")
if(NOT "${DISTRO_VERSION_ID}" STREQUAL "")
set(RPM_CN "${DISTRO_VERSION_ID}")
endif()
if(NOT "${DISTRO_CODENAME}" STREQUAL "")
set(RPM_CN "${DISTRO_CODENAME}")
endif()
endif()
if("${CPACK_RPM_PACKAGE_RELEASE}" STREQUAL "")
set(CPACK_RPM_PACKAGE_RELEASE "${PACKAGE_BUILD_ATTEMPT}~${RPM_CN}")
endif()
set(CPACK_GENERATOR "RPM")
message(STATUS "RPM Revision: ${CPACK_RPM_PACKAGE_RELEASE}")
endif()
endmacro() endmacro()