From 49c43c99be9cb489623a9510842d446b41a05c7f Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Wed, 4 Jan 2012 12:03:14 +0100 Subject: [PATCH 1/3] renamed --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index c4ed3de83e..a7a0ca07ef 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ BUILT_SOURCES = LIBS = noinst_LIBRARIES = libavocadodb.a -bin_PROGRAMS = avocadodb +bin_PROGRAMS = avocado ################################################################################ ## avocado From cb239cb0ff1ad80640172be635d978e09f0ddd7b Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Wed, 4 Jan 2012 12:10:44 +0100 Subject: [PATCH 2/3] ignore build --- .gitignore | 2 ++ build.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1f8f9c813b..369352f7d8 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,5 @@ V8/v8-json.cpp BasicsC/stamp-h1 avocadodb libavocadodb.a +build.c +build.info diff --git a/build.h b/build.h index 17d389ce53..f7975b44bc 100644 --- a/build.h +++ b/build.h @@ -1 +1 @@ -#define TRIAGENS_VERSION "0.0.8 [1100M]" +#define TRIAGENS_VERSION "0.0.8 [1101:1102M]" From 5f8b2f8276a007878f1e6f784b43d0add60f80c6 Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Wed, 4 Jan 2012 12:11:45 +0100 Subject: [PATCH 3/3] fixed --- BasicsC/local-configuration.h.in | 150 +++++++++++++------------------ 1 file changed, 61 insertions(+), 89 deletions(-) diff --git a/BasicsC/local-configuration.h.in b/BasicsC/local-configuration.h.in index e809674aa2..a777f584fb 100644 --- a/BasicsC/local-configuration.h.in +++ b/BasicsC/local-configuration.h.in @@ -1,105 +1,77 @@ -/* BasicsC/local-configuration.h.in. Generated from configure.ac by autoheader. */ +//////////////////////////////////////////////////////////////////////////////// +/// @brief High-Performance Database Framework made by triagens +/// +/// @file +/// +/// DISCLAIMER +/// +/// Copyright 2004-2012 triagens GmbH, Cologne, Germany +/// +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at +/// +/// http://www.apache.org/licenses/LICENSE-2.0 +/// +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. +/// +/// Copyright holder is triAGENS GmbH, Cologne, Germany +/// +/// @author Dr. Frank Celler +/// @author Copyright 2011-2012, triAGENS GmbH, Cologne, Germany +//////////////////////////////////////////////////////////////////////////////// -/* static programs have broken cxa_guard */ -#undef BROKEN_CXA_GUARD +#ifndef TRIAGENS_BASICS_CONFIGURATION_H +#define TRIAGENS_BASICS_CONFIGURATION_H 1 -/* define if the Boost library is available */ -#undef HAVE_BOOST +#ifndef TRI_WITHIN_COMMON +#error use +#endif -/* Define to 1 if you have the header file. */ -#undef HAVE_EV_H +// ----------------------------------------------------------------------------- +// --SECTION-- Special Configuration Options +// ----------------------------------------------------------------------------- -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H +//////////////////////////////////////////////////////////////////////////////// +/// @addtogroup Configuration +/// @{ +//////////////////////////////////////////////////////////////////////////////// -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H +//////////////////////////////////////////////////////////////////////////////// +/// @brief enable calculation of timing figures +//////////////////////////////////////////////////////////////////////////////// -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_SSL_H - -/* Define if you have POSIX threads libraries and header files. */ -#undef HAVE_PTHREAD - -/* Define to 1 if you have the header file. */ -#undef HAVE_READLINE_READLINE_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - -/* true if SSLv23_method return SSL_METHOD const* */ -#undef OPENSSL_NEEDS_CONST - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#undef PACKAGE_URL - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define to necessary symbol if this constant uses a non-standard name on - your system. */ -#undef PTHREAD_CREATE_JOINABLE - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* true if figures are enabled */ #undef TRI_ENABLE_FIGURES -/* true if logging is enabled */ +//////////////////////////////////////////////////////////////////////////////// +/// @brief enable logging +//////////////////////////////////////////////////////////////////////////////// + #undef TRI_ENABLE_LOGGER -/* true if timing is enabled */ +//////////////////////////////////////////////////////////////////////////////// +/// @brief enable logging of timings +//////////////////////////////////////////////////////////////////////////////// + #undef TRI_ENABLE_LOGGER_TIMING -/* true if timing is enabled */ +//////////////////////////////////////////////////////////////////////////////// +/// @brief enable timings +//////////////////////////////////////////////////////////////////////////////// + #undef TRI_ENABLE_TIMING -/* Version number of package */ -#undef VERSION +//////////////////////////////////////////////////////////////////////////////// +/// @} +//////////////////////////////////////////////////////////////////////////////// -/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a - `char[]'. */ -#undef YYTEXT_POINTER +#endif -/* Number of bits in a file offset, on hosts where this is settable. */ -#undef _FILE_OFFSET_BITS - -/* Define for large files, on AIX-style hosts. */ -#undef _LARGE_FILES +// Local Variables: +// mode: outline-minor +// outline-regexp: "^\\(/// @brief\\|/// {@inheritDoc}\\|/// @addtogroup\\|// --SECTION--\\|/// @\\}\\)" +// End: