wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only include the git version within the rpm and deb name if defined 

Removed platform el6 and el7 from package name
This commit is contained in:
Alvin Moore 2019-12-16 14:40:40 -08:00
parent 3da9d182b1
commit 3bbfa8a1ad
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmake/InstallLayout.cmake
View File

@ -269,13 +269,17 @@ if(NOT FDB_RELEASE)
set(prerelease_string ".PRERELEASE")
endif()
if(CURRENT_GIT_VERSION)
set(git_string ".CURRENT_GIT_VERSION")
endif()
# RPM filenames
set(rpm-clients-filename "foundationdb-clients-${PROJECT_VERSION}-0.${CURRENT_GIT_VERSION}${prerelease_string}")
set(rpm-server-filename "foundationdb-server-${PROJECT_VERSION}-0.${CURRENT_GIT_VERSION}${prerelease_string}")
set(rpm-clients-filename "foundationdb-clients-${PROJECT_VERSION}-0${git_string}${prerelease_string}")
set(rpm-server-filename "foundationdb-server-${PROJECT_VERSION}-0${git_string}${prerelease_string}")
# Deb filenames
set(deb-clients-filename "foundationdb-clients_${PROJECT_VERSION}-0.${CURRENT_GIT_VERSION}${prerelease_string}")
set(deb-server-filename "foundationdb-server_${PROJECT_VERSION}-0.${CURRENT_GIT_VERSION}${prerelease_string}")
set(deb-clients-filename "foundationdb-clients_${PROJECT_VERSION}-0${git_string}${prerelease_string}")
set(deb-server-filename "foundationdb-server_${PROJECT_VERSION}-0${git_string}${prerelease_string}")
################################################################################
# Configuration for RPM
@ -284,11 +288,10 @@ set(deb-server-filename "foundationdb-server_${PROJECT_VERSION}-0.${CURRENT_GIT_
set(CPACK_RPM_PACKAGE_LICENSE "Apache 2.0")
set(CPACK_RPM_PACKAGE_NAME "foundationdb")
set(CPACK_RPM_CLIENTS-EL6_PACKAGE_NAME "foundationdb-clients-el6")
set(CPACK_RPM_CLIENTS-EL7_PACKAGE_NAME "foundationdb-clients-el7")
set(CPACK_RPM_SERVER-EL6_PACKAGE_NAME "foundationdb-server-el6")
set(CPACK_RPM_SERVER-EL7_PACKAGE_NAME "foundationdb-server-el7")
set(CPACK_RPM_CLIENTS-EL6_PACKAGE_NAME "foundationdb-clients")
set(CPACK_RPM_CLIENTS-EL7_PACKAGE_NAME "foundationdb-clients")
set(CPACK_RPM_SERVER-EL6_PACKAGE_NAME "foundationdb-server")
set(CPACK_RPM_SERVER-EL7_PACKAGE_NAME "foundationdb-server")
set(CPACK_RPM_CLIENTS-EL6_FILE_NAME "${rpm-clients-filename}.el6.x86_64.rpm")
set(CPACK_RPM_CLIENTS-EL7_FILE_NAME "${rpm-clients-filename}.el7.x86_64.rpm")