From edd1fdf63756aa68e58ddca87333129a7d1f2f7f Mon Sep 17 00:00:00 2001 From: Umang Mehta Date: Wed, 22 Nov 2017 16:22:31 -0500 Subject: [PATCH] Updating the README and travis config --- .travis.yml | 21 +++++++++++++++++++-- README.md | 8 +++++--- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 06e4344..2fcaae3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,25 @@ language: cpp compiler: - gcc-4.8 before_script: - - sudo apt-get install -y gcc-4.8 g++-4.8 libopencv-dev libboost1.55-all-dev cmake - - wget https://download.affectiva.com/linux/affdex-cpp-sdk-3.1-396-linux-64bit.tar.gz -O /tmp/affdex-sdk.tar.gz + - sudo apt-get install -y gcc-5.4 g++-5.4 libopencv-dev make libcurl4-openssl-dev libssl-dev + - wget https://cmake.org/files/v3.8/cmake-3.8.1.tar.gz -O /tmp/cmake.tar.gz + - mkdir /tmp/cmake + - tar -xvf cmake.tar.gz -C /tmp/cmake + - cd /tmp/cmake && \ + ./bootstrap --system-curl && \ + make -j$(nproc) && \ + make install + - wget https://sourceforge.net/projects/boost/files/boost/1.63.0/boost_1_63_0.tar.gz -O /tmp/boost.tar.gz + - mkdir /tmp/boost + - tar -xvf boost.tar.gz -C /tmp/boost + - cd /tmp/boost && \ + ./bootstrap.sh &&\ + ./b2 -j $(nproc) cxxflags=-fPIC threading=multi runtime-link=shared \ + --with-log --with-serialization --with-system --with-date_time \ + --with-filesystem --with-regex --with-timer --with-chrono --with-thread \ + --with-program_options \ + install + - wget https://download.affectiva.com/linux/gcc-5.4/affdex-cpp-sdk-4.0-75-ubuntu-xenial-xerus-x86_64bit.tar.gz -O /tmp/affdex-sdk.tar.gz - mkdir /tmp/affdex-sdk - tar -xzvf /tmp/affdex-sdk.tar.gz -C /tmp/affdex-sdk - mkdir build diff --git a/README.md b/README.md index ca4ef0d..3053af2 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,9 @@ Dependencies Installation ------------ -- Download Affdex SDK [from here](http://developer.affectiva.com/downloads) +- Download Affdex SDK for Linux [from here](https://affectiva.readme.io/docs/getting-started-with-the-affectiva-sdk-for-linux#section-1-download-and-extract-the-sdk-archive) +- - Download Affdex SDK for Windows [from here](https://affectiva.readme.io/docs/getting-started-with-the-emotion-sdk-for-windows#section-1-download-and-run-the-sdk-installer) + ##### Windows - Install the SDK using MSI installer. @@ -123,7 +125,7 @@ The following command line arguments can be used to run it: Video-demo (c++) ---------- -Project for demoing the Windows SDK [VideoDetector class](http://developer.affectiva.com/v3_2/cpp/analyze-video/) and [PhotoDetector class](http://developer.affectiva.com/v3_2/cpp/analyze-photo/). It processs video or image files, displays the emotion metrics and exports the results in a csv file. +Project for demoing the Windows SDK [VideoDetector class](http://developer.affectiva.com/v3_2/cpp/analyze-video/) and [PhotoDetector class](http://developer.affectiva.com/v3_2/cpp/analyze-photo/). It process video or image files, displays the emotion metrics and exports the results in a csv file. The following command line arguments can be used to run it: @@ -143,4 +145,4 @@ For an example of how to use Affdex in a C# application .. please refer to [Affd Docker Build Instructions ------------------------- -Please check out the Dockerfiles in the docker directory to follow the build and run steps to create and run the image. +The Dockerfile's are located in the docker directory. To build the docker image please refer to the files for instructions.