From 85f6ae2a95ce918aabdcc87bedb70fe5059c2aad Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Fri, 11 Dec 2015 18:22:23 +0100 Subject: [PATCH] Multi -purpose- -> model --- CMakeLists.txt | 2 +- Documentation/Books/Users/FirstSteps/README.mdpp | 2 +- Documentation/Books/Users/Installing/Windows.mdpp | 4 ++-- GNUmakefile | 5 +++++ arangod/RestServer/WindowsServiceUtils.cpp | 4 ++-- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 784de0b138..6f20e291b2 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,7 @@ set(ARANGODB_DISPLAY_NAME "ArangoDB") set(ARANGODB_URL_INFO_ABOUT "http://www.arangodb.org") set(ARANGODB_CONTACT "hackers@arangodb.org") -set(ARANGODB_FRIENDLY_STRING "ArangoDB - the multi-purpose database") +set(ARANGODB_FRIENDLY_STRING "ArangoDB - the multi-model database") set(ARANGOB_FRIENDLY_STRING "ArangoBench - stresstester") set(ARANGO_DUMP_FRIENDLY_STRING "arangodump - export whole databases from ArangoDB to JSON") set(ARANGO_IMP_FRIENDLY_STRING "arangoimp - import CSV files into ArangoDB") diff --git a/Documentation/Books/Users/FirstSteps/README.mdpp b/Documentation/Books/Users/FirstSteps/README.mdpp index 33d9d9fb0e..74923685b1 100644 --- a/Documentation/Books/Users/FirstSteps/README.mdpp +++ b/Documentation/Books/Users/FirstSteps/README.mdpp @@ -3,7 +3,7 @@ For installation instructions, please refer to the [Installation Manual](../Installing/README.md). -As you know from the introduction ArangoDB is a multi-purpose open-source +As you know from the introduction ArangoDB is a multi-model open-source Database. You can see the Key features below or look directly at the programs in the ArangoDB package. diff --git a/Documentation/Books/Users/Installing/Windows.mdpp b/Documentation/Books/Users/Installing/Windows.mdpp index 48c5c9f018..1530a5d61d 100644 --- a/Documentation/Books/Users/Installing/Windows.mdpp +++ b/Documentation/Books/Users/Installing/Windows.mdpp @@ -29,7 +29,7 @@ a command line as administrator (search for *cmd* and right click *run as administrator*). cmd> arangod --install-service - INFO: adding service 'ArangoDB - the multi-purpose database' (internal 'ArangoDB') + INFO: adding service 'ArangoDB - the multi-model database' (internal 'ArangoDB') INFO: added service with command line '"C:\Program Files (x86)\ArangoDB 1.4.4\bin\arangod.exe" --start-service' Open the service manager and start ArangoDB. In order to enable logging @@ -142,4 +142,4 @@ method. Please note that ArangoDB uses UTF-8 as its internal encoding and that the system console must support a UTF-8 codepage (65001) and font. It may be -necessary to manually switch the console font to a font that supports UTF-8. \ No newline at end of file +necessary to manually switch the console font to a font that supports UTF-8. diff --git a/GNUmakefile b/GNUmakefile index b606f42a48..05e55dc57e 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -295,6 +295,11 @@ pack-deb-cmake: $(MOREOPTS) \ .. + ${MAKE} .libev-build-64 + ${MAKE} .zlib-build-64 + ${MAKE} .v8-build-64 + + ${MAKE} ${BUILT_SOURCES} ${MAKE} ${BUILT_SOURCES} rm -f ./.file-list-js diff --git a/arangod/RestServer/WindowsServiceUtils.cpp b/arangod/RestServer/WindowsServiceUtils.cpp index 65c89f3486..3c3e6d4d8c 100644 --- a/arangod/RestServer/WindowsServiceUtils.cpp +++ b/arangod/RestServer/WindowsServiceUtils.cpp @@ -71,7 +71,7 @@ static std::string ServiceName = "ArangoDB"; /// @brief Windows service name for the user. //////////////////////////////////////////////////////////////////////////////// -static std::string FriendlyServiceName = "ArangoDB - the multi-purpose database"; +static std::string FriendlyServiceName = "ArangoDB - the multi-model database"; //////////////////////////////////////////////////////////////////////////////// /// @brief service status handler @@ -120,7 +120,7 @@ static void InstallServiceCommand (std::string command) { exit(EXIT_FAILURE); } - SERVICE_DESCRIPTION description = { "multi-purpose NoSQL database (version " TRI_VERSION ")" }; + SERVICE_DESCRIPTION description = { "multi-model NoSQL database (version " TRI_VERSION ")" }; ChangeServiceConfig2(schService, SERVICE_CONFIG_DESCRIPTION, &description); std::cout << "INFO: added service with command line '" << command << "'" << std::endl;