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

Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk

This commit is contained in:
jsteemann 2016-03-02 22:09:44 +01:00
parent 60ac50e5c6 3524ee829f
commit b35f44a5d1
4 changed files with 45 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
3rdParty/CMakeLists.txt vendored
View File

@ -134,6 +134,7 @@ endif ()
## ZLIB
################################################################################
set(SKIP_INSTALL_ALL ON)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/zlib/zlib-1.2.8)
################################################################################

2
3rdParty/libev/CMakeLists.txt vendored
View File

@ -87,7 +87,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG)
CMAKE_CXX_FLAGS_RELEASE
CMAKE_CXX_FLAGS_MINSIZEREL
CMAKE_CXX_FLAGS_RELWITHDEBINFO)
set(${flag} "${${flag}} -Wno-unused-function -Wno-unused-parameter -Wno-sign-compare -Wno-old-style-declaration")
set(${flag} "${${flag}} -Wno-all")
endforeach()
endif ()

23
CMakeCPackOptions.cmake.in Normal file
View File

@ -0,0 +1,23 @@
# debian
if (CPACK_GENERATOR STREQUAL "DEB")
set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
set(CPACK_DEBIAN_PACKAGE_SECTION "database")
set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "a multi-purpose NoSQL database
A distributed free and open-source database with a flexible data model for documents,
graphs, and key-values. Build high performance applications using a convenient
SQL-like query language or JavaScript extensions.
.
Copyright: 2012-2013 by triAGENS GmbH
Copyright: 2014-2015 by ArangoDB GmbH
ArangoDB Software
www.arangodb.com
")
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
"${CMAKE_CURRENT_SOURCE_DIR}/Installation/Debian/arangodb.postinst;${CMAKE_CURRENT_SOURCE_DIR}/Installation/Debian/arangodb.preinst;${CMAKE_CURRENT_SOURCE_DIR}/Installation/Debian/arangodb.postrm;${CMAKE_CURRENT_SOURCE_DIR}/Installation/Debian/arangodb.prerm;")
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://www.arangodb.com/")
set(CPACK_PACKAGE_FILE_NAME "arangodb_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
set(CPACK_COMPONENTS_ALL debian-extras)
endif ()

69
cmake/ArangoDBMacros.cmake
View File

@ -169,7 +169,7 @@ endif ()
if (NOT WINDOWS)
install(
PROGRAMS ${PROJECT_SOURCE_DIR}/bin/etcd-arango
PROGRAMS ${PROJECT_BINARY_DIR}/bin/etcd-arango
DESTINATION ${ARANGODB_INSTALL_BIN}
)
endif ()
@ -302,25 +302,10 @@ else ()
endif ()
# Build package ----------------------------------------------------------------
# Posible options are:
# - dmg-cli: Mac OS X shell client application
# - debian: debian package
set(BUILD_PACKAGE "unknown" CACHE path "Package type to build")
# OSX
if (BUILD_PACKAGE STREQUAL "dmg-cli")
option(DARWIN "Building for MacOS" ON)
else ()
option(DARWIN "Building for MacOS" OFF)
endif ()
# Windows
if (MSVC)
else ()
set(CPACK_SET_DESTDIR ON)
endif ()
set(CPACK_SET_DESTDIR ON)
# General
set(CPACK_PACKAGE_NAME "arangodb")
set(CPACK_PACKAGE_VENDOR "ArangoDB GmbH")
set(CPACK_PACKAGE_CONTACT "info@arangodb.org")
set(CPACK_PACKAGE_VERSION "${ARANGODB_VERSION}")
@ -329,38 +314,10 @@ set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
set(CPACK_STRIP_FILES "ON")
if (DARWIN)
set(CPACK_PACKAGE_NAME "ArangoDB-CLI")
elseif (BUILD_PACKAGE STREQUAL "debian")
set(CPACK_PACKAGE_NAME "arangodb")
elseif (MSVC)
set(CPACK_PACKAGE_NAME "ArangoDB")
endif ()
# debian
if (BUILD_PACKAGE STREQUAL "debian")
set(CPACK_DEBIAN_PACKAGE_SECTION "database")
set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
"${PROJECT_SOURCE_DIR}/Installation/Debian/postinst;${PROJECT_SOURCE_DIR}/Installation/Debian/preinst;${PROJECT_SOURCE_DIR}/Installation/Debian/postrm;${PROJECT_SOURCE_DIR}/Installation/Debian/prerm;")
install(
FILES ${PROJECT_SOURCE_DIR}/Installation/Debian/rc.arangodb
PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
DESTINATION /etc/init.d
RENAME arangodb)
install(
CODE
"EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/share/arangodb/js/apps)")
install(
CODE
"EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink /var/lib/arangodb-apps \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/share/arangodb/js/apps/databases)")
endif ()
# OSX bundle
if (DARWIN)
if (CPACK_GENERATOR STREQUAL "Bundle")
set(CPACK_PACKAGE_NAME "ArangoDB-CLI")
set(CPACK_BUNDLE_NAME "${CPACK_PACKAGE_NAME}")
set(CPACK_BUNDLE_PLIST "${PROJECT_SOURCE_DIR}/Installation/MacOSX/Bundle/Info.plist")
set(CPACK_BUNDLE_ICON "${PROJECT_SOURCE_DIR}/Installation/MacOSX/Bundle/icon.icns")
@ -369,6 +326,7 @@ endif ()
# MS installer
if (MSVC)
set(CPACK_PACKAGE_NAME "ArangoDB")
set(CPACK_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/Installation/Windows/Templates")
set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL 1)
set(BITS 64)
@ -425,6 +383,19 @@ if (MSVC)
endif ()
configure_file("${CMAKE_SOURCE_DIR}/CMakeCPackOptions.cmake.in"
"${CMAKE_BINARY_DIR}/CMakeCPackOptions.cmake" @ONLY)
set(CPACK_PROJECT_CONFIG_FILE "${CMAKE_BINARY_DIR}/CMakeCPackOptions.cmake")
# components
install(
FILES ${PROJECT_SOURCE_DIR}/Installation/debian/arangodb.init
PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
DESTINATION /etc/init.d
RENAME arangodb
COMPONENT debian-extras
)
# Custom targets ----------------------------------------------------------------
@ -474,7 +445,7 @@ install(
################################################################################
install(
DIRECTORY ${PROJECT_BINARY_DIR}/js
DIRECTORY ${PROJECT_SOURCE_DIR}/js
DESTINATION share/arangodb)
################################################################################