Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix typo in CMake custom target / package names: arango instead of arongo (#3946)

This commit is contained in:
Simran 2017-12-14 20:17:52 +01:00 committed by Jan
parent aa1d57c594
commit 2d79e1fb4e
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/packages/bundle.cmake
View File

@ -50,12 +50,12 @@ configure_file("${PROJECT_SOURCE_DIR}/Installation/MacOSX/Bundle/arangodb-cli.sh
set(CPACK_BUNDLE_STARTUP_COMMAND "${CMAKE_CURRENT_BINARY_DIR}/arangodb-cli.sh")
add_custom_target(package-arongodb-server-bundle
add_custom_target(package-arangodb-server-bundle
COMMAND ${CMAKE_COMMAND} .
COMMAND ${CMAKE_CPACK_COMMAND} -G Bundle -C ${CMAKE_BUILD_TYPE}
WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
list(APPEND PACKAGES_LIST package-arongodb-server-bundle)
list(APPEND PACKAGES_LIST package-arangodb-server-bundle)
add_custom_target(copy_bundle_packages
COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_PACKAGE_FILE_NAME}.dmg ${PACKAGE_TARGET_DIR})

12
cmake/packages/deb.cmake
View File

@ -118,12 +118,12 @@ endif()
################################################################################
# hook to build the server package
################################################################################
add_custom_target(package-arongodb-server
add_custom_target(package-arangodb-server
COMMAND ${CMAKE_COMMAND} .
COMMAND ${CMAKE_CPACK_COMMAND} -G DEB
WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
list(APPEND PACKAGES_LIST package-arongodb-server)
list(APPEND PACKAGES_LIST package-arangodb-server)
################################################################################
# hook to build the client package
@ -134,7 +134,7 @@ set(ARANGODB_CLIENT_PACKAGE_FILE_NAME "${CPACK_CLIENT_PACKAGE_NAME}-${CPACK_PACK
set(CLIENT_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/packages/arangodb-client)
configure_file(cmake/packages/client/deb.txt ${CLIENT_BUILD_DIR}/CMakeLists.txt @ONLY)
add_custom_target(package-arongodb-client
add_custom_target(package-arangodb-client
COMMAND ${CMAKE_COMMAND} .
COMMENT "configuring client package environment"
COMMAND ${CMAKE_CPACK_COMMAND} -G DEB
@ -143,7 +143,7 @@ add_custom_target(package-arongodb-client
COMMENT "uploading client packages"
WORKING_DIRECTORY ${CLIENT_BUILD_DIR})
list(APPEND PACKAGES_LIST package-arongodb-client)
list(APPEND PACKAGES_LIST package-arangodb-client)
add_custom_target(copy_deb_packages
@ -175,10 +175,10 @@ list(APPEND CLEAN_PACKAGES_LIST remove_packages)
set(DEBUG_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/packages/arangodb3-dbg)
configure_file(cmake/packages/dbg/deb.txt ${DEBUG_BUILD_DIR}/CMakeLists.txt @ONLY)
add_custom_target(package-arongodb-dbg
add_custom_target(package-arangodb-dbg
COMMAND ${CMAKE_COMMAND} . -DCMAKE_OBJCOPY=${CMAKE_OBJCOPY}
COMMAND ${CMAKE_CPACK_COMMAND} -G DEB
COMMAND ${CMAKE_COMMAND} -E copy ${ARANGODB_DBG_PACKAGE_FILE_NAME}.deb ${PROJECT_BINARY_DIR}
WORKING_DIRECTORY ${DEBUG_BUILD_DIR})
list(APPEND PACKAGES_LIST package-arongodb-dbg)
list(APPEND PACKAGES_LIST package-arangodb-dbg)

12
cmake/packages/nsis.cmake
View File

@ -65,19 +65,19 @@ set(CPACK_ARANGODB_NSIS_DEFINES "
# hook to build the server package
################################################################################
add_custom_target(package-arongodb-server-nsis
add_custom_target(package-arangodb-server-nsis
COMMAND ${CMAKE_COMMAND} .
COMMAND ${CMAKE_CPACK_COMMAND} -G NSIS -C ${CMAKE_BUILD_TYPE}
WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
list(APPEND PACKAGES_LIST package-arongodb-server-nsis)
list(APPEND PACKAGES_LIST package-arangodb-server-nsis)
add_custom_target(package-arongodb-server-zip
add_custom_target(package-arangodb-server-zip
COMMAND ${CMAKE_COMMAND} .
COMMAND ${CMAKE_CPACK_COMMAND} -G ZIP -C ${CMAKE_BUILD_TYPE}
WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
list(APPEND PACKAGES_LIST package-arongodb-server-zip)
list(APPEND PACKAGES_LIST package-arangodb-server-zip)
################################################################################
# hook to build the client package
@ -92,7 +92,7 @@ if (${CLIENT_BUILD_DIR_LEN} EQUAL 0)
endif()
configure_file(cmake/packages/client/nsis.txt ${CLIENT_BUILD_DIR}/CMakeLists.txt @ONLY)
add_custom_target(package-arongodb-client-nsis
add_custom_target(package-arangodb-client-nsis
COMMAND ${CMAKE_COMMAND} .
COMMENT "configuring client package environment"
COMMAND ${CMAKE_CPACK_COMMAND} -G NSIS -C ${CMAKE_BUILD_TYPE}
@ -102,7 +102,7 @@ add_custom_target(package-arongodb-client-nsis
WORKING_DIRECTORY ${CLIENT_BUILD_DIR})
list(APPEND PACKAGES_LIST package-arongodb-client-nsis)
list(APPEND PACKAGES_LIST package-arangodb-client-nsis)
add_custom_target(copy_client_nsis_package
COMMAND ${CMAKE_COMMAND} -E copy ${ARANGODB_CLIENT_PACKAGE_FILE_NAME}.exe ${PACKAGE_TARGET_DIR})

4
cmake/packages/rpm.cmake
View File

@ -54,14 +54,14 @@ set(CPACK_RPM_PACKAGE_RELOCATABLE FALSE)
set(CPACK_TEMPORARY_DIRECTORY "${PROJECT_BINARY_DIR}/_CPack_Packages/${CMAKE_SYSTEM_NAME}/RPM/RPMS/${ARANGODB_PACKAGE_ARCHITECTURE}")
set(CPACK_TEMPORARY_PACKAGE_FILE_NAME "${CPACK_TEMPORARY_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}.rpm")
add_custom_target(package-arongodb-server
add_custom_target(package-arangodb-server
COMMAND ${CMAKE_COMMAND} .
COMMAND ${CMAKE_CPACK_COMMAND} -G RPM
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)
list(APPEND PACKAGES_LIST package-arangodb-server)
#################################################################################
## hook to build the client package