1
0
Fork 0

only copy/remove one file at once, multiples aren't supported by elderly cmakes

This commit is contained in:
Wilfried Goesgens 2017-02-21 16:06:52 +01:00
parent 4b05fa1e4a
commit 7b4eed8e25
3 changed files with 16 additions and 10 deletions

View File

@ -29,7 +29,7 @@ set(CMAKE_INSTALL_FULL_SYSCONFDIR_ARANGO @CMAKE_INSTALL_FULL_SYSCONFDIR_ARANGO@)
set(INSTALL_CONFIGFILES_LIST)
set(PACKAGING_HANDLE_CONFIG_FILES false)
# set(CPACK_DEBIAN_PACKAGE_DEBUG TRUE)
################################################################################
# Substitute the install binaries:
################################################################################

View File

@ -117,7 +117,9 @@ list(APPEND PACKAGES_LIST package-arongodb-client)
add_custom_target(copy_deb_packages
COMMAND ${CMAKE_COMMAND} -E copy ${ARANGODB_CLIENT_PACKAGE_FILE_NAME}.deb ${CPACK_PACKAGE_FILE_NAME}.deb ${ARANGODB_DBG_PACKAGE_FILE_NAME}.deb ${PACKAGE_TARGET_DIR}
COMMAND ${CMAKE_COMMAND} -E copy ${ARANGODB_CLIENT_PACKAGE_FILE_NAME}.deb ${PACKAGE_TARGET_DIR}
COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_PACKAGE_FILE_NAME}.deb ${PACKAGE_TARGET_DIR}
COMMAND ${CMAKE_COMMAND} -E copy ${ARANGODB_DBG_PACKAGE_FILE_NAME}.deb ${PACKAGE_TARGET_DIR}
COMMENT "copying packages to ${PACKAGE_TARGET_DIR}")
list(APPEND COPY_PACKAGES_LIST copy_deb_packages)
@ -127,7 +129,9 @@ add_custom_target(remove_packages
COMMENT Removing server packaging build directory
COMMAND ${CMAKE_COMMAND} -E remove_directory packages
COMMENT Removing client packaging build directory
COMMAND ${CMAKE_COMMAND} -E remove ${ARANGODB_CLIENT_PACKAGE_FILE_NAME}.deb ${CPACK_PACKAGE_FILE_NAME}.deb ${ARANGODB_DBG_PACKAGE_FILE_NAME}.deb
COMMAND ${CMAKE_COMMAND} -E remove ${ARANGODB_CLIENT_PACKAGE_FILE_NAME}.deb
COMMAND ${CMAKE_COMMAND} -E remove ${CPACK_PACKAGE_FILE_NAME}.deb
COMMAND ${CMAKE_COMMAND} -E remove ${ARANGODB_DBG_PACKAGE_FILE_NAME}.deb
COMMENT Removing local target packages
)

View File

@ -53,11 +53,9 @@ include(arangod/dbg.cmake)
add_custom_target(package-arongodb-server
COMMAND ${CMAKE_COMMAND} .
COMMAND ${CMAKE_CPACK_COMMAND} -G RPM
COMMAND ${CMAKE_COMMAND} -E copy
${CPACK_TEMPORARY_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}.rpm
${CPACK_TEMPORARY_DIRECTORY}/${CPACK_CLIENT_PACKAGE_FILE_NAME}.rpm
${CPACK_TEMPORARY_DIRECTORY}/${CPACK_dbg_PACKAGE_FILE_NAME}.rpm
${PROJECT_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_TEMPORARY_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}.rpm ${PROJECT_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_TEMPORARY_DIRECTORY}/${CPACK_CLIENT_PACKAGE_FILE_NAME}.rpm ${PROJECT_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_TEMPORARY_DIRECTORY}/${CPACK_dbg_PACKAGE_FILE_NAME}.rpm ${PROJECT_BINARY_DIR}
WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
list(APPEND PACKAGES_LIST package-arongodb-server)
@ -65,13 +63,17 @@ list(APPEND PACKAGES_LIST package-arongodb-server)
## hook to build the client package
#################################################################################
add_custom_target(copy_rpm_packages
COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_PACKAGE_FILE_NAME}.rpm ${CPACK_CLIENT_PACKAGE_FILE_NAME}.rpm ${CPACK_dbg_PACKAGE_FILE_NAME}.rpm ${PACKAGE_TARGET_DIR})
COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_PACKAGE_FILE_NAME}.rpm ${PACKAGE_TARGET_DIR}
COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_CLIENT_PACKAGE_FILE_NAME}.rpm ${PACKAGE_TARGET_DIR}
COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_dbg_PACKAGE_FILE_NAME}.rpm ${PACKAGE_TARGET_DIR})
list(APPEND COPY_PACKAGES_LIST copy_rpm_packages)
add_custom_target(remove_packages
COMMAND ${CMAKE_COMMAND} -E remove_directory _CPack_Packages
COMMAND ${CMAKE_COMMAND} -E remove ${CPACK_PACKAGE_FILE_NAME}.rpm ${CPACK_CLIENT_PACKAGE_FILE_NAME}.rpm ${CPACK_dbg_PACKAGE_FILE_NAME}.rpm
COMMAND ${CMAKE_COMMAND} -E remove ${CPACK_PACKAGE_FILE_NAME}.rpm
COMMAND ${CMAKE_COMMAND} -E remove ${CPACK_CLIENT_PACKAGE_FILE_NAME}.rpm
COMMAND ${CMAKE_COMMAND} -E remove ${CPACK_dbg_PACKAGE_FILE_NAME}.rpm
)
list(APPEND CLEAN_PACKAGES_LIST remove_packages)