fixing badges + minor fixes to travis and appveyor configs

.travis.yml

@@ -1,5 +1,5 @@
 # .travis.yml
-sudo: true
+sudo: false
 git:
   depth : 5
 branches:
@@ -36,17 +36,14 @@ matrix:
 addons:
   apt:
     sources: ['george-edison55-precise-backports', 'ubuntu-toolchain-r-test', 'llvm']
-    #sources: ['george-edison55-precise-backports', 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.7']
     packages: ['cmake', 'cmake-data', 'g++-4.8', 'clang']
-    #packages: ['cmake', 'cmake-data', 'g++-4.8', 'clang-3.7']
 before_install:
   - env
   - if [ $TRAVIS_OS_NAME == linux ]; then cat /proc/cpuinfo; fi
 # coverage
   - if [ "$VMF_GCOV_OPTS" != "" ]; then pip install --user cpp-coveralls; pip install --user codecov; fi
 # android
   - if [ "$VMF_ANDROID_BUILD" != "" ]; then time git clone --depth=1 https://github.com/apavlenko/android-ndk.git $HOME/android-ndk; export ANDROID_NDK=$HOME/android-ndk; fi
-  #- if [ "$VMF_ANDROID_BUILD" != "" ]; then android list; fi
   - if [ "$VMF_ANDROID_BUILD" != "" ]; then android-update-sdk --components=sys-img-${VMF_CPU_ARCH}-${VMF_API_LEVEL}; fi
 before_script:
   - mkdir ../build
@@ -70,7 +67,7 @@ after_success:
   - cd $TRAVIS_BUILD_DIR/../build && pwd
 # coverage
   - if [ "$VMF_GCOV_OPTS" != "" ]; then coveralls --exclude build/CMakeFiles --exclude vmf/3rdparty --exclude vmf/modules/vmfcore/test --exclude vmf/modules/vmdatasource/test --gcov-options '\-lp' --gcov gcov-4.8 --root .. --build-root . > /dev/null; fi
-  - if [ "$VMF_GCOV_OPTS" != "" ]; then codecov --root .. --gcov-exec gcov-4.8 > /dev/null; fi
+  - if [ "$VMF_GCOV_OPTS" != "" ]; then codecov --root ../vmf --gcov-exec gcov-4.8 > /dev/null; fi
 notifications:
   email: false
   webhooks: https://coveralls.io/webhook?repo_token=jEvkHdxBatpMEmiw1Mo0r2vmUG5vwepAF

README.md

@@ -1,7 +1,7 @@
 [![Build Status](https://travis-ci.org/01org/vmf.svg?branch=master)](https://travis-ci.org/01org/vmf)
-[![Build status](https://ci.appveyor.com/api/projects/status/r5j9ocr4basnm7yj?svg=true)](https://ci.appveyor.com/project/eaniemey/vmf)
-[![Coverage Status](https://s3.amazonaws.com/assets.coveralls.io/badges/coveralls_79.svg)](https://coveralls.io/repos/github/01org/vmf/badge.svg?branch=master)
-[![codecov.io](https://codecov.io/github/01org/vmf/coverage.svg?branch=master)](https://codecov.io/github/01org/vmf?branch=master)
+[![Build status](https://ci.appveyor.com/api/projects/status/github/01org/vmf?branch=master&svg=true)](https://ci.appveyor.com/project/eaniemey/vmf)
+[![Coverage Status](https://coveralls.io/repos/github/01org/vmf/badge.svg?branch=master)](https://coveralls.io/github/01org/vmf)
+[![codecov.io](https://codecov.io/github/01org/vmf/coverage.svg?branch=master)](https://codecov.io/github/01org/vmf)
 
 Video Metadata Framework
 ------------------------

appveyor.yml

@@ -11,7 +11,7 @@ clone_depth: 1
 
 branches:
   only:
-    - vmf-3.0
+    - master
 
 before_build:
   - mkdir _build

codecov.yml

@@ -0,0 +1,11 @@
+# codecov.yml
+comment:
+  layout: header, changes, diff
+coverage:
+  ignore:
+  - 3rdparty/.*
+  - CMakeFiles/.*
+  - test/.*
+  - modules/vmdatasource/test/.*
+  - modules/vmfcore/test/.*
+  - usr/lib/.*