arangodb · moonglum · Oct 8, 2013 · Oct 8, 2013 · Oct 8, 2013 · Oct 8, 2013
diff --git a/.gitignore b/.gitignore
@@ -5,10 +5,18 @@ mr-*.h
 *.o
 *.a
 *~
+*.pyc
+*.sdf
+*.suo
+
+
+*.orig
+*.rej
 
 .libev-build-64
 .v8-build-64
 .icu-build-64
+.idea
 .mruby-build-64
 .zlib-build-64
 .libev-build-32
@@ -48,12 +56,14 @@ config/stamp-h1
 configure
 core
 TAGS
+tags
 
 Doxygen/*.doxy
 Doxygen/html/
 Doxygen/latex/
 Doxygen/js/
 Documentation/arango.template
+Documentation/Examples/*.generated
 UnitTests/HttpInterface/logs/
 UnitTests/basics_suite
 UnitTests/geo_suite
@@ -62,9 +72,13 @@ arangod/Ahuacatl/ahuacatl-grammar.h
 arangod/Ahuacatl/ahuacatl-grammar.output
 arangod/Ahuacatl/ahuacatl-tokens.c
 bin/
+etc/arangodb/arangob.conf
 etc/arangodb/arangod-uid.conf
 etc/arangodb/arangod.conf
+etc/arangodb/arangodump.conf
+etc/arangodb/arangoimp.conf
 etc/arangodb/arangoirb.conf
+etc/arangodb/arangorestore.conf
 etc/arangodb/arangosh.conf
 js/common/bootstrap/errors.js
 lib/BasicsC/local-configuration.h
@@ -77,10 +91,11 @@ lib/V8/v8-json.cpp
 cppcheck.log
 cppcheck.tmp
 
-Installation/arangod.conf
 Installation/epm/arangodb.sublist
+Installation/MacOSX/Bundle/Info.plist
 nbproject/
 
-html/admin/api-docs/
-!html/admin/api-docs/api-docs.json
 test.cpp.txt
+
+js/apps/*
+!js/apps/system/aardvark
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,12 @@
 language: c
-before_script: "bash -c 'cd UnitTests/HttpInterface && bundle'"
+before_script: "bash -c 'cd UnitTests/HttpInterface && gem install bundler && bundle'"
 script: "make setup && ./configure --enable-relative --enable-all-in-one-libev --enable-all-in-one-v8 --enable-all-in-one-icu && make -j2 && make unittests-shell-server unittests-shell-server-ahuacatl unittests-http-server SKIP_RANGES=1 && echo 'done'"
 branches:
   only:
     - master
     - 1.0
     - 1.1
     - 1.2
+    - 1.3
+    - 1.4
     - devel
-notifications:
-    webhooks: https://www.buildheroes.com/api/projects/e4a8248a1650ca7f463591f5e0fecf6901e0f475/builds
diff --git a/3rdParty/Makefile.all-in-one-v8 b/3rdParty/Makefile.all-in-one-v8
@@ -19,7 +19,11 @@ BUILT_SOURCES += @V8_LIBS@
 	@echo "--------------------------------------------------------------------------------"
 	@echo
 
+if ENABLE_ARM
+	cd @top_srcdir@/3rdParty/V8 && CFLAGS="-O2 -g" CXXFLAGS="-O2 -g" GYP_DEFINES="armv7=0" $(MAKE) library=static strictaliasing=off snapshot=off werror=no hardfp=on @V8_TARGET@
+else
 	cd @top_srcdir@/3rdParty/V8 && CFLAGS="-O2 -g" CXXFLAGS="-O2 -g" $(MAKE) library=static strictaliasing=off snapshot=off werror=no @V8_TARGET@
+endif
 
 	touch @srcdir@/.v8-build-@TRI_BITS@
 

diff --git a/3rdParty/V8/build/common.gypi b/3rdParty/V8/build/common.gypi
@@ -146,6 +146,14 @@
               'CAN_USE_ARMV7_INSTRUCTIONS=1',
             ],
           }],
+          ['armv7==0', {
+            'target_conditions': [
+              ['_toolset=="target"', {
+                'cflags': ['-march=armv6',],
+                'ldflags': ['-march=armv6',],
+              }],
+            ],
+          }],
           [ 'v8_can_use_unaligned_accesses=="true"', {
             'defines': [
               'CAN_USE_UNALIGNED_ACCESSES=1',
@@ -167,7 +175,7 @@
           [ 'v8_can_use_vfp3_instructions=="true" or arm_neon==1 or \
              arm_fpu=="vfpv3" or arm_fpu=="vfpv3-d16"', {
             'defines': [
-              'CAN_USE_VFP3_INSTRUCTIONS',
+              # 'CAN_USE_VFP3_INSTRUCTIONS',
             ],
           }],
           [ 'v8_use_arm_eabi_hardfloat=="true"', {
@@ -414,13 +422,13 @@
           ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" \
             or OS=="android"', {
             'cflags!': [
-              '-O2',
+              '-O3',
               '-Os',
             ],
             'cflags': [
               '-fdata-sections',
               '-ffunction-sections',
-              '-O3',
+              '-O2',
             ],
             'conditions': [
               [ 'gcc_version==44 and clang==0', {