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

simplify build.h

This commit is contained in:
Jan Steemann 2013-08-28 22:20:06 +02:00
parent 40335a1506
commit 860ed964c3
10 changed files with 12 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.am
View File

@ -279,12 +279,7 @@ install-data-local:
################################################################################
build.h: configure.ac
@echo '#ifdef _DEBUG' > build.h
@echo '#define TRI_VERSION "@PACKAGE_VERSION@ [" TRI_PLATFORM "-DEBUG]"' >> build.h
@echo '#else' >> build.h
@echo '#define TRI_VERSION "@PACKAGE_VERSION@ [" TRI_PLATFORM "]"' >> build.h
@echo '#endif' >> build.h
@echo '' >> build.h
@echo '#define TRI_VERSION "@PACKAGE_VERSION@"' > build.h
################################################################################
### @brief source files

2
arangod/RestServer/ArangoServer.cpp
View File

@ -659,7 +659,7 @@ int ArangoServer::startupServer () {
LOGGER_FATAL_AND_EXIT("could not load required authentication information");
}
LOGGER_INFO("ArangoDB (version " << TRI_VERSION << ") is ready for business. Have fun!");
LOGGER_INFO("ArangoDB (version " TRI_VERSION_FULL ") is ready for business. Have fun!");
_applicationServer->wait();

2
arangoirb/MRClient/arangoirb.cpp
View File

@ -380,7 +380,7 @@ int main (int argc, char* argv[]) {
printf("%s \\__,_|_| \\__,_|_| |_|\\__, |\\___/%s|_|_| |_.__/ %s\n", g, r, z);
printf("%s |___/ %s %s\n", g, r, z);
cout << endl << "Welcome to arangosh " << TRI_VERSION << ". Copyright (c) 2012 triAGENS GmbH" << endl;
cout << endl << "Welcome to arangosh " << TRI_VERSION_FULL << ". Copyright (c) 2012 triAGENS GmbH" << endl;
#ifdef TRI_V8_VERSION
cout << "Using MRUBY " << TRI_MRUBY_VERSION << " engine. Copyright (c) 2012 mruby developers." << endl;

2
arangosh/V8Client/arangosh.cpp
View File

@ -1754,7 +1754,7 @@ int main (int argc, char* argv[]) {
#endif
cout << endl << "Welcome to arangosh " << TRI_VERSION << ". Copyright (c) triAGENS GmbH" << endl;
cout << endl << "Welcome to arangosh " << TRI_VERSION_FULL << ". Copyright (c) triAGENS GmbH" << endl;
ostringstream info;

7
build.h
View File

@ -1,6 +1 @@
#ifdef _DEBUG
#define TRI_VERSION "1.4.devel [" TRI_PLATFORM "-DEBUG]"
#else
#define TRI_VERSION "1.4.devel [" TRI_PLATFORM "]"
#endif
#define TRI_VERSION "1.4.devel"

2
lib/ApplicationServer/ApplicationServer.cpp
View File

@ -570,8 +570,6 @@ void ApplicationServer::prepare2 () {
////////////////////////////////////////////////////////////////////////////////
void ApplicationServer::start () {
LOGGER_DEBUG("ApplicationServer version " << TRI_VERSION);
#ifdef TRI_HAVE_POSIX_THREADS
sigset_t all;
sigfillset(&all);

3
lib/Basics/InitialiseBasics.cpp
View File

@ -52,9 +52,6 @@ namespace triagens {
random.random();
Random::selectVersion(v);
string revision = "$Revision: BASICS " TRI_VERSION " (c) triAGENS GmbH $";
LOGGER_TRACE(revision);
#ifdef TRI_BROKEN_CXA_GUARD
pthread_cond_t cond;
pthread_cond_init(&cond, 0);

7
lib/BasicsC/common.h
View File

@ -43,6 +43,13 @@
#include "BasicsC/application-exit.h"
#include "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
////////////////////////////////////////////////////////////////////////////////

2
lib/BasicsC/init.c
View File

@ -61,8 +61,6 @@ void TRI_InitialiseC (int argc, char* argv[]) {
TRI_InitialiseRandom();
TRI_InitialiseProcess(argc, argv);
TRI_InitialiseSockets();
LOG_TRACE("%s", "$Revision: BASICS-C " TRI_VERSION " (c) triAGENS GmbH $");
}
////////////////////////////////////////////////////////////////////////////////

13
lib/Rest/InitialiseRest.cpp
View File

@ -119,24 +119,11 @@ namespace triagens {
TRI_InitialiseUrl();
TRI_InitialiseStatistics();
string revision = "$Revision: REST " TRI_VERSION " (c) triAGENS GmbH $";
LOGGER_TRACE(revision);
SSL_library_init();
SSL_load_error_strings();
OpenSSL_add_all_algorithms();
ERR_load_crypto_strings();
#ifdef TRI_OPENSSL_VERSION
revision = "$Revision: OPENSSL " TRI_OPENSSL_VERSION " $";
LOGGER_TRACE(revision);
#endif
#ifdef TRI_LIBEV_VERSION
revision = "$Revision: LIBEV " TRI_LIBEV_VERSION " $";
LOGGER_TRACE(revision);
#endif
#ifdef TRI_HAVE_POSIX_THREADS
opensslSetup();
#endif