Merge branch 'dev'

Author: hihozhou

.travis.yml

@@ -15,6 +15,39 @@ php:
 notifications:
   email: hihozhou@gmail.com
 
+before_install:
+  - sudo apt-get update
+install:
+  # OpenCV dependencies - Details available at: http://docs.opencv.org/trunk/doc/tutorials/introduction/linux_install/linux_install.html
+  - sudo apt-get install -y build-essential
+  - sudo apt-get install -y cmake git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev
+  - sudo apt-get install -y python-dev python-numpy libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libjasper-dev libdc1394-22-dev
+
+  # Download v3.0.0 .zip file and extract.
+  - curl -sL https://github.com/Itseez/opencv/archive/3.2.0.zip > opencv.zip
+  - unzip opencv.zip
+  - cd opencv-3.2.0
+
+  # Create a new 'build' folder.
+  - mkdir build
+  - cd build
+
+  # Set build instructions for Ubuntu distro.
+  - cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D WITH_TBB=ON -D BUILD_NEW_PYTHON_SUPPORT=ON -D WITH_V4L=ON -D INSTALL_C_EXAMPLES=ON -D INSTALL_PYTHON_EXAMPLES=ON -D BUILD_EXAMPLES=ON -D WITH_QT=ON -D WITH_OPENGL=ON ..
+  # Run 'make' with four threads.
+  - make -j4
+
+  # Install to OS.
+  - sudo make install
+  # Add configuration to OpenCV to tell it where the library files are located on the file system (/usr/local/lib)
+  - sudo sh -c 'echo "/usr/local/lib" > /etc/ld.so.conf.d/opencv.conf'
+
+  - sudo ldconfig
+  - echo "OpenCV installed."
+
+  # We need to return to the repo "root" folder, so we can then 'cd' into the C++ project folder.
+  - cd ../../
+
 #Compile
 before_script:
     - ./travis/compile.sh

README.md

@@ -1,6 +1,6 @@
 # PHP-OPENCV - PHP extension for Opencv
 
-[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.0-8892BF.svg)](https://php.net/)
+[![Build Status](https://travis-ci.org/hihozhou/php-opencv.svg?branch=master)](https://travis-ci.org/hihozhou/php-opencv) [![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.0-8892BF.svg)](https://php.net/)
 
 ## Requirements