1
0
Fork 0
Commit Graph

88 Commits

Author SHA1 Message Date
Willi Goesgens 5e1720132f Stacktraces & asserts for windows too. 2015-01-30 16:46:56 +01:00
Willi Goesgens dabd986fcc Add trailing slash for safety. 2015-01-21 09:35:51 +01:00
Willi Goesgens 7d883f5e9e Add posibility to build relative-enabled binaries with cmake too. 2015-01-19 19:40:04 +01:00
Willi Goesgens b1f881254d Upgrade V8 to 3.31.74.1 2015-01-19 19:29:31 +01:00
Frank Celler ec6f2a41ae fixed destination path 2014-12-26 11:42:34 +01:00
Frank Celler 60510f7431 copy icudtl.dat 2014-12-26 10:58:19 +01:00
Frank Celler 013671527e fixed paths 2014-12-24 12:51:20 +01:00
Frank Celler 02252575d5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-12-24 10:59:38 +01:00
Frank Celler 06e09f607e fixed version info for cmake 2014-12-24 10:59:33 +01:00
Frank Celler 44e23d8e4f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-24 10:58:25 +01:00
Frank Celler 7bb196abfe fixed libraries 2014-12-24 10:56:14 +01:00
Frank Celler 2d92e15497 removed TRI_ICU_VERSION 2014-12-24 09:01:36 +01:00
Frank Celler c0377c7bde fixed pathes 2014-12-24 08:26:54 +01:00
Frank Celler 28bcbce68b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-24 00:39:36 +01:00
Frank Celler 2e4af7e46a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-24 00:30:45 +01:00
Frank Celler 67bfa2901e windows adjustments 2014-12-24 00:30:29 +01:00
Frank Celler 331314be97 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-23 23:44:24 +01:00
Frank Celler f34aabe87a removed all-in-one, fixed path 2014-12-23 23:44:08 +01:00
Frank Celler 8b1d2830d7 added -DTRI_FORCE_ARMV6 for raspberry 2014-12-23 17:24:57 +01:00
Frank Celler 26b6885a86 fixed MacOSX 2014-12-19 09:51:05 +01:00
Willi Goesgens 1c4a72b106 The Big V8 upgrade Merge. 2014-12-15 17:30:56 +01:00
Frank Celler 3ac1d0b336 fixed issue 1028: libicu is now statically linked
Conflicts:
	CHANGELOG
2014-10-15 22:22:59 +02:00
Jan Steemann ad1feb0ed4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-04 14:30:28 +02:00
Frank Celler bc14c0ce46 moved install files to obs 2014-06-04 12:23:25 +02:00
Max Neunhoeffer d70353fce0 Add usage of libdl for arangob in CMakeLists.txt under Linux. 2014-05-22 11:37:08 +02:00
Jan Steemann 14813638dd removed boost 2014-05-12 17:22:42 +02:00
Achim Brandt 92d525994e added c++11 for gcc and apple 2014-04-25 14:00:16 +02:00
Esteban Lombeyda ca24738abe WARNING LNK4099 is ignored 2014-03-27 16:05:24 +01:00
Frank Celler f053670ecc fixed install for etcd 2014-03-20 12:01:43 +01:00
Esteban Lombeyda e9a847ef37 Bug Fix: correct path for icons 2014-03-14 09:31:56 +01:00
Frank Celler 0684d0bda4 added vista locks
Conflicts:
	GNUmakefile
	lib/BasicsC/locks-win32.c
	lib/BasicsC/locks-win32.h
2014-03-05 14:22:27 +01:00
Frank Celler b888e8cfa6 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding
Conflicts:
	arangod/V8Server/V8PeriodicJob.cpp
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/collection.json
	js/apps/system/aardvark/api-docs/cursor.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/document.json
	js/apps/system/aardvark/api-docs/edge.json
	js/apps/system/aardvark/api-docs/edges.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/graph.json
	js/apps/system/aardvark/api-docs/index.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/simple.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/api-docs/traversal.json
2014-02-28 20:37:05 +01:00
Esteban Lombeyda 05daddaf1d only arango icons are exported in to installation directory
SimpleService Plugin was copied in to project directory in order to allow
an automatic build of arango under windows
2014-02-28 18:27:53 +01:00
Esteban Lombeyda 867ca86dac Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	CMakeLists.txt
2014-02-28 10:28:22 +01:00
Esteban Lombeyda bd15248198 using paths correct paths, starting as service 2014-02-25 16:50:47 +01:00
Max Neunhoeffer cc75da03dd Get rid of switch --enable-cluster.
Always compile with TRI_ENABLE_CLUSTER enabled.
2014-02-25 12:46:10 +01:00
Frank Celler 066abd777c Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding
Conflicts:
	js/apps/system/aardvark/frontend/js/routers/router.js
2014-02-19 10:21:00 +01:00
Frank Celler da7d64bba9 removed wow6432 hack 2014-02-19 10:13:30 +01:00
Heiko Kernbach b69fad0381 merge origin/devel 2014-02-18 14:29:44 +01:00
Esteban Lombeyda bd83372050 Bug Fixes: RegKey are written into correct Directories
Default Directories are correct displayed
2014-02-18 13:14:57 +01:00
Michael Hackstein 015ab56259 Merge remote-tracking branch 'origin/devel' into sharding
Conflicts:
	arangod/VocBase/document-collection.c
	arangosh/CMakeLists.txt
	js/apps/system/aardvark/test/karma/karma.conf.js
2014-02-18 08:50:27 +01:00
Frank Celler 73f2be8a33 removed check-server 2014-02-15 23:34:24 +01:00
Frank Celler 65d7d8fdab Merge remote-tracking branch 'origin/devel' into sharding 2014-02-14 17:23:33 +01:00
Esteban Lombeyda e958f6052a Icon Bug fix 2014-02-14 15:12:12 +01:00
Jan Steemann e9c5af7895 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsView.css
	js/apps/system/aardvark/frontend/css/layout.css
	js/apps/system/aardvark/frontend/js/routers/router.js
2014-01-30 19:40:21 +01:00
Esteban Lombeyda bc27084a2d Inserting arango executables into start menu (windows) 2014-01-29 16:04:04 +01:00
Jan Steemann e906f68235 windows fixes 2014-01-27 17:46:15 +01:00
Frank Celler f56ac27dc9 Merge remote-tracking branch 'origin/1.4' into devel
Conflicts:
	CHANGELOG
	CMakeLists.txt
	GNUmakefile
	Makefile.in
	VERSION
	arangod/V8Server/ApplicationV8.cpp
	build.h
	configure
	configure.ac
	js/actions/api-foxx.js
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/collection.json
	js/apps/system/aardvark/api-docs/cursor.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/document.json
	js/apps/system/aardvark/api-docs/edge.json
	js/apps/system/aardvark/api-docs/edges.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/graph.json
	js/apps/system/aardvark/api-docs/index.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/simple.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/api-docs/traversal.json
	lib/BasicsC/locks-win32.c
2014-01-16 08:53:31 +01:00
Frank Celler c890caf260 fixed typos in windows parts 2014-01-16 08:40:36 +01:00
Frank Celler 94d6523b87 precompiled libs 2014-01-03 16:20:20 +01:00