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

Bug fix 3.3/improve mac build (#4514)

This commit is contained in:
Michael Hackstein 2018-02-06 15:48:56 +01:00 committed by GitHub
parent d574cff1b9
commit c47c535fa8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Installation/MacOSX/Bundle/arangodb-cli.sh.in
View File

@ -1,6 +1,7 @@
#!/bin/bash #!/bin/bash
WD=$(dirname "$0") WD=$(dirname "$0")
ROOTDIR=$(cd "$WD" && pwd) # We are in Contents/MacOS. However everything is located under Contents/Resources
ROOTDIR=$(cd "$WD" && cd "../Resources" && pwd)
# create start script # create start script
ARANGOD_CONF_DIR="${HOME}@INC_CPACK_INSTALL_SYSCONFDIR@/" ARANGOD_CONF_DIR="${HOME}@INC_CPACK_INSTALL_SYSCONFDIR@/"

9
Installation/MacOSX/Bundle/hdiutilwrapper.sh.in
View File

@ -1,9 +0,0 @@
#!/bin/bash
verb=$1
shift
if test "$verb" == "create"; then
@HDIUTIL_EXECUTABLE@ $verb -megabytes @CMAKE_DMG_SIZE@ $@
else
@HDIUTIL_EXECUTABLE@ $verb $@
fi

1
cmake/InstallArangoDBJSClient.cmake
View File

@ -37,7 +37,6 @@ install(
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR_ARANGO}/js DESTINATION ${CMAKE_INSTALL_DATAROOTDIR_ARANGO}/js
REGEX "^.*/eslint" EXCLUDE REGEX "^.*/eslint" EXCLUDE
REGEX "^.*/.npmignore" EXCLUDE REGEX "^.*/.npmignore" EXCLUDE
REGEX "^.*/expect.js$" EXCLUDE
REGEX "^.*/.bin" EXCLUDE REGEX "^.*/.bin" EXCLUDE
REGEX "^.*/_admin/aardvark/APP/frontend/html/" EXCLUDE REGEX "^.*/_admin/aardvark/APP/frontend/html/" EXCLUDE
REGEX "^.*/_admin/aardvark/APP/frontend/img/" EXCLUDE REGEX "^.*/_admin/aardvark/APP/frontend/img/" EXCLUDE

36
cmake/packages/bundle.cmake
View File

@ -12,37 +12,39 @@ set(CPACK_BUNDLE_ICON "${PROJECT_SOURCE_DIR}/Installation/MacOSX/Bund
configure_file("${PROJECT_SOURCE_DIR}/Installation/MacOSX/Bundle/Info.plist.in" "${CMAKE_CURRENT_BINARY_DIR}/Info.plist") configure_file("${PROJECT_SOURCE_DIR}/Installation/MacOSX/Bundle/Info.plist.in" "${CMAKE_CURRENT_BINARY_DIR}/Info.plist")
set(CPACK_BUNDLE_PLIST "${CMAKE_CURRENT_BINARY_DIR}/Info.plist") set(CPACK_BUNDLE_PLIST "${CMAKE_CURRENT_BINARY_DIR}/Info.plist")
set(CPACK_BUNDLE_PREFIX "Contents/MacOS") set(CPACK_BUNDLE_PREFIX "Contents/Resources")
set(CPACK_BUNDLE_APPLE_CERT_APP "Developer ID Application: ArangoDB GmbH (W7UC4UQXPV)") set(CPACK_BUNDLE_APPLE_CERT_APP "Developer ID Application: ArangoDB GmbH (W7UC4UQXPV)")
set(CPACK_INSTALL_PREFIX "${CPACK_PACKAGE_NAME}.app/${CPACK_BUNDLE_PREFIX}${CMAKE_INSTALL_PREFIX}") set(CPACK_INSTALL_PREFIX "${CPACK_PACKAGE_NAME}.app/${CPACK_BUNDLE_PREFIX}${CMAKE_INSTALL_PREFIX}")
set(INST_USR_LIBDIR "/Library/ArangoDB") set(SYSTEM_STATE_DIR "/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LOCALSTATEDIR}")
set(CPACK_ARANGO_PID_DIR "/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LOCALSTATEDIR}/run") set(CPACK_ARANGO_PID_DIR "/${SYSTEM_STATE_DIR}/run")
set(CPACK_ARANGO_DATA_DIR "${INST_USR_LIBDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LOCALSTATEDIR}/lib/arangodb3")
set(CPACK_ARANGO_LOG_DIR "${INST_USR_LIBDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LOCALSTATEDIR}/log/arangodb3")
set(CPACK_ARANGO_STATE_DIR "${INST_USR_LIBDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LOCALSTATEDIR}")
set(CPACK_INSTALL_SYSCONFDIR "/Library/ArangoDB-${CMAKE_INSTALL_SYSCONFDIR}") set(CPACK_INSTALL_SYSCONFDIR "/Library/ArangoDB-${CMAKE_INSTALL_SYSCONFDIR}")
set(CPACK_INSTALL_FULL_SYSCONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR_ARANGO}") set(CPACK_INSTALL_FULL_SYSCONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR_ARANGO}")
set(CPACK_ARANGODB_APPS_DIRECTORY "${INST_USR_LIBDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LOCALSTATEDIR}/lib/arangodb3-apps")
set(CPACK_ARANGO_STATE_DIR "/Library/ArangoDB/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LOCALSTATEDIR}")
set(CPACK_ARANGO_DATA_DIR "${CPACK_ARANGO_STATE_DIR}/lib/arangodb3")
set(CPACK_ARANGO_LOG_DIR "${CPACK_ARANGO_STATE_DIR}/log/arangodb3")
set(CPACK_ARANGODB_APPS_DIRECTORY "${CPACK_ARANGO_STATE_DIR}/lib/arangodb3-apps")
# The Following lines are needed to create the paths used in the initial script.
# Create INC_CPACK_ARANGODB_APPS_DIRECTORY
to_native_path("CPACK_ARANGODB_APPS_DIRECTORY") to_native_path("CPACK_ARANGODB_APPS_DIRECTORY")
# Create INC_CMAKE_INSTALL_DATAROOTDIR_ARANGO
to_native_path("CMAKE_INSTALL_DATAROOTDIR_ARANGO") to_native_path("CMAKE_INSTALL_DATAROOTDIR_ARANGO")
# Create INC_CPACK_INSTALL_SYSCONFDIR
to_native_path("CPACK_INSTALL_SYSCONFDIR") to_native_path("CPACK_INSTALL_SYSCONFDIR")
# Create INC_CPACK_ARANGO_PID_DIR
to_native_path("CPACK_ARANGO_PID_DIR") to_native_path("CPACK_ARANGO_PID_DIR")
# Create INC_CPACK_ARANGO_DATA_DIR
to_native_path("CPACK_ARANGO_DATA_DIR") to_native_path("CPACK_ARANGO_DATA_DIR")
# Create INC_CPACK_ARANGO_STATE_DIR
to_native_path("CPACK_ARANGO_STATE_DIR") to_native_path("CPACK_ARANGO_STATE_DIR")
# Create INC_CPACK_ARANGO_LOG_DIR
to_native_path("CPACK_ARANGO_LOG_DIR") to_native_path("CPACK_ARANGO_LOG_DIR")
# Create INC_CPACK_INSTALL_FULL_SYSCONFDIR
to_native_path("CPACK_INSTALL_FULL_SYSCONFDIR") to_native_path("CPACK_INSTALL_FULL_SYSCONFDIR")
# we wrap HDIUTIL to inject our own parameter:
find_program(HDIUTIL_EXECUTABLE hdiutil)
# for now 300MB seems to be enough:
set(CMAKE_DMG_SIZE 300)
configure_file("${PROJECT_SOURCE_DIR}/Installation/MacOSX/Bundle/hdiutilwrapper.sh.in"
"${CMAKE_CURRENT_BINARY_DIR}/hdiutilwrapper.sh"
@ONLY)
set(CPACK_COMMAND_HDIUTIL "${CMAKE_CURRENT_BINARY_DIR}/hdiutilwrapper.sh")
configure_file("${PROJECT_SOURCE_DIR}/Installation/MacOSX/Bundle/arangodb-cli.sh.in" configure_file("${PROJECT_SOURCE_DIR}/Installation/MacOSX/Bundle/arangodb-cli.sh.in"
"${CMAKE_CURRENT_BINARY_DIR}/arangodb-cli.sh" "${CMAKE_CURRENT_BINARY_DIR}/arangodb-cli.sh"
@ONLY) @ONLY)