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

MacOS bundle

This commit is contained in:
Frank Celler 2013-12-23 16:03:38 +01:00
parent a3ecc7cd5b
commit 7e30dc0b4e
6 changed files with 32 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@ -137,12 +137,6 @@ if (USE_MRUBY)
add_definitions("-DTRI_ENABLE_MRUBY=1")
endif ()
################################################################################
### @brief RAW_CONFIG
################################################################################
option(USE_RAW_CONFIG "Do you want to install configuration files with variables" OFF)
################################################################################
### @brief SYSTEM CONFIGURATION DIRECTORY (/etc)
################################################################################
@ -254,8 +248,10 @@ macro (generate_root_config name)
STRING(REPLACE "@LOCALSTATEDIR@" "@ROOTDIR@/var"
FileContent "${FileContent}")
STRING(REGEX REPLACE "[\r\n]file =" "\n# file ="
FileContent "${FileContent}")
if (MSVC)
STRING(REGEX REPLACE "[\r\n]file =" "\n# file ="
FileContent "${FileContent}")
endif ()
FILE(WRITE ${PROJECT_BINARY_DIR}/etc/arangodb/${name}.conf "${FileContent}")
endmacro ()
@ -268,6 +264,12 @@ macro (install_config name)
if (MSVC)
generate_root_config(${name})
install(
FILES ${PROJECT_BINARY_DIR}/etc/arangodb/${name}.conf
DESTINATION ${ETCDIR_INSTALL})
elseif (BUILD_PACKAGE STREQUAL "dmg-cli")
generate_root_config(${name})
install(
FILES ${PROJECT_BINARY_DIR}/etc/arangodb/${name}.conf
DESTINATION ${ETCDIR_INSTALL})
@ -324,7 +326,7 @@ macro (install_command_alias name where alias)
POST_BUILD
COMMAND
${CMAKE_COMMAND} -E create_symlink
$<TARGET_FILE:${name}>
${name}
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${alias})
install(

3
GNUmakefile
View File

@ -111,7 +111,6 @@ pack-dmg-cmake:
-D "BUILD_PACKAGE=dmg-cli" \
-D "CMAKE_INSTALL_PREFIX=${prefix}" \
-D "USE_MRUBY=ON" \
-D "USE_RAW_CONFIG=ON" \
-D "ARANGODB_VERSION=${VERSION}" \
-D "CPACK_PACKAGE_VERSION_MAJOR=${VERSION_MAJOR}" \
-D "CPACK_PACKAGE_VERSION_MINOR=${VERSION_MINOR}" \
@ -157,7 +156,6 @@ pack-macosx-cmake:
-D "BUILD_PACKAGE=dmg-cli" \
-D "CMAKE_INSTALL_PREFIX=${prefix}" \
-D "USE_MRUBY=ON" \
-D "USE_RAW_CONFIG=ON" \
-D "ARANGODB_VERSION=${VERSION}" \
-D "CPACK_PACKAGE_VERSION_MAJOR=${VERSION_MAJOR}" \
-D "CPACK_PACKAGE_VERSION_MINOR=${VERSION_MINOR}" \
@ -202,7 +200,6 @@ pack-arm-cmake:
-D "ETCDIR=${sysconfdir}" \
-D "VARDIR=${localstatedir}" \
-D "USE_MRUBY=OFF" \
-D "USE_RAW_CONFIG=OFF" \
-D "ARANGODB_VERSION=${VERSION}" \
-D "CPACK_PACKAGE_VERSION_MAJOR=${VERSION_MAJOR}" \
-D "CPACK_PACKAGE_VERSION_MINOR=${VERSION_MINOR}" \

37
Installation/MacOSX/Bundle/arangodb-cli.sh
View File

@ -1,10 +1,10 @@
#!/bin/bash
ARANGODB_ROOT="`echo $0 | sed -e 's/\/Contents\/MacOS\/ArangoDB-CLI//'`/"
ROOTDIR="`echo $0 | sed -e 's:/Contents/MacOS/ArangoDB-CLI::'`"
# create start script
SCRIPTS="`( cd ${ARANGODB_ROOT}Contents/MacOS/opt/arangodb && ls -1 {bin,sbin}/* )`"
SCRIPTS="`( cd ${ROOTDIR}/Contents/MacOS/opt/arangodb && ls -1 {bin,sbin}/* )`"
for script in $SCRIPTS; do
base="`basename $script`"
@ -12,26 +12,19 @@ for script in $SCRIPTS; do
(
echo "#!/bin/bash"
echo
echo "export ARANGODB_ROOT=\"${ARANGODB_ROOT}Contents/MacOS/\""
echo "export LOCALSTATEDIR=\"\${ARANGODB_ROOT}opt/arangodb/var\""
echo "export PKGDATADIR=\"\${ARANGODB_ROOT}opt/arangodb/share/arangodb\""
echo "export ROOTDIR=\"${ROOTDIR}/Contents/MacOS/opt/arangodb\""
echo
if [ "$base" == "arango-dfdb" ]; then
echo "exec \"\${ARANGODB_ROOT}opt/arangodb/$script\" \$*"
elif [ "$base" == "foxx-manager" ]; then
echo "exec \"\${ARANGODB_ROOT}opt/arangodb/$script\" -c \"\${ARANGODB_ROOT}opt/arangodb/etc/arangodb/arangosh-relative.conf\" \$*"
else
echo "exec \"\${ARANGODB_ROOT}opt/arangodb/$script\" -c \"\${ARANGODB_ROOT}opt/arangodb/etc/arangodb/${base}-relative.conf\" \$*"
fi
) > ${ARANGODB_ROOT}Contents/MacOS/$base.$$
chmod 755 ${ARANGODB_ROOT}Contents/MacOS/$base.$$
mv ${ARANGODB_ROOT}Contents/MacOS/$base.$$ ${ARANGODB_ROOT}Contents/MacOS/$base
echo "exec \"\${ROOTDIR}/$script\" -c \"\${ROOTDIR}/etc/arangodb/${base}.conf\" \$*"
) > ${ROOTDIR}/Contents/MacOS/$base.$$
chmod 755 ${ROOTDIR}/Contents/MacOS/$base.$$
mv ${ROOTDIR}/Contents/MacOS/$base.$$ ${ROOTDIR}/Contents/MacOS/$base
done
# start the server
PIDFILE="${ARANGODB_ROOT}Contents/MacOS/opt/arangodb/var/run/arangod.pid"
PIDFILE="${ROOTDIR}/Contents/MacOS/opt/arangodb/var/run/arangod.pid"
if [ -f "${PIDFILE}" ]; then
result=`
@ -48,8 +41,8 @@ EOF
fi
fi
test -d "${ARANGODB_ROOT}Contents/MacOS/opt/arangodb/var/run" || mkdir "${ARANGODB_ROOT}Contents/MacOS/opt/arangodb/var/run"
${ARANGODB_ROOT}Contents/MacOS/arangod --daemon --pid-file "${PIDFILE}"
test -d "${ROOTDIR}/Contents/MacOS/opt/arangodb/var/run" || mkdir "${ROOTDIR}/Contents/MacOS/opt/arangodb/var/run"
${ROOTDIR}/Contents/MacOS/arangod --daemon --pid-file "${PIDFILE}"
# create some information for the user
@ -59,14 +52,14 @@ INFOFILE="/tmp/ArangoDB-CLI.info.$$"
echo "ArangoDB server has been started"
echo ""
echo "The database directory is located at"
echo " '${ARANGODB_ROOT}Contents/MacOS/opt/arangodb/var/lib/arangodb'"
echo " '${ROOTDIR}/Contents/MacOS/opt/arangodb/var/lib/arangodb'"
echo ""
echo "The log file is located at"
echo " '${ARANGODB_ROOT}Contents/MacOS/opt/arangodb/var/log/arangodb/arangod.log'"
echo " '${ROOTDIR}/Contents/MacOS/opt/arangodb/var/log/arangodb/arangod.log'"
echo ""
echo "You can access the server using a browser at 'http://127.0.0.1:8529/'"
echo "or start the ArangoDB shell"
echo " '${ARANGODB_ROOT}Contents/MacOS/arangosh'"
echo " '${ROOTDIR}/Contents/MacOS/arangosh'"
echo ""
echo "Switching to log-file now, killing this windows will NOT stop the server."
echo ""
@ -78,6 +71,6 @@ INFOFILE="/tmp/ArangoDB-CLI.info.$$"
/usr/bin/osascript <<-EOF
tell application "Terminal"
activate
do script "clear && cat $INFOFILE && rm $INFOFILE && sleep 20 && exec tail -1 -f ${ARANGODB_ROOT}Contents/MacOS/opt/arangodb/var/log/arangodb/arangod.log"
do script "clear && cat $INFOFILE && rm $INFOFILE && sleep 20 && exec tail -1 -f ${ROOTDIR}/Contents/MacOS/opt/arangodb/var/log/arangodb/arangod.log"
end tell
EOF

28
arangod/CMakeLists.txt
View File

@ -168,13 +168,6 @@ install(
### @brief install arangod config
################################################################################
if (USE_RAW_CONFIG)
install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod.conf.in
DESTINATION ${ETCDIR_INSTALL}
RENAME arangod-relative.conf)
endif ()
if (BUILD_PACKAGE STREQUAL "raspbian")
install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod-arm.conf
@ -185,16 +178,12 @@ if (BUILD_PACKAGE STREQUAL "raspbian")
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod-uid-arm.conf
DESTINATION ${ETCDIR_INSTALL}
RENAME arangod-uid.conf)
elseif (BUILD_PACKAGE STREQUAL "dmg-cli")
install_config(arangod)
elseif (MSVC)
generate_root_config(arangod)
install(
FILES ${PROJECT_BINARY_DIR}/etc/arangodb/arangod.conf
DESTINATION ${ETCDIR_INSTALL})
install_config(arangod)
else ()
install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod.conf
DESTINATION ${ETCDIR_INSTALL})
install_config(arangod)
install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod-uid.conf
@ -205,19 +194,12 @@ endif ()
### @brief install arango-dfdb binary
################################################################################
install_command_alias(${BIN_ARANGOD} ${TRI_BINDIR_INSTALL} arango-dfdb)
install_command_alias(${BIN_ARANGOD} ${TRI_SBINDIR_INSTALL} arango-dfdb)
################################################################################
### @brief install arango-dfdb config
################################################################################
if (USE_RAW_CONFIG)
install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arango-dfdb.conf.in
DESTINATION ${ETCDIR_INSTALL}
RENAME arango-dfdb-relative.conf)
endif ()
install_config(arango-dfdb)
################################################################################

11
arangoirb/CMakeLists.txt
View File

@ -47,16 +47,7 @@ install(
TARGETS ${BIN_ARANGOIRB}
RUNTIME DESTINATION ${TRI_BINDIR_INSTALL})
if (USE_RAW_CONFIG)
install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangoirb.conf.in
DESTINATION ${ETCDIR_INSTALL}
RENAME arangoirb-relative.conf)
endif ()
install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangoirb.conf
DESTINATION ${ETCDIR_INSTALL})
install_config(arangoirb)
install(
DIRECTORY ${PROJECT_SOURCE_DIR}/mr/common ${PROJECT_SOURCE_DIR}/mr/client

42
arangosh/CMakeLists.txt
View File

@ -52,13 +52,6 @@ install(
### @brief install arangob config
################################################################################
if (USE_RAW_CONFIG)
install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangob.conf.in
DESTINATION ${ETCDIR_INSTALL}
RENAME arangob-relative.conf)
endif ()
install_config(arangob)
################################################################################
@ -96,13 +89,6 @@ install(
### @brief install arangodump config
################################################################################
if (USE_RAW_CONFIG)
install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangodump.conf.in
DESTINATION ${ETCDIR_INSTALL}
RENAME arangodump-relative.conf)
endif ()
install_config(arangodump)
################################################################################
@ -142,13 +128,6 @@ install(
### @brief install arangoimp config
################################################################################
if (USE_RAW_CONFIG)
install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangoimp.conf.in
DESTINATION ${ETCDIR_INSTALL}
RENAME arangoimp-relative.conf)
endif ()
install_config(arangoimp)
################################################################################
@ -186,13 +165,6 @@ install(
### @brief install arangorestore config
################################################################################
if (USE_RAW_CONFIG)
install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangorestore.conf.in
DESTINATION ${ETCDIR_INSTALL}
RENAME arangorestore-relative.conf)
endif ()
install_config(arangorestore)
################################################################################
@ -232,13 +204,6 @@ install(
### @brief install arangosh config
################################################################################
if (USE_RAW_CONFIG)
install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangosh.conf.in
DESTINATION ${ETCDIR_INSTALL}
RENAME arangosh-relative.conf)
endif ()
install_config(arangosh)
################################################################################
@ -251,13 +216,6 @@ install_command_alias(${BIN_ARANGOSH} ${TRI_BINDIR_INSTALL} foxx-manager)
### @brief install foxx-manager config
################################################################################
if (USE_RAW_CONFIG)
install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/foxx-manager.conf.in
DESTINATION ${ETCDIR_INSTALL}
RENAME foxx-manager-relative.conf)
endif ()
install_config(foxx-manager)
################################################################################