apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-05-16 02:42:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

addressed review comments

Browse Source
This commit is contained in:
Markus Pilman 2020-11-05 15:50:24 -07:00
parent 7188c82cb0
commit 703b2e276a
4 changed files with 81 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/FDBInstall.cmake
View File

@ -8,6 +8,8 @@ endfunction()
function(install_symlink_impl) function(install_symlink_impl)
if (NOT WIN32) if (NOT WIN32)
return()
endif()
set(options "") set(options "")
set(one_value_options TO DESTINATION) set(one_value_options TO DESTINATION)
set(multi_value_options COMPONENTS) set(multi_value_options COMPONENTS)
@ -21,11 +23,12 @@ function(install_symlink_impl)
foreach(component IN LISTS SYM_COMPONENTS) foreach(component IN LISTS SYM_COMPONENTS)
install(FILES ${sl} DESTINATION ${dest_dir} COMPONENT ${component}) install(FILES ${sl} DESTINATION ${dest_dir} COMPONENT ${component})
endforeach() endforeach()
endif()
endfunction() endfunction()
function(install_symlink) function(install_symlink)
if(NOT WIN32 AND NOT OPEN_FOR_IDE) if(NOT WIN32 AND NOT OPEN_FOR_IDE)
return()
endif()
set(options "") set(options "")
set(one_value_options COMPONENT LINK_DIR FILE_DIR LINK_NAME FILE_NAME) set(one_value_options COMPONENT LINK_DIR FILE_DIR LINK_NAME FILE_NAME)
set(multi_value_options "") set(multi_value_options "")
@ -45,7 +48,7 @@ function(install_symlink)
install_symlink_impl( install_symlink_impl(
TO "../${rel_path}bin/${IN_FILE_NAME}" TO "../${rel_path}bin/${IN_FILE_NAME}"
DESTINATION "usr/lib64/${IN_LINK_NAME}" DESTINATION "usr/lib64/${IN_LINK_NAME}"
COMPONENTS "${IN_COMPONENT}-el6" COMPONENTS
"${IN_COMPONENT}-el7" "${IN_COMPONENT}-el7"
"${IN_COMPONENT}-deb") "${IN_COMPONENT}-deb")
install_symlink_impl( install_symlink_impl(
@ -60,7 +63,7 @@ function(install_symlink)
install_symlink_impl( install_symlink_impl(
TO "../${rel_path}bin/${IN_FILE_NAME}" TO "../${rel_path}bin/${IN_FILE_NAME}"
DESTINATION "usr/bin/${IN_LINK_NAME}" DESTINATION "usr/bin/${IN_LINK_NAME}"
COMPONENTS "${IN_COMPONENT}-el6" COMPONENTS
"${IN_COMPONENT}-el7" "${IN_COMPONENT}-el7"
"${IN_COMPONENT}-deb") "${IN_COMPONENT}-deb")
elseif("${IN_LINK_DIR}" MATCHES "fdbmonitor") elseif("${IN_LINK_DIR}" MATCHES "fdbmonitor")
@ -71,7 +74,7 @@ function(install_symlink)
install_symlink_impl( install_symlink_impl(
TO "../../${rel_path}bin/${IN_FILE_NAME}" TO "../../${rel_path}bin/${IN_FILE_NAME}"
DESTINATION "usr/lib/foundationdb/${IN_LINK_NAME}" DESTINATION "usr/lib/foundationdb/${IN_LINK_NAME}"
COMPONENTS "${IN_COMPONENT}-el6" COMPONENTS
"${IN_COMPONENT}-el7" "${IN_COMPONENT}-el7"
"${IN_COMPONENT}-deb") "${IN_COMPONENT}-deb")
else() else()
@ -80,7 +83,6 @@ function(install_symlink)
else() else()
message(FATAL_ERROR "Unknown FILE_DIR ${IN_FILE_DIR}") message(FATAL_ERROR "Unknown FILE_DIR ${IN_FILE_DIR}")
endif() endif()
endif()
endfunction() endfunction()
function(symlink_files) function(symlink_files)

2
documentation/sphinx/source/release-notes/release-notes-630.rst
View File

@ -5,7 +5,7 @@ Release Notes
############# #############
6.3.10 6.3.10
===== ======
Packaging Packaging
--------- ---------

13
packaging/multiversion/clients/postinst
View File

@ -1,5 +1,18 @@
#!/usr/bin/env bash #!/usr/bin/env bash
CMAKE_CONFIG_DIR="/usr/@LIB_DIR@/cmake"
PKG_CONFIG_DIR="/usr/@LIB_DIR@/pkgconfig"
if [ ! -d "${CMAKE_CONFIG_DIR}" ]
then
mkdir "${CMAKE_CONFIG_DIR}"
fi
if [ ! -d "${PKG_CONFIG_DIR}" ]
then
mkdir ${PKG_CONFIG_DIR}
fi
alternatives --install /usr/bin/fdbcli fdbclients /usr/lib/foundationdb-@PROJECT_VERSION@/bin/fdbcli @ALTERNATIVES_PRIORITY@ \ alternatives --install /usr/bin/fdbcli fdbclients /usr/lib/foundationdb-@PROJECT_VERSION@/bin/fdbcli @ALTERNATIVES_PRIORITY@ \
--slave /usr/bin/fdbbackup fdbbackup /usr/lib/foundationdb-@PROJECT_VERSION@/bin/fdbbackup \ --slave /usr/bin/fdbbackup fdbbackup /usr/lib/foundationdb-@PROJECT_VERSION@/bin/fdbbackup \
--slave /usr/bin/fdbrestore fdbrestore /usr/lib/foundationdb-@PROJECT_VERSION@/bin/fdbbackup \ --slave /usr/bin/fdbrestore fdbrestore /usr/lib/foundationdb-@PROJECT_VERSION@/bin/fdbbackup \

2
packaging/multiversion/clients/prerm
View File

@ -1,3 +1,3 @@
#!/usr/bin/env bash #!/usr/bin/env bash
alternatives --remove fdbclients /usr/lib/foundationdb-@PROJECT_VERSION@/bin/fdbcli @ALTERNATIVES_PRIORITY@ alternatives --remove fdbclients /usr/lib/foundationdb-@PROJECT_VERSION@/bin/fdbcli