1
0
Fork 0
Commit Graph

373 Commits

Author SHA1 Message Date
Frank Celler ae45b7cd67 MSVC fixes 2016-03-31 17:16:37 +02:00
Frank Celler 119c1bd44b Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-03-31 09:31:32 +02:00
Andreas Streichardt d0f58ffac3 Fix python executable 2016-03-30 14:19:48 +02:00
Frank Celler 9095e57fb3 fixed tcmalloc test 2016-03-28 22:08:28 +02:00
Jan Steemann eddc92a228 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-24 19:35:23 +01:00
Andreas Streichardt 11e7808641 Hopefully fix unittest boost fun 2016-03-24 19:01:34 +01:00
Jan Steemann f670a07046 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 19:01:19 +01:00
Andreas Streichardt fb76cc4529 fix python 2016-03-23 18:25:41 +01:00
Kaveh Vahedipour 7746fbfe82 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-23 17:19:56 +01:00
Jan Steemann 7ae7b18d25 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 17:09:49 +01:00
Frank Celler 212a1e7813 fixed buffer overflow 2016-03-23 16:41:22 +01:00
Jan Steemann 9ac39b7ad6 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 16:36:30 +01:00
Kaveh Vahedipour 7254ad4c9e Fixing issues 2016-03-23 15:16:47 +01:00
Kaveh Vahedipour 4a86d26f19 need to find out how to define the headers properly 2016-03-21 18:23:14 +01:00
Kaveh Vahedipour 2583c00859 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-21 10:41:15 +01:00
Jan Steemann f17d17841f Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-21 09:28:35 +01:00
Frank Celler 2dd1f1ce1f cache deployment target 2016-03-20 13:59:47 +01:00
Frank Celler 949ec7074b set deployment target 2016-03-20 13:51:45 +01:00
Frank Celler 9a8678f712 no rt on darwin 2016-03-20 13:01:03 +01:00
Frank Celler 019c95a777 added rt 2016-03-20 08:45:49 +00:00
jsteemann 3759c19886 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-18 16:52:59 +01:00
Frank Celler f1aabef0fe removed /LTCG 2016-03-18 16:29:51 +01:00
Kaveh Vahedipour 7355cde795 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-16 16:27:53 +01:00
jsteemann d6709de403 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-16 12:12:19 +01:00
Frank Celler 174b0d661c changed to 3.0.x-devel 2016-03-16 10:50:52 +01:00
jsteemann 0361c2e72b Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-16 00:13:58 +01:00
jsteemann 6204de9ed9 always link against libresolv 2016-03-16 00:13:30 +01:00
jsteemann 2ceecda5f7 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-15 23:44:42 +01:00
Frank Celler d64bf2dc95 added srv:// endpoint 2016-03-15 23:25:07 +01:00
Kaveh Vahedipour 61a55d61db Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-10 17:37:43 +01:00
Jan Steemann b393c3d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:10 +01:00
Frank Celler dfa9047484 switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
Kaveh Vahedipour df56885c09 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-07 17:38:38 +01:00
Jan Steemann 9f84b767d1 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-07 08:11:01 +01:00
Frank Celler b1899e9b31 made BASE flags cachable 2016-03-05 17:13:48 +01:00
Frank Celler 60cd363f19 moved build date to file build-date.h.in 2016-03-05 09:49:31 +01:00
Jan Steemann b965cb5e6e Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-04 20:58:06 +01:00
Andreas Streichardt 68277a734b Python is required for V8 2016-03-04 18:10:38 +01:00
Kaveh Vahedipour 89ce4ac10a Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-03 18:50:40 +01:00
Jan Steemann 4e0328d46f Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-03 17:59:27 +01:00
Kaveh Vahedipour 2046a704e0 notifyall 2016-03-03 14:24:23 +01:00
Wilfried Goesgens 25f6311972 Add visual studio user setting file, so we don't need to configure the debugger options each time. 2016-03-02 16:20:15 +01:00
Wilfried Goesgens f5d14029c8 Merge branch 'devel' of github.com:arangodb/ArangoDB into solaris 2016-03-02 15:36:25 +01:00
Jan Steemann 1ca358bde8 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 15:21:37 +01:00
Frank Celler 9342b0bab9 be verbose 2016-03-02 14:08:18 +01:00
Frank Celler c719beccc4 added BASE_LD_FLAGS and BASE_LIBS 2016-03-02 12:45:04 +01:00
Wilfried Goesgens f1a2f5e393 Styleguide cleanups as cmakelinter hints 2016-03-02 11:45:55 +01:00
Jan Steemann 92493f2807 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 11:04:58 +01:00
Frank Celler c8b5ea0129 added -Wno-unused-parameter 2016-03-01 17:50:40 +01:00
Frank Celler c88a68358d CMAKE changes for Windows and Solaris 2016-03-01 17:31:30 +01:00
Kaveh Vahedipour 4435236e91 property_map 2016-03-01 08:52:20 +01:00
Kaveh Vahedipour 0ac54c3300 agency on 2016-02-26 17:44:14 +01:00
Jan Steemann 68461e6f74 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-26 11:00:25 +01:00
Frank Celler e2f5a8a8c3 added USE_OPENSSL_NO_SSL2 2016-02-26 10:50:03 +01:00
Jan Steemann c0fd3b13ca Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-26 10:19:17 +01:00
Michael Hackstein 421df55e89 fixed tests 2016-02-26 09:34:56 +01:00
Kaveh Vahedipour efb0a16988 Unit tests only in maintainer mode 2016-02-26 09:33:05 +01:00
Kaveh Vahedipour 34976d462f agency on 2016-02-26 09:31:05 +01:00
Frank Celler ca7651cc8d added all tools 2016-02-25 20:29:02 +01:00
Frank Celler 52ac7742d5 removed lib again 2016-02-25 20:26:33 +01:00
Frank Celler e02b6f99cd added lib for documentation 2016-02-25 20:25:15 +01:00
Frank Celler 3568d10bd3 added dependencies for tests 2016-02-25 20:23:42 +01:00
Frank Celler e57a077c1b added dependencies 2016-02-25 20:21:04 +01:00
Frank Celler 874ae123f6 added some help tests 2016-02-25 19:13:42 +01:00
Frank Celler 06256947fa splitted into 3rd libs 2016-02-25 18:51:17 +01:00
Frank Celler b1a56dd59c moved BOOST to its own CMakeLists.txt 2016-02-25 18:51:17 +01:00
Jan Steemann 3e82064770 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 14:59:08 +01:00
AutoBuilder df1c591f51 Merge branch 'solaris' of https://github.com/arangodb/arangodb into solaris 2016-02-25 14:26:16 +01:00
AutoBuilder 325a045fef added link flags 2016-02-25 14:26:12 +01:00
Frank Celler 1cd53c20a1 added generateMimetypes and generateErrorfiles 2016-02-25 13:14:06 +01:00
Frank Celler cb6f4c024b fixed boost unittests test 2016-02-24 23:43:07 +01:00
Frank Celler 554cf0594a changed order of V8 and ICU 2016-02-24 23:17:24 +01:00
Frank Celler 8c632cae24 Merge branch 'solaris' of github.com:arangodb/arangodb into solaris
Conflicts:
	CMakeLists.txt
2016-02-24 22:41:00 +01:00
Frank Celler 42dbf45264 fixed libs 2016-02-24 22:40:31 +01:00
Frank Celler ea44c604b6 fixed boost 2016-02-24 22:39:53 +01:00
Frank Celler 22d0f3049b added boost link test 2016-02-24 21:04:42 +01:00
Frank Celler 0ef991de91 removed debug output 2016-02-24 20:35:50 +01:00
Frank Celler da7955e417 Merge branch 'devel' of github.com:arangodb/arangodb into solaris 2016-02-24 19:29:01 +01:00
Frank Celler 4b2b85f1b5 more cleanup 2016-02-24 19:19:04 +01:00
Wilfried Goesgens 0bf90a712a Add version, and way to detect local boost. 2016-02-24 14:04:19 +01:00
Frank Celler 43be85e72b more cleanup 2016-02-24 10:30:30 +01:00
jsteemann d6fcbb0299 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-23 21:51:12 +01:00
jsteemann 47b684a75a fixed maintainer mode 2016-02-23 21:49:57 +01:00
jsteemann 0c5e11dca9 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-23 21:34:11 +01:00
Frank Celler 48e39567fc fixed man page generation 2016-02-23 21:28:14 +01:00
Frank Celler fed3dee2fa more cleanup 2016-02-23 20:36:33 +01:00
Frank Celler 0f1a8e66d5 removed old cpp files 2016-02-23 15:28:32 +01:00
Frank Celler 9fca3425a1 cleanup 2016-02-23 15:28:31 +01:00
Frank Celler 0639e688f5 added FLEX and BISON 2016-02-23 15:27:34 +01:00
Frank Celler 5b0d9e2ef6 cleanup of unsed variables 2016-02-23 15:25:06 +01:00
Wilfried Goesgens 2968cc81da Finalize work on solaris with static library linking. 2016-02-23 14:28:27 +01:00
Jan Steemann 70d44f06fa Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-23 13:22:46 +01:00
Frank Celler 97e80b848e added FLEX and BISON 2016-02-23 12:26:10 +01:00
Wilfried Goesgens 8632080bdc - remove rasbian stuff
- make solaris link stattic using the csw linker
 - cleanup V8 & ICU include & libraries.
2016-02-23 11:23:51 +01:00
Wilfried Goesgens 0a0aa11b42 re-add Z & EV to the library directories. 2016-02-22 13:52:52 +01:00
Frank Celler 21c6e94cfb included libev and zlib as project 2016-02-22 09:57:44 +01:00
Frank Celler bec68b7427 added libev_INCLUDE_DIR 2016-02-20 17:18:39 +01:00
Frank Celler 0643923f4a Merge branch 'solaris' of github.com:arangodb/arangodb into solaris 2016-02-20 13:06:44 +01:00
Frank Celler 5365c39f8f added current build to for include 2016-02-20 12:55:29 +01:00
Wilfried Goesgens 0f548c92d5 Remove directory part that comes from the variable. 2016-02-19 18:52:04 +01:00
Wilfried Goesgens 9a5cf6dfb4 Export directories with the icu & v8 libraries into the calling scope 2016-02-19 18:35:15 +01:00
Wilfried Goesgens 8608fae2d1 Move stuff around
- properly calculate ICU
 - propagate PYTHON_EXECUTABLE into the make file for V8
2016-02-19 17:57:45 +01:00
Wilfried Goesgens 4a9dc3cbd4 More solaris compatibility 2016-02-19 15:52:32 +01:00
Wilfried Goesgens 9907c4e4a6 More forcing of the compiler on solaris; fix V8 location for arangodb build. 2016-02-19 14:47:27 +01:00
Jan Steemann e4fb8b184b Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-19 12:51:52 +01:00
Wilfried Goesgens 0700ccc847 start to use gyp directly from cmake; add 64 bits detection; remove old arm stuff. 2016-02-19 12:46:28 +01:00
Frank Celler 417db335ab removed old files 2016-02-19 12:26:26 +01:00
Jan Steemann 8b8101fc59 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-19 11:44:06 +01:00
Max Neunhoeffer ac7a3e6d6a Switch off assembler CRC32 on Windows by default. 2016-02-19 10:59:13 +01:00
Kaveh Vahedipour db9d23b7ef Adapting to intel compiler 15.0 2016-02-18 23:26:45 +01:00
Jan Steemann 22fa100657 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-18 17:54:51 +01:00
Kaveh Vahedipour 541aefdd2e Reestablished love 2016-02-18 17:32:35 +01:00
Jan Steemann 433cd14d7e Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-18 14:44:05 +01:00
Frank Celler ad38238da7 added swagger, USE_FAILURE_TESTS, ARANGODB_VERSION 2016-02-18 14:02:39 +01:00
Max Neunhoeffer 2ef2ec7292 Add assembler optimized CRC version.
Compile in only if architecture is x86_64 and no user override.
If compiled in, use runtime detection of SSE4.2 extensions using
the CPUID intrinsic.
2016-02-17 23:17:23 +01:00
Max Neunhoeffer d0dc195949 Take out a debug message. 2016-02-17 14:45:06 +01:00
Kaveh Vahedipour c4c7bfbd5b Checking for architecture. Providing include (TargetArch) 2016-02-17 13:21:03 +00:00
Kaveh Vahedipour 360a24f65d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-17 09:22:11 +00:00
Kaveh Vahedipour d5ba21ff61 Build of etcd should only be attempted, when Go is found >= 1.2 2016-02-17 09:22:07 +00:00
Kaveh Vahedipour 411ef9185c Fxing for Release and Debug build types 2016-02-16 23:16:28 +01:00
Kaveh Vahedipour 112ac719f5 Fxing for Release and Debug build types 2016-02-16 23:09:00 +01:00
Frank Celler b4286a66fc added USE_FAILURE_TESTS 2016-02-16 16:30:59 +01:00
Kaveh Vahedipour 2955f33006 Checking C++11 features. 2016-02-12 17:43:45 +00:00
Kaveh Vahedipour f313c7120d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-12 17:08:13 +00:00
Jan Steemann 13cceddbcc removed linenoise option 2016-02-12 18:07:42 +01:00
Kaveh Vahedipour 8ac5ccfdff Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-12 17:06:03 +00:00
Kaveh Vahedipour ce9ec76199 ENABLE_RELATIVE 2016-02-12 17:05:43 +00:00
Kaveh Vahedipour 5d3fe9afe6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-12 15:53:11 +01:00
Kaveh Vahedipour c3212f2d5d added support for detection of cpu_family 6 model 61 2016-02-12 15:33:53 +01:00
Kaveh Vahedipour 05ef0d2711 linenoise library should be automatically included 2016-02-12 12:44:05 +00:00
Kaveh Vahedipour 8607d8bbe4 icu dependencies of tests 2016-02-12 13:09:03 +01:00
Kaveh Vahedipour 068386338a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-12 11:13:33 +01:00
Kaveh Vahedipour b61e6c8f64 Checking for compiler features 2016-02-12 11:13:24 +01:00
Kaveh Vahedipour 409d03a850 Finding tcmalloc 2016-02-11 17:49:55 +00:00
Kaveh Vahedipour f2ee7c0d0b OpenSSL > 1.1.0 ends support of SSLv2 2016-02-11 18:20:41 +01:00
Andreas Streichardt f14bf5496f Check for a specific python version, so v8 is building 2016-02-11 14:21:55 +01:00
Kaveh Vahedipour 9db6089ec5 Testing need for static linking of OPENSSL 2016-02-09 10:22:10 +01:00
Kaveh Vahedipour c6c121e59b Mild optimisation and CMAKE_MAKE_PROGRAM for V8 build rather than 'make' 2016-02-09 10:13:45 +01:00
Kaveh Vahedipour 1a368e1ce3 Back to OSX for tests 2016-02-08 22:30:11 +01:00
Kaveh Vahedipour c9d4d5fd32 Linux V8/ICU are in deeper directories 2016-02-08 17:32:21 +00:00
Kaveh Vahedipour 9d65e68998 First successful OSX build 2016-02-08 18:02:43 +01:00
Kaveh Vahedipour c626ecc59b First successful OSX build 2016-02-08 16:17:10 +01:00
Kaveh Vahedipour 0a068ed86a OpenSSL check on OSX finds shipped 0.98. We need better than that. 2016-02-01 15:41:08 +01:00
Kaveh Vahedipour 6194a83437 making progress building unix versions 2016-02-01 13:06:06 +00:00
Jan Christoph Uhde 03409a84cc fix icu related linking issues 2016-01-31 23:06:24 +01:00
Kaveh Vahedipour 3f39a10bf8 Integrated obiwahn contributions 2016-01-25 13:46:44 +01:00
Jan Christoph Uhde 1a44d102ed add v8 and icu as imported targets 2016-01-23 15:06:33 +01:00
Kaveh Vahedipour 5662bf012e Building on OSX 2016-01-21 15:42:54 +01:00
Kaveh Vahedipour 5679410317 Building on OSX 2016-01-21 15:17:43 +01:00
Jan Christoph Uhde 553d02a011 add option for system provided libs 2016-01-15 17:41:13 +01:00