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:
Jan Steemann 2016-03-07 08:11:01 +01:00
parent ef4ef4a0f7 b1899e9b31
commit 9f84b767d1
16 changed files with 72 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3rdParty/boost/CMakeLists.txt vendored
View File

@ -25,7 +25,7 @@ endif ()
if (Boost_UNIT_TEST_FRAMEWORK_FOUND)
try_compile(
HAVE_USABLE_BOOT_LIBRARIES
HAVE_USABLE_BOOST_LIBRARIES
"${CMAKE_BINARY_DIR}/temp"
"${CMAKE_SOURCE_DIR}/cmake/test_boost.cpp"
LINK_LIBRARIES
@ -34,7 +34,7 @@ if (Boost_UNIT_TEST_FRAMEWORK_FOUND)
"-DINCLUDE_DIRECTORIES=${Boost_INCLUDE_DIR}"
)
if (HAVE_USABLE_BOOT_LIBRARIES)
if (HAVE_USABLE_BOOST_LIBRARIES)
option(USE_BOOST_UNITTESTS "use boost unit-tests" ON)
else ()
message(STATUS "cannot use BOOST library ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}")

28
3rdParty/zlib/zlib-1.2.8/CMakeLists.txt vendored
View File

@ -241,23 +241,23 @@ endif()
include_directories(${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR})
add_executable(example EXCLUDE_FROM_ALL test/example.c)
target_link_libraries(example zlib)
add_test(example example)
# add_executable(example EXCLUDE_FROM_ALL test/example.c)
# target_link_libraries(example zlib)
# add_test(example example)
add_executable(minigzip EXCLUDE_FROM_ALL test/minigzip.c)
target_link_libraries(minigzip zlib)
# add_executable(minigzip EXCLUDE_FROM_ALL test/minigzip.c)
# target_link_libraries(minigzip zlib)
if(HAVE_OFF64_T)
add_executable(example64 test/example.c)
target_link_libraries(example64 zlib)
set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
add_test(example64 example64)
# if(HAVE_OFF64_T)
# add_executable(example64 test/example.c)
# target_link_libraries(example64 zlib)
# set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
# add_test(example64 example64)
add_executable(minigzip64 test/minigzip.c)
target_link_libraries(minigzip64 zlib)
set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
endif()
# add_executable(minigzip64 test/minigzip.c)
# target_link_libraries(minigzip64 zlib)
# set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
# endif()
set(ZLIB_VERSION
${zlib_VERSION}

27
CMakeLists.txt
View File

@ -38,9 +38,6 @@ set(ARANGODB_VERSION_REVISION "0-devel")
set(ARANGODB_VERSION
"${ARANGODB_VERSION_MAJOR}.${ARANGODB_VERSION_MINOR}.${ARANGODB_VERSION_REVISION}")
string(TIMESTAMP ARANGODB_BUILD_DATE "%Y-%m-%d %H:%M:%S")
add_definitions("-DARANGODB_BUILD_DATE=\"${ARANGODB_BUILD_DATE}\"")
# for NSIS
set(ARANGODB_DISPLAY_NAME "ArangoDB")
set(ARANGODB_URL_INFO_ABOUT "https://www.arangodb.com")
@ -74,12 +71,20 @@ set(TEST_GEO_SUITE geo_suite)
## VERSION FILES
################################################################################
string(TIMESTAMP ARANGODB_BUILD_DATE "%Y-%m-%d %H:%M:%S")
configure_file (
"${CMAKE_CURRENT_SOURCE_DIR}/lib/Basics/build.h.in"
"${CMAKE_CURRENT_BINARY_DIR}/lib/Basics/build.h"
NEWLINE_STYLE UNIX
)
configure_file (
"${CMAKE_CURRENT_SOURCE_DIR}/lib/Basics/build-date.h.in"
"${CMAKE_CURRENT_BINARY_DIR}/lib/Basics/build-date.h"
NEWLINE_STYLE UNIX
)
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/lib/Basics/VERSION.in"
"${CMAKE_CURRENT_SOURCE_DIR}/VERSION"
@ -175,15 +180,15 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
endif ()
if (WINDOWS)
set(BASE_FLAGS "/D WIN32 /D _WINDOWS /W3")
set(BASE_C_FLAGS)
set(BASE_CXX_FLAGS "/GR /EHsc")
set(BASE_FLAGS "/D WIN32 /D _WINDOWS /W3" CACHE STRING "base flags")
set(BASE_C_FLAGS "" CACHE STRING "base C flags")
set(BASE_CXX_FLAGS "/GR /EHsc" CACHE STRING "base C++flags")
else ()
set(BASE_FLAGS)
set(BASE_C_FLAGS ${CMAKE_C_FLAGS})
set(BASE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
set(BASE_LD_FLAGS $ENV{LDFLAGS})
set(BASE_LIBS $ENV{LIBS})
set(BASE_FLAGS "" CACHE STRING "base flags")
set(BASE_C_FLAGS "${CMAKE_C_FLAGS}" CACHE STRING "base C flags")
set(BASE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" CACHE STRING "base C++ flags")
set(BASE_LD_FLAGS "$ENV{LDFLAGS}" CACHE STRING "base linker flags")
set(BASE_LIBS "$ENV{LIBS}" CACHE STRING "base libraries")
endif ()
if (SOLARIS)

9
arangod/RestHandler/RestReplicationHandler.cpp
View File

@ -22,19 +22,20 @@
////////////////////////////////////////////////////////////////////////////////
#include "RestReplicationHandler.h"
#include "Basics/files.h"
#include "Basics/json.h"
#include "Basics/Logger.h"
#include "Basics/ReadLocker.h"
#include "Basics/VelocyPackHelper.h"
#include "Cluster/ClusterMethods.h"
#include "Basics/conversions.h"
#include "Basics/files.h"
#include "Cluster/ClusterComm.h"
#include "Cluster/ClusterMethods.h"
#include "HttpServer/HttpServer.h"
#include "Indexes/EdgeIndex.h"
#include "Indexes/Index.h"
#include "Indexes/PrimaryIndex.h"
#include "Replication/InitialSyncer.h"
#include "Rest/HttpRequest.h"
#include "Rest/Version.h"
#include "Utils/CollectionGuard.h"
#include "Utils/CollectionKeys.h"
#include "Utils/CollectionKeysRepository.h"
@ -413,7 +414,7 @@ void RestReplicationHandler::handleCommandLoggerState() {
// "server" part
builder.add("server", VPackValue(VPackValueType::Object));
builder.add("version", VPackValue(TRI_VERSION));
builder.add("version", VPackValue(ARANGODB_VERSION));
builder.add("serverId", VPackValue(std::to_string(TRI_GetIdServer())));
builder.close();

2
arangod/RestHandler/RestVersionHandler.cpp
View File

@ -50,7 +50,7 @@ HttpHandler::status_t RestVersionHandler::execute() {
VPackBuilder result;
result.add(VPackValue(VPackValueType::Object));
result.add("server", VPackValue("arango"));
result.add("version", VPackValue(TRI_VERSION));
result.add("version", VPackValue(ARANGODB_VERSION));
bool found;
char const* detailsStr = _request->value("details", found);

2
arangod/RestServer/ArangoServer.cpp
View File

@ -1713,7 +1713,7 @@ int ArangoServer::startupServer() {
LOG(INFO) << "Authentication is turned off";
}
LOG(INFO) << "ArangoDB (version " << TRI_VERSION_FULL
LOG(INFO) << "ArangoDB (version " << ARANGODB_VERSION_FULL
<< ") is ready for business. Have fun!";
int res;

2
arangod/RestServer/WindowsServiceUtils.cpp
View File

@ -115,7 +115,7 @@ static void InstallServiceCommand(std::string command) {
}
SERVICE_DESCRIPTION description = {
"multi-model NoSQL database (version " TRI_VERSION ")"};
"multi-model NoSQL database (version " ARANGODB_VERSION ")"};
ChangeServiceConfig2(schService, SERVICE_CONFIG_DESCRIPTION, &description);
std::cout << "INFO: added service with command line '" << command << "'"

3
arangod/V8Server/v8-replication.cpp
View File

@ -24,6 +24,7 @@
#include "v8-replication.h"
#include "Basics/ReadLocker.h"
#include "Replication/InitialSyncer.h"
#include "Rest/Version.h"
#include "V8/v8-conv.h"
#include "V8/v8-globals.h"
#include "V8/v8-utils.h"
@ -64,7 +65,7 @@ static void JS_StateLoggerReplication(
result->Set(TRI_V8_ASCII_STRING("state"), state);
v8::Handle<v8::Object> server = v8::Object::New(isolate);
server->Set(TRI_V8_ASCII_STRING("version"), TRI_V8_ASCII_STRING(TRI_VERSION));
server->Set(TRI_V8_ASCII_STRING("version"), TRI_V8_ASCII_STRING(ARANGODB_VERSION));
server->Set(TRI_V8_ASCII_STRING("serverId"),
TRI_V8_STD_STRING(StringUtils::itoa(TRI_GetIdServer())));
result->Set(TRI_V8_ASCII_STRING("server"), server);

4
arangod/V8Server/v8-vocbase.cpp
View File

@ -22,6 +22,7 @@
////////////////////////////////////////////////////////////////////////////////
#include "v8-vocbaseprivate.h"
#include "Aql/Query.h"
#include "Aql/QueryCache.h"
#include "Aql/QueryList.h"
@ -40,6 +41,7 @@
#include "HttpServer/ApplicationEndpointServer.h"
#include "RestServer/ConsoleThread.h"
#include "RestServer/VocbaseContext.h"
#include "Rest/Version.h"
#include "V8/JSLoader.h"
#include "V8/v8-conv.h"
#include "V8/v8-utils.h"
@ -2894,7 +2896,7 @@ static void JS_VersionServer(v8::FunctionCallbackInfo<v8::Value> const& args) {
v8::Isolate* isolate = args.GetIsolate();
v8::HandleScope scope(isolate);
TRI_V8_RETURN(TRI_V8_ASCII_STRING(TRI_VERSION));
TRI_V8_RETURN(TRI_V8_ASCII_STRING(ARANGODB_VERSION));
}
////////////////////////////////////////////////////////////////////////////////

9
arangod/VocBase/replication-applier.cpp
View File

@ -22,8 +22,6 @@
////////////////////////////////////////////////////////////////////////////////
#include "replication-applier.h"
#include "Basics/conversions.h"
#include "Basics/files.h"
#include "Basics/FileUtils.h"
#include "Basics/Logger.h"
#include "Basics/ReadLocker.h"
@ -32,7 +30,12 @@
#include "Basics/tri-strings.h"
#include "Basics/VelocyPackHelper.h"
#include "Basics/WriteLocker.h"
#include "Basics/conversions.h"
#include "Basics/files.h"
#include "Basics/json.h"
#include "Basics/tri-strings.h"
#include "Replication/ContinuousSyncer.h"
#include "Rest/Version.h"
#include "VocBase/collection.h"
#include "VocBase/document-collection.h"
#include "VocBase/server.h"
@ -1270,7 +1273,7 @@ void TRI_replication_applier_t::toVelocyPack(VPackBuilder& builder) const {
// add server info
builder.add("server", VPackValue(VPackValueType::Object));
builder.add("version", VPackValue(TRI_VERSION));
builder.add("version", VPackValue(ARANGODB_VERSION));
builder.add("serverId", VPackValue(std::to_string(TRI_GetIdServer())));
builder.close(); // server

8
lib/Basics/Common.h
View File

@ -37,14 +37,6 @@
#include "Basics/operating-system.h"
#include "Basics/application-exit.h"
#include "Basics/build.h"
#ifdef _DEBUG
#define TRI_VERSION_FULL TRI_VERSION " [" TRI_PLATFORM "-DEBUG]"
#else
#define TRI_VERSION_FULL TRI_VERSION " [" TRI_PLATFORM "]"
#endif
#undef TRI_WITHIN_COMMON
#include <assert.h>

1
lib/Basics/build-date.h.in Normal file
View File

@ -0,0 +1 @@
#define ARANGODB_BUILD_DATE "@ARANGODB_BUILD_DATE@"

2
lib/Basics/build.h.in
View File

@ -1 +1 @@
#define TRI_VERSION "@ARANGODB_VERSION@"
#define ARANGODB_VERSION "@ARANGODB_VERSION@"

17
lib/Rest/Version.cpp
View File

@ -27,11 +27,6 @@
#include "Basics/win-utils.h"
#endif
#include "Basics/conversions.h"
#include "Basics/json.h"
#include "Basics/StringUtils.h"
#include "Basics/Utf8Helper.h"
#include <openssl/ssl.h>
#include <sstream>
@ -39,6 +34,12 @@
#include <velocypack/Version.h>
#include <velocypack/velocypack-aliases.h>
#include "Basics/StringUtils.h"
#include "Basics/Utf8Helper.h"
#include "Basics/build-date.h"
#include "Basics/conversions.h"
#include "Basics/json.h"
using namespace arangodb::rest;
////////////////////////////////////////////////////////////////////////////////
@ -93,7 +94,7 @@ void Version::initialize() {
////////////////////////////////////////////////////////////////////////////////
int32_t Version::getNumericServerVersion() {
char const* apiVersion = TRI_VERSION;
char const* apiVersion = ARANGODB_VERSION;
char const* p = apiVersion;
// read major version
@ -121,7 +122,7 @@ int32_t Version::getNumericServerVersion() {
/// @brief get server version
////////////////////////////////////////////////////////////////////////////////
std::string Version::getServerVersion() { return std::string(TRI_VERSION); }
std::string Version::getServerVersion() { return std::string(ARANGODB_VERSION); }
////////////////////////////////////////////////////////////////////////////////
/// @brief get BOOST version
@ -238,7 +239,7 @@ std::string Version::getBuildDate() {
std::string Version::getVerboseVersionString() {
std::ostringstream version;
version << "ArangoDB " << TRI_VERSION_FULL << " "
version << "ArangoDB " << ARANGODB_VERSION_FULL << " "
<< (sizeof(void*) == 4 ? "32" : "64") << "bit"
#ifdef ARANGODB_ENABLE_MAINTAINER_MODE
<< " maintainer mode"

8
lib/Rest/Version.h
View File

@ -26,6 +26,14 @@
#include "Basics/Common.h"
#include "Basics/build.h"
#ifdef _DEBUG
#define ARANGODB_VERSION_FULL ARANGODB_VERSION " [" TRI_PLATFORM "-DEBUG]"
#else
#define ARANGODB_VERSION_FULL ARANGODB_VERSION " [" TRI_PLATFORM "]"
#endif
struct TRI_json_t;
struct TRI_memory_zone_s;

3
lib/V8/v8-utils.cpp
View File

@ -46,6 +46,7 @@
#include "Basics/Utf8Helper.h"
#include "Rest/HttpRequest.h"
#include "Rest/SslInterface.h"
#include "Rest/Version.h"
#include "SimpleHttpClient/GeneralClientConnection.h"
#include "SimpleHttpClient/SimpleHttpClient.h"
#include "SimpleHttpClient/SimpleHttpResult.h"
@ -4303,7 +4304,7 @@ void TRI_InitV8Utils(v8::Isolate* isolate, v8::Handle<v8::Context> context,
isolate, context, TRI_V8_ASCII_STRING("COVERAGE"), v8::False(isolate));
#endif
TRI_AddGlobalVariableVocbase(isolate, context, TRI_V8_ASCII_STRING("VERSION"),
TRI_V8_ASCII_STRING(TRI_VERSION));
TRI_V8_ASCII_STRING(ARANGODB_VERSION));
TRI_AddGlobalVariableVocbase(isolate, context,
TRI_V8_ASCII_STRING("SYS_PLATFORM"),