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

Changed the name of the rpm packages to conform to the existing names when building release project

This commit is contained in:
Alvin Moore 2019-12-22 20:11:40 -08:00
parent 62ffcf343f
commit 3ce3e1e06e
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bindings/flow/CMakeLists.txt
View File

@ -36,7 +36,7 @@ if(NOT OPEN_FOR_IDE)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/packages)
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/packages)
set(package_dir ${CMAKE_CURRENT_BINARY_DIR}/packages/fdb-flow-${CMAKE_PROJECT_VERSION})
set(tar_file ${CMAKE_BINARY_DIR}/packages/fdb-flow-${CMAKE_PROJECT_VERSION}${prerelease_string}.tar.gz)
set(tar_file ${CMAKE_BINARY_DIR}/packages/fdb-flow-${CMAKE_PROJECT_VERSION}${prerelease_string}-x86_64.tar.gz)
add_custom_command(OUTPUT ${tar_file}
COMMAND
${CMAKE_COMMAND} -E make_directory ${package_dir} &&

16
cmake/InstallLayout.cmake
View File

@ -266,20 +266,20 @@ configure_file(${CMAKE_SOURCE_DIR}/LICENSE ${CMAKE_BINARY_DIR}/License.txt COPYO
################################################################################
if(NOT FDB_RELEASE)
set(prerelease_string ".PRERELEASE")
if(CURRENT_GIT_VERSION)
set(git_string ".${CURRENT_GIT_VERSION}")
endif()
set(prerelease_string "${git_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${git_string}${prerelease_string}")
set(rpm-server-filename "foundationdb-server-${PROJECT_VERSION}-0${git_string}${prerelease_string}")
set(rpm-clients-filename "foundationdb-clients-${PROJECT_VERSION}-1${prerelease_string}")
set(rpm-server-filename "foundationdb-server-${PROJECT_VERSION}-1${prerelease_string}")
# Deb filenames
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}")
set(deb-clients-filename "foundationdb-clients_${PROJECT_VERSION}-0${prerelease_string}")
set(deb-server-filename "foundationdb-server_${PROJECT_VERSION}-0${prerelease_string}")
################################################################################
# Configuration for RPM