merged

Author: chriamue

.appveyor.yml

@@ -10,8 +10,6 @@ clone_folder: c:\dev\src
 
 init:
 - env
-- set POCO_INSTALL_PREFIX=%PROGRAMFILES%\Poco
-- set PATH=C:\MinGW\bin;%PATH%;%POCO_INSTALL_PREFIX%\bin
 
 install:
  - cmd: echo "Downloading conan..."
@@ -26,7 +24,7 @@ before_build:
 
 build_script:
   - cd c:\dev\src\build
-  - cmake .. -G "Visual Studio 14 2015 Win64" -DOPTION_CONAN_PACKAGES=1
+  - cmake .. -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE=Release -DOPTION_CONAN_PACKAGES=1
   - cmake --build . --config Release
 
 test: off

.conanfile.txt

@@ -1,14 +1,14 @@
 [requires]
-Boost/1.60.0@lasote/stable
-Poco/1.7.3@lasote/stable
-OpenCV/3.2.0@fmiguelgarcia/stable
+Boost/1.62.0@lasote/stable
+OpenCV/3.2.0@ohhi/stable
+Poco/1.7.5@lasote/stable
 
 [options]
 Boost:shared=True
+OpenCV:shared=True
 Poco:shared=True
 Poco:enable_data=True
 Poco:enable_data_sqlite=True
-Poco:enable_data_mysql=True
-Poco:enable_mongodb=True
+
 [generators]
 cmake

.gitignore

@@ -29,6 +29,7 @@ CMakeLists.txt.user.*
 # IDE project files
 *.sublime-project
 *.sublime-workspace
+*.vs
 
 # Local config windows
 _configure.bat

.travis.yml

@@ -122,6 +122,11 @@ script:
 
 after_success:
   - make annotatorlib_coverage
+  - lcov --directory . --capture --output-file coverage.info # capture coverage info
+  - lcov --remove coverage.info '/usr/*' --output-file coverage.info # filter out system
+  - lcov --list coverage.info #debug info
+  # Uploading report to CodeCov
+  - bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"
   - cd ..
   - coveralls --root "." -E ".*/cmake-3.6.0/.*" -E ".*/opencv-3.1.0/.*" -E ".*/poco/.*" -E ".*/build/gtest/.*" -E ".*CMakeFiles.*" -E ".*tests/.*.cpp.*"
   - cp build/compile_commands.json .

README.md

@@ -1,40 +1,51 @@
-Annotator Library
+# Annotator Library
+
 =================
 
 [![Stories in Ready][waffle-image]][waffle]
 [![Build Status][travis-image]][travis]
+[![Build Status Windows][appveyor-image]][appveyor]
 [![Coverage_Status][coveralls-image]][coveralls]
+[![Coverage Status Codecov][codecov-image]][codecov]
 [![Coverity Scan Build Status][coverity-image]][coverity]
-[![Documentation][codedocs-image]][codedocs][![Gitter][gitter-image]][gitter]
+[![Documentation][codedocs-image]][codedocs]
+[![Gitter][gitter-image]][gitter]
 
 [travis-image]: https://travis-ci.org/annotatorproject/annotatorlib.png?branch=master
 [travis]: http://travis-ci.org/annotatorproject/annotatorlib
 
+[appveyor-image]: https://img.shields.io/appveyor/ci/chriamue/annotatorlib.svg
+[appveyor]: https://ci.appveyor.com/project/chriamue/annotatorlib
+
 [coveralls-image]: https://img.shields.io/coveralls/annotatorproject/annotatorlib.svg?label=Coverage
 [coveralls]: https://coveralls.io/github/annotatorproject/annotatorlib
 
-[coverity-image]: https://img.shields.io/coverity/scan/12802.svg
-[coverity]: https://scan.coverity.com/projects/annotatorproject-annotatorlib
+[codecov-image]: https://img.shields.io/codecov/c/github/annotatorproject/annotatorlib.svg
+[codecov]: https://codecov.io/gh/annotatorproject/annotatorlib
 
 [codedocs-image]: https://codedocs.xyz/annotatorproject/annotatorlib.svg
 [codedocs]: https://codedocs.xyz/annotatorproject/annotatorlib/
 
+[coverity-image]: https://img.shields.io/coverity/scan/12802.svg
+[coverity]: https://scan.coverity.com/projects/annotatorproject-annotatorlib
+
 [gitter-image]: https://badges.gitter.im/Join%20Chat.svg
 [gitter]: https://gitter.im/annotatorproject/annotatorlib
 
 [waffle-image]: https://badge.waffle.io/annotatorproject/annotatorlib.svg?label=ready&title=Ready
 [waffle]: http://waffle.io/annotatorproject/annotatorlib
 
-### Quick start
+## Quick start
 
 First install CMake, Qt5 and a c++11 compiler (gcc 5).
 
-```
+```bash
 sudo apt-get install libboost-system-dev libboost-filesystem-dev libpoco-dev libmysqlclient-dev libmongo-client-dev
 ```
 
 Build LibPoco
-```sh
+
+```bash
 git clone https://github.com/pocoproject/poco.git
 cd poco
 sed -i 's#mysqlclient_r#mysqlclient mysqlclient_r#g' cmake/FindMySQL.cmake
@@ -45,7 +56,7 @@ make -j2
 
 Then build.
 
-```sh
+```bash
 git clone https://github.com/annotatorproject/annotatorlib
 git submodule update --init --recursive
 cd annotatorlib
@@ -57,22 +68,38 @@ make
 
 Add PascalVoc storage support.
 
-```sh
+```bash
 cd annotatorlib/source/storages
 git clone https://github.com/annotatorproject/annotatorstorage_pascalvocxml
 cd ../../build
 cmake ..
 make
 ```
 
+## Conan Build on Windows
+
+First install Visual Studio, CMake, Git and Conan.
+
+Open Git Bash:
+
+```bash
+git clone https://github.com/annotatorproject/annotatorlib
+git submodule update --init --recursive
+cd annotatorlib
+mkdir build
+cd build
+cmake .. -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE=Release -DOPTION_CONAN_PACKAGES=1
+cmake --build . --config Release
+```
+
 ## Build coverage
-```sh
+
+```bash
 git clone https://github.com/annotatorproject/annotatorlib
 git submodule update --init --recursive
 cd annotatorlib
 mkdir build
 cd build
 cmake -DCMAKE_BUILD_TYPE=Coverage ..
 make annotatorlib_coverage
-```
-
+```