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

fixed Mac build 

Conflicts:
	Makefile.in
This commit is contained in:
Frank Celler 2013-11-09 12:59:24 +01:00
parent 6946f827fd
commit eee23de5e0
5 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -111,8 +111,10 @@ set(ETCDIR "" CACHE path "System configuration directory (defaults to prefix/etc
if (ETCDIR STREQUAL "") if (ETCDIR STREQUAL "")
set(ETCDIR_NATIVE "${CMAKE_INSTALL_PREFIX}/etc/arangodb") set(ETCDIR_NATIVE "${CMAKE_INSTALL_PREFIX}/etc/arangodb")
set(ETCDIR_INSTALL "etc/arangodb")
else () else ()
set(ETCDIR_NATIVE "${ETCDIR}/arangodb") set(ETCDIR_NATIVE "${ETCDIR}/arangodb")
set(ETCDIR_INSTALL "${ETCDIR}/arangodb")
endif () endif ()
file(TO_NATIVE_PATH "${ETCDIR_NATIVE}" ETCDIR_NATIVE) file(TO_NATIVE_PATH "${ETCDIR_NATIVE}" ETCDIR_NATIVE)
@ -123,12 +125,14 @@ add_definitions("-D_SYSCONFDIR_=\"${ETCDIR_NATIVE}\"")
### @brief DATA DIRECTORY (/var) ### @brief DATA DIRECTORY (/var)
################################################################################ ################################################################################
set(VARDIR "" CACHE path "System configuration directory (defaults to prefix/etc)") set(VARDIR "" CACHE path "System configuration directory (defaults to prefix/var/arangodb)")
if (VARDIR STREQUAL "") if (VARDIR STREQUAL "")
set(VARDIR_NATIVE "${CMAKE_INSTALL_PREFIX}/var/arangodb") set(VARDIR_NATIVE "${CMAKE_INSTALL_PREFIX}/var")
set(VARDIR_INSTALL "var")
else () else ()
set(VARDIR_NATIVE "${VARDIR}/arangodb") set(VARDIR_NATIVE "${VARDIR}")
set(VARDIR_INSTALL "${VARDIR}")
endif () endif ()
file(TO_NATIVE_PATH "${VARDIR_NATIVE}" VARDIR_NATIVE) file(TO_NATIVE_PATH "${VARDIR_NATIVE}" VARDIR_NATIVE)

10
Makefile.am
View File

@ -536,8 +536,6 @@ pack-dmg-cmake:
cd Build && cmake \ cd Build && cmake \
-D "BUILD_PACKAGE=dmg-cli" \ -D "BUILD_PACKAGE=dmg-cli" \
-D "CMAKE_INSTALL_PREFIX=${prefix}" \ -D "CMAKE_INSTALL_PREFIX=${prefix}" \
-D "ETCDIR=${sysconfdir}" \
-D "VARDIR=${localstatedir}" \
-D "USE_MRUBY=ON" \ -D "USE_MRUBY=ON" \
-D "USE_RAW_CONFIG=ON" \ -D "USE_RAW_CONFIG=ON" \
-D "ARANGODB_VERSION=@VERSION@" \ -D "ARANGODB_VERSION=@VERSION@" \
@ -546,6 +544,10 @@ pack-dmg-cmake:
-D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \ -D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \
.. ..
${MAKE} ${BUILT_SOURCES}
cd Build && ${MAKE}
cd Build && cpack \ cd Build && cpack \
-G Bundle \ -G Bundle \
-D "CPACK_INSTALL_PREFIX=${DMG_NAME}/Contents/MacOS/opt/arangodb" -D "CPACK_INSTALL_PREFIX=${DMG_NAME}/Contents/MacOS/opt/arangodb"
@ -587,6 +589,10 @@ pack-arm-cmake:
-D "CMAKE_C_FLAGS_RELEASE:STRING=-O2 -DNDEBUG" \ -D "CMAKE_C_FLAGS_RELEASE:STRING=-O2 -DNDEBUG" \
.. ..
${MAKE} ${BUILT_SOURCES}
cd Build && ${MAKE}
cd Build && cpack \ cd Build && cpack \
-G DEB -G DEB

14
arangod/CMakeLists.txt
View File

@ -152,28 +152,28 @@ install(
if (USE_RAW_CONFIG) if (USE_RAW_CONFIG)
install( install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod.conf.in FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod.conf.in
DESTINATION ${ETCDIR_NATIVE} DESTINATION ${ETCDIR_INSTALL}
RENAME arangod-relative.conf) RENAME arangod-relative.conf)
endif () endif ()
if (BUILD_PACKAGE STREQUAL "raspbian") if (BUILD_PACKAGE STREQUAL "raspbian")
install( install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod-arm.conf FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod-arm.conf
DESTINATION ${ETCDIR_NATIVE} DESTINATION ${ETCDIR_INSTALL}
RENAME arangod.conf) RENAME arangod.conf)
install( install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod-uid-arm.conf FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod-uid-arm.conf
DESTINATION ${ETCDIR_NATIVE} DESTINATION ${ETCDIR_INSTALL}
RENAME arangod-uid.conf) RENAME arangod-uid.conf)
else () else ()
install( install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod.conf FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod.conf
DESTINATION ${ETCDIR_NATIVE}) DESTINATION ${ETCDIR_INSTALL})
install( install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod-uid.conf FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod-uid.conf
DESTINATION ${ETCDIR_NATIVE}) DESTINATION ${ETCDIR_INSTALL})
endif () endif ()
install( install(
@ -202,11 +202,11 @@ install(
install( install(
DIRECTORY ${PROJECT_BINARY_DIR}/var/log/arangodb DIRECTORY ${PROJECT_BINARY_DIR}/var/log/arangodb
DESTINATION ${VARDIR_NATIVE}/log) DESTINATION ${VARDIR_INSTALL}/log)
install( install(
DIRECTORY ${PROJECT_BINARY_DIR}/var/lib/arangodb DIRECTORY ${PROJECT_BINARY_DIR}/var/lib/arangodb
DESTINATION ${VARDIR_NATIVE}/lib) DESTINATION ${VARDIR_INSTALL}/lib)
## ----------------------------------------------------------------------------- ## -----------------------------------------------------------------------------
## --SECTION-- END-OF-FILE ## --SECTION-- END-OF-FILE

4
arangoirb/CMakeLists.txt
View File

@ -49,13 +49,13 @@ install(
if (USE_RAW_CONFIG) if (USE_RAW_CONFIG)
install( install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangoirb.conf.in FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangoirb.conf.in
DESTINATION ${ETCDIR_NATIVE} DESTINATION ${ETCDIR_INSTALL}
RENAME arangoirb-relative.conf) RENAME arangoirb-relative.conf)
endif () endif ()
install( install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangoirb.conf FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangoirb.conf
DESTINATION ${ETCDIR_NATIVE}) DESTINATION ${ETCDIR_INSTALL})
install( install(
DIRECTORY ${PROJECT_SOURCE_DIR}/mr/common ${PROJECT_SOURCE_DIR}/mr/client DIRECTORY ${PROJECT_SOURCE_DIR}/mr/common ${PROJECT_SOURCE_DIR}/mr/client

20
arangosh/CMakeLists.txt
View File

@ -46,13 +46,13 @@ install(
if (USE_RAW_CONFIG) if (USE_RAW_CONFIG)
install( install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangob.conf.in FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangob.conf.in
DESTINATION ${ETCDIR_NATIVE} DESTINATION ${ETCDIR_INSTALL}
RENAME arangob-relative.conf) RENAME arangob-relative.conf)
endif () endif ()
install( install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangob.conf FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangob.conf
DESTINATION ${ETCDIR_NATIVE}) DESTINATION ${ETCDIR_INSTALL})
install( install(
DIRECTORY ${PROJECT_SOURCE_DIR}/js/common ${PROJECT_SOURCE_DIR}/js/client DIRECTORY ${PROJECT_SOURCE_DIR}/js/common ${PROJECT_SOURCE_DIR}/js/client
@ -91,13 +91,13 @@ install(
if (USE_RAW_CONFIG) if (USE_RAW_CONFIG)
install( install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangodump.conf.in FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangodump.conf.in
DESTINATION ${ETCDIR_NATIVE} DESTINATION ${ETCDIR_INSTALL}
RENAME arangodump-relative.conf) RENAME arangodump-relative.conf)
endif () endif ()
install( install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangodump.conf FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangodump.conf
DESTINATION ${ETCDIR_NATIVE}) DESTINATION ${ETCDIR_INSTALL})
install( install(
DIRECTORY ${PROJECT_SOURCE_DIR}/js/common ${PROJECT_SOURCE_DIR}/js/client DIRECTORY ${PROJECT_SOURCE_DIR}/js/common ${PROJECT_SOURCE_DIR}/js/client
@ -138,13 +138,13 @@ install(
if (USE_RAW_CONFIG) if (USE_RAW_CONFIG)
install( install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangoimp.conf.in FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangoimp.conf.in
DESTINATION ${ETCDIR_NATIVE} DESTINATION ${ETCDIR_INSTALL}
RENAME arangoimp-relative.conf) RENAME arangoimp-relative.conf)
endif () endif ()
install( install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangoimp.conf FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangoimp.conf
DESTINATION ${ETCDIR_NATIVE}) DESTINATION ${ETCDIR_INSTALL})
install( install(
DIRECTORY ${PROJECT_SOURCE_DIR}/js/common ${PROJECT_SOURCE_DIR}/js/client DIRECTORY ${PROJECT_SOURCE_DIR}/js/common ${PROJECT_SOURCE_DIR}/js/client
@ -183,13 +183,13 @@ install(
if (USE_RAW_CONFIG) if (USE_RAW_CONFIG)
install( install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangorestore.conf.in FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangorestore.conf.in
DESTINATION ${ETCDIR_NATIVE} DESTINATION ${ETCDIR_INSTALL}
RENAME arangorestore-relative.conf) RENAME arangorestore-relative.conf)
endif () endif ()
install( install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangorestore.conf FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangorestore.conf
DESTINATION ${ETCDIR_NATIVE}) DESTINATION ${ETCDIR_INSTALL})
install( install(
DIRECTORY ${PROJECT_SOURCE_DIR}/js/common ${PROJECT_SOURCE_DIR}/js/client DIRECTORY ${PROJECT_SOURCE_DIR}/js/common ${PROJECT_SOURCE_DIR}/js/client
@ -230,13 +230,13 @@ install(
if (USE_RAW_CONFIG) if (USE_RAW_CONFIG)
install( install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangosh.conf.in FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangosh.conf.in
DESTINATION ${ETCDIR_NATIVE} DESTINATION ${ETCDIR_INSTALL}
RENAME arangosh-relative.conf) RENAME arangosh-relative.conf)
endif () endif ()
install( install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangosh.conf FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangosh.conf
DESTINATION ${ETCDIR_NATIVE}) DESTINATION ${ETCDIR_INSTALL})
install( install(
DIRECTORY ${PROJECT_SOURCE_DIR}/js/common ${PROJECT_SOURCE_DIR}/js/client DIRECTORY ${PROJECT_SOURCE_DIR}/js/common ${PROJECT_SOURCE_DIR}/js/client