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

- Fix enterprise package naming for windows & mac 

- add missing `make package` target for mac
This commit is contained in:
Wilfried Goesgens 2016-10-12 10:48:44 +02:00
parent f2570169e5
commit 7343df31d0
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmake/packages/bundle.cmake
View File

@ -1,10 +1,21 @@
message("enabling MacOSX 'Bundle' package")
set(CPACK_PACKAGE_NAME "ArangoDB-CLI")
if (${USE_ENTERPRISE})
set(CPACK_PACKAGE_NAME "ArangoDB3e-CLI")
else()
set(CPACK_PACKAGE_NAME "ArangoDB3-CLI")
endif()
set(CPACK_BUNDLE_NAME "${CPACK_PACKAGE_NAME}")
set(CPACK_BUNDLE_PLIST "${CMAKE_CURRENT_BINARY_DIR}/Info.plist")
set(CPACK_BUNDLE_ICON "${PROJECT_SOURCE_DIR}/Installation/MacOSX/Bundle/icon.icns")
set(CPACK_BUNDLE_STARTUP_COMMAND "${PROJECT_SOURCE_DIR}/Installation/MacOSX/Bundle/arangodb-cli.sh")
configure_file("${PROJECT_SOURCE_DIR}/Installation/MacOSX/Bundle/Info.plist.in" "${CMAKE_CURRENT_BINARY_DIR}/Info.plist")
add_custom_target(package-arongodb-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-nsis)
add_custom_target(copy_packages
COMMAND cp *.dmg ${PACKAGE_TARGET_DIR})

7
cmake/packages/nsis.cmake
View File

@ -2,7 +2,12 @@
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/InstallMacros.cmake)
set(CMAKE_INSTALL_FULL_SBINDIR "${CMAKE_INSTALL_FULL_BINDIR}")
set(W_INSTALL_FILES "${PROJECT_SOURCE_DIR}/Installation/Windows/")
set(CPACK_PACKAGE_NAME "ArangoDB")
if (${USE_ENTERPRISE})
set(CPACK_PACKAGE_NAME "ArangoDB3e")
else()
set(CPACK_PACKAGE_NAME "ArangoDB3")
endif()
set(CPACK_NSIS_DISPLAY_NAME, ${ARANGODB_DISPLAY_NAME})
set(CPACK_NSIS_HELP_LINK ${ARANGODB_HELP_LINK})
set(CPACK_NSIS_URL_INFO_ABOUT ${ARANGODB_URL_INFO_ABOUT})