merge next to master

.appveyor.yml

@@ -1,4 +1,4 @@
-version: 3.0.4-{build}
+version: 4.0-{build}
 
 os:
   - Visual Studio 2015

.gitignore

@@ -1,3 +1,5 @@
+.DS_Store
+
 # Object files
 *.o
 *.ko
@@ -36,17 +38,19 @@ bindings/ocaml/*.mli
 bindings/ocaml/test
 bindings/ocaml/test_arm
 bindings/ocaml/test_arm64
+bindings/ocaml/test_basic
 bindings/ocaml/test_mips
 bindings/ocaml/test_x86
 bindings/ocaml/test_detail
 bindings/ocaml/test_ppc
 bindings/ocaml/test_sparc
 bindings/ocaml/test_systemz
 bindings/ocaml/test_xcore
+bindings/ocaml/test_m680x
 
 
 # test binaries
-tests/test
+tests/test_basic
 tests/test_detail
 tests/test_iter
 tests/test_arm
@@ -59,18 +63,15 @@ tests/test_sparc
 tests/test_systemz
 tests/test_xcore
 tests/*.static
-tests/test_basic
 tests/test_customized_mnem
-
-tests/test_m680x
 tests/test_m68k
 tests/test_tms320c64x
+tests/test_m680x
 tests/test_evm
 
 # regress binaries
 suite/regress/invalid_read_in_print_operand
 
-
 # vim tmp file
 *.swp
 *~
@@ -88,6 +89,7 @@ ProjectUpgradeLog.log
 Debug/
 Release/
 ipch/
+build*/
 *.sdf
 *.opensdf
 *.suo

.travis.yml

@@ -1,26 +1,16 @@
 language: cpp
 sudo: false
-env:
-  global:
-    - LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/tests/:$TRAVIS_BUILD_DIR:$LD_LIBRARY_PATH
+before_install:
+        - export LD_LIBRARY_PATH=`pwd`/tests/:$LD_LIBRARY_PATH
 script:
-  - ./make.sh
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./make.sh install; fi
-  - make check
-  - cd bindings/python && make check
+        - ./make.sh
+        - make check
+        - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cp libcapstone.so.* bindings/python/libcapstone.so; fi
+        - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cp libcapstone.*.dylib bindings/python/libcapstone.dylib; fi
+        - cd bindings/python && make check
 compiler:
-  - clang
-  - gcc
+        - clang
+        - gcc
 os:
-  - linux
-  - osx
-matrix:
-  include:
-    - if: branch = master
-      os: osx
-      script: brew update && brew install --HEAD capstone && brew test capstone
-      compiler: gcc
-    - if: branch = master
-      os: osx
-      script: brew update && brew install --HEAD capstone && brew test capstone
-      compiler: clang
+        - linux
+        - osx