Start on Sonarcloud support

7 files changed, 39 insertions, 73 deletions

diff --git a/.travis.yml b/.travis.yml
index 89a45bf..e396cc1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,59 +1,24 @@
 language: c
 
-sudo: false
-
-env:
-  global:
-   - secure: "p7KivdPu+pWYLI95Rmtu8FgOPWUq36TiXr9kH5rDyuqg2iz3DAt8unDYXWGfSn9p6OzfchBd2WsGMMvbvICfBNm+uOjrQwWwW6SBENLNyGDiGKQd4coAmUF247UXY+CslRQrSuciajrNSrBIPOL4EjvlMmV8N5kwDrFB8QktgxyLf35vbNAc8vkoUdFu7vUzt2MISIA1rrWcOUjDaM6vqovzosr/LzDwwjj3HX92ys2YZh2m1V7BOMLuNRLW7pou3ge4VmXdTVIyFcEEG1Nqk1apeX9ZEsw0IQ6xLfcOJbqg5CSIFrkGhdlM1L+u7ThBBa+EZU9EZr6qYnVvHMRU1xyCFEJvGMr9FhS9ZnzPxOxz0BG/qkDbtkQtPtkPobb/325b7/jpDNZFXj6/kErdLjsClP1jUnFmj3jkcOXYsGlz4Osl7tih4a52VLWhzL7Lz7XxmZ9KUOJPuofg2CT0eUa1w+OAtA/tB7molRo2AowmfuN+PvNcmE16cFtveFqAArnN0R7st91SkyGZNRTumDfb7rh9coAboFEZU7vKYnCk7Tt7Atp43HnqnX0ywvxqEmHY7yYQQE1Z/1Mw0+6JnHuEaFp0Q5aU/KJmGXae6v0HqvGqvr8mCjsm0LMAxtRb6tb5zbtGCKwEd3HaDA/i3B9xLDBebbIxjMBjDdvAn9Q="
-   - CMAKE_PREFIX_PATH=$HOME/local
-
-cache:
-  directories:
-  - $HOME/local
+sudo: required
+dist: trusty
 
 compiler:
   - gcc
 
-install:
-  - chmod +x ${TRAVIS_BUILD_DIR}/travis/sdl2.sh
-  - chmod +x ${TRAVIS_BUILD_DIR}/travis/ffmpeg.sh
-  - ${TRAVIS_BUILD_DIR}/travis/sdl2.sh
-  - ${TRAVIS_BUILD_DIR}/travis/ffmpeg.sh
+before_install: chmod +x travis/*
 
-script: if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then cd $TRAVIS_BUILD_DIR && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/bin/gcc-5 -DBUILD_EXAMPLES=On -DBUILD_TESTS=Off . && make; fi
+install: travis/deps.sh
+
+script: travis/make.sh
 
 notifications:
   email: false
 
 addons:
-  coverity_scan:
-    project:
-      name: "katajakasa/SDL_kitchensink"
-      description: "A Simple SDL2 / FFmpeg library for audio/video playback written in C99"
-    notification_email: katajakasa@gmail.com
-    build_command_prepend: "cov-configure --comptype gcc --compiler gcc-5 --template && cmake -DCMAKE_C_COMPILER=/usr/bin/gcc-5 -DCMAKE_BUILD_TYPE=Debug ."
-    build_command: "make"
-    branch_pattern: coverity_scan
-  apt:
-    sources:
-    - ubuntu-toolchain-r-test
-    - george-edison55-precise-backports
-    packages:
-    - libc6-dev
-    - yasm
-    - gcc-5
-    - gettext
-    - libcunit1
-    - libcunit1-dev
-    - libasound2-dev
-    - libpulse-dev
-    - libx11-dev
-    - libxext-dev
-    - libxrandr-dev
-    - libxi-dev
-    - libxxf86vm-dev
-    - libxss-dev
-    - libudev-dev
-    - cmake
-    - cmake-data
-    - libass-dev
+  sonarcloud:
+    organization: "katajakasa-github"
+
+cache:
+  directories:
+    - '$HOME/.sonar/cache'
diff --git a/README.md b/README.md
index ae325b9..a4fea2f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # SDL_kitchensink
 
 [![Build Status](https://travis-ci.org/katajakasa/SDL_kitchensink.svg?branch=master)](https://travis-ci.org/katajakasa/SDL_kitchensink)
-[![Coverity Scan Build Status](https://scan.coverity.com/projects/7585/badge.svg)](https://scan.coverity.com/projects/katajakasa-sdl_kitchensink)
+[![Quality Gate](https://sonarcloud.io/api/badges/gate?key=sdl_kitchensink)](https://sonarcloud.io/dashboard?id=sdl_kitchensink)
 
 FFmpeg and SDL2 based library for audio and video playback, written in C99.
 
diff --git a/sonar-project.properties b/sonar-project.properties
new file mode 100644
index 0000000..3edb3a5
--- /dev/null
+++ b/sonar-project.properties
@@ -0,0 +1,7 @@
+sonar.projectKey=sdl_kitchensink

+sonar.projectName=SDL_Kitchensink

+sonar.projectVersion=1.0

+sonar.sourceEncoding=UTF-8

+sonar.sources=src,include

+sonar.language=c

+sonar.cfamily.build-wrapper-output=bw-output

diff --git a/travis/deps.sh b/travis/deps.sh
new file mode 100644
index 0000000..b41a7d9
--- /dev/null
+++ b/travis/deps.sh
@@ -0,0 +1,12 @@
+sudo add-apt-repository ppa:zoogie/sdl2-snapshots -y

+sudo add-apt-repository ppa:george-edison55/cmake-3.x -y

+sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y

+sudo add-apt-repository ppa:jonathonf/ffmpeg-3 -y

+sudo apt-get update

+sudo apt-get -y install \

+    gcc-7 \

+    cmake \

+    libargtable2-dev \

+    libsdl2-dev \

+    libass-dev \

+    ffmpeg

diff --git a/travis/ffmpeg.sh b/travis/ffmpeg.sh
deleted file mode 100644
index d27c136..0000000
--- a/travis/ffmpeg.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-
-if [ ! -e "$HOME/local/lib/libavcodec.so" ]; then 
-    wget https://www.ffmpeg.org/releases/ffmpeg-3.0.4.tar.gz -O ~/ffmpeg.tar.gz
-    tar xzf ~/ffmpeg.tar.gz -C ~/
-    cd ~/ffmpeg-3.0.4
-    export CC=gcc-5
-    ./configure --prefix=$HOME/local --disable-static --enable-shared --disable-doc
-    make
-    make install
-else 
-    echo 'Using cached FFmpeg build directory.';
-fi
diff --git a/travis/make.sh b/travis/make.sh
new file mode 100644
index 0000000..65a5ead
--- /dev/null
+++ b/travis/make.sh
@@ -0,0 +1,7 @@
+cd $TRAVIS_BUILD_DIR

+cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_EXAMPLES=On -DCMAKE_C_COMPILER=/usr/bin/gcc-7 -DUSE_TESTS=Off . 

+make

+make test

+make clean

+build-wrapper-linux-x86-64 --out-dir bw-output make

+sonar-scanner

diff --git a/travis/sdl2.sh b/travis/sdl2.sh
deleted file mode 100644
index d767e3b..0000000
--- a/travis/sdl2.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-
-if [ ! -e "$HOME/local/lib/libSDL2.so" ]; then
-    wget https://www.libsdl.org/release/SDL2-2.0.5.tar.gz -O ~/SDL2.tar.gz
-    tar -xzvf ~/SDL2.tar.gz -C ~/
-    mkdir ~/sdl-build
-    cd ~/sdl-build
-    export CC=gcc-5
-    ~/SDL2-2.0.5/configure --prefix=$HOME/local
-    make -j2
-    make install
-else 
-    echo 'Using cached SDL2 build directory.';
-fi