moved build date to file build-date.h.in

CMakeLists.txt

@@ -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"

arangod/RestHandler/RestReplicationHandler.cpp

@@ -22,20 +22,27 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "RestReplicationHandler.h"
-#include "Basics/conversions.h"
+
-#include "Basics/files.h"
+#include <velocypack/Collection.h>
+#include <velocypack/Iterator.h>
+#include <velocypack/Parser.h>
+#include <velocypack/velocypack-aliases.h>
+
 #include "Basics/JsonHelper.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"
@@ -47,11 +54,6 @@
 #include "VocBase/update-policy.h"
 #include "Wal/LogfileManager.h"
 
-#include <velocypack/Collection.h>
-#include <velocypack/Iterator.h>
-#include <velocypack/Parser.h>
-#include <velocypack/velocypack-aliases.h>
-
 using namespace arangodb;
 using namespace arangodb::basics;
 using namespace arangodb::rest;
@@ -413,7 +415,7 @@ void RestReplicationHandler::handleCommandLoggerState() {
     char* serverIdString = TRI_StringUInt64(TRI_GetIdServer());
 
     json.add("server", VPackValue(VPackValueType::Object));
-    json.add("version", VPackValue(TRI_VERSION));
+    json.add("version", VPackValue(ARANGODB_VERSION));
     json.add("serverId", VPackValue(serverIdString));
     TRI_FreeString(TRI_CORE_MEM_ZONE, serverIdString);
     json.close();

arangod/RestHandler/RestVersionHandler.cpp

@@ -51,7 +51,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);

arangod/RestServer/ArangoServer.cpp

@@ -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;

arangod/RestServer/WindowsServiceUtils.cpp

@@ -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 << "'"

arangod/V8Server/v8-replication.cpp

@@ -22,7 +22,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "v8-replication.h"
+
 #include "Replication/InitialSyncer.h"
+#include "Rest/Version.h"
 #include "V8/v8-conv.h"
 #include "V8/v8-globals.h"
 #include "V8/v8-utils.h"
@@ -57,7 +59,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);

arangod/V8Server/v8-vocbase.cpp

@@ -22,6 +22,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "v8-vocbaseprivate.h"
+
 #include "Aql/Query.h"
 #include "Aql/QueryCache.h"
 #include "Aql/QueryList.h"
@@ -39,6 +40,7 @@
 #include "HttpServer/ApplicationEndpointServer.h"
 #include "RestServer/ConsoleThread.h"
 #include "RestServer/VocbaseContext.h"
+#include "Rest/Version.h"
 #include "Utils/transactions.h"
 #include "Utils/V8ResolverGuard.h"
 #include "V8/JSLoader.h"
@@ -2874,7 +2876,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));
 }
 
 ////////////////////////////////////////////////////////////////////////////////

arangod/VocBase/replication-applier.cpp

@@ -23,17 +23,18 @@
 
 #include "replication-applier.h"
 
-#include "Basics/conversions.h"
-#include "Basics/files.h"
-#include "Basics/json.h"
 #include "Basics/Logger.h"
 #include "Basics/ReadLocker.h"
 #include "Basics/ScopeGuard.h"
 #include "Basics/StringBuffer.h"
 #include "Basics/StringUtils.h"
-#include "Basics/tri-strings.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/datafile.h"
 #include "VocBase/document-collection.h"
@@ -1432,7 +1433,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
 

lib/Basics/Common.h

@@ -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>

lib/Basics/build-date.h.in

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

lib/Basics/build.h.in

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

lib/Rest/Version.cpp

@@ -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"

lib/Rest/Version.h

@@ -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;
 

lib/V8/v8-utils.cpp

@@ -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"
@@ -4307,7 +4308,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"),