diff --git a/.travis.yml b/.travis.yml index d08eaea03..a34e11b85 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ before_install: export ANDROID="android-sdk-linux/tools/android" && if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch jq; fi && wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv && - wget http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz -nv; + wget http://dl.google.com/android/android-sdk_r24.0.2-linux.tgz -nv; fi # Building for Qt here - if [ "$BUILD_Qt" == "YES" ]; then @@ -37,12 +37,13 @@ install: fi - if [ "$BUILD_ANDROID" == "YES" ]; then tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 && - tar -zxf android-sdk_r23.0.2-linux.tgz && + tar -zxf android-sdk_r24.0.2-linux.tgz && $ANDROID list sdk --extended -a && - echo yes | $ANDROID update sdk --filter tools,platform-tools,build-tools-21.1.1,android-10 --no-ui --force --no-https; + echo yes | $ANDROID update sdk --filter tools,platform-tools,build-tools-21.1.2,android-10 --no-ui --force --no-https; fi - sudo pip install pyjavaproperties - sudo pip install github3.py +- sudo pip install cpp-coveralls env: global: @@ -53,6 +54,7 @@ env: script: "tools/travis-script.sh" after_success: +- coveralls -b . -e JGE/src -e JGE/include -i projects/mtg/include -i projects/mtg/src --gcov-options '\-lp' - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l core.zip -r Wagic-core.zip -b $TRAVIS_BRANCH - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/Android/bin/Wagic-debug.apk -r Wagic-android.apk -b $TRAVIS_BRANCH - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/psprelease.zip -r Wagic-psp.zip -b $TRAVIS_BRANCH diff --git a/README.md b/README.md index f3eea73d2..83459c59f 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Build Status](https://travis-ci.org/WagicProject/wagic.png?branch=master)](https://travis-ci.org/WagicProject/wagic) [![Build status](https://ci.appveyor.com/api/projects/status/7j4fbr6m62aqej59/branch/master)](https://ci.appveyor.com/project/xawotihs/wagic/branch/master) - +[![Coverage Status](https://coveralls.io/repos/WagicProject/wagic/badge.png?branch=master)](https://coveralls.io/r/WagicProject/wagic?branch=master) ## Description diff --git a/projects/mtg/wagic-qt.pro b/projects/mtg/wagic-qt.pro index d53f75fcd..1aec3a977 100644 --- a/projects/mtg/wagic-qt.pro +++ b/projects/mtg/wagic-qt.pro @@ -12,6 +12,10 @@ CONFIG(console, graphics|console){ CONFIG += console CONFIG -= app_bundle DEFINES += TESTSUITE + + QMAKE_CXXFLAGS += -g -fprofile-arcs -ftest-coverage + QMAKE_LDFLAGS += -g -fprofile-arcs -ftest-coverage + LIBS += -lgcov } else:CONFIG(graphics, graphics|console){ folder_01.source = qml/QmlWagic @@ -19,13 +23,8 @@ else:CONFIG(graphics, graphics|console){ DEPLOYMENTFOLDERS = folder_01 QT += core gui opengl network multimedia QT -= declarative quick qml - #maemo5:DEFINES += QT_WIDGET DEFINES += QT_WIDGET unix:!symbian:INCLUDEPATH += /usr/include/GL - - # Please do not modify the following two lines. Required for deployment. -# !maemo5:include(qml/qmlapplicationviewer/qmlapplicationviewer.pri) -# !maemo5:qtcAddDeployment() } #!android:!symbian:QT += phonon