From 2ffbcc19c6bad4f6f1ecd488ec4457164b2c8b75 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Mon, 14 Sep 2015 21:11:04 +0200 Subject: [PATCH] [DEV] update Build interface --- .travis.yml | 21 +++++++++++++-------- audio/Duration.h | 2 +- audio/Time.h | 2 +- lutin_audio.py | 22 +++++++++++++++++++++- test/main.cpp | 2 +- 5 files changed, 37 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 234ae4b..450e680 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,6 @@ language: sudo: false -compiler: - - clang - - gcc - os: - linux - osx @@ -26,17 +22,26 @@ addons: install: - pip install --user lutin +env: + - CONF=debug BOARD=Linux BUILDER=clang GCOV= + - CONF=release BOARD=Linux BUILDER=clang GCOV= + - CONF=debug BOARD=Linux BUILDER=gcc GCOV= + - CONF=release BOARD=Linux BUILDER=gcc GCOV= + - CONF=debug BOARD=Linux BUILDER=gcc GCOV=--gcov + before_script: + - wget http://atria-soft.com/ci/coverage_send.py + - wget http://atria-soft.com/ci/test_send.py + - wget http://atria-soft.com/ci/warning_send.py - rm -rf * - git clone https://github.com/atria-soft/etk.git - git clone https://github.com/generic-library/gtest-lutin.git --recursive - git clone https://github.com/musicdsp/audio.git - - if [ "$CXX" == "clang++" ]; then BUILDER=clang; else BUILDER=gcc; fi - - if [ "$CXX" == "g++" ]; then COMPILATOR_OPTION="--compilator-version=4.9"; else COMPILATOR_OPTION=""; fi + - if [ "$BUILDER" == "gcc" ]; then COMPILATOR_OPTION="--compilator-version=4.9"; else COMPILATOR_OPTION=""; fi script: - - lutin -C -P -c$BUILDER $COMPILATOR_OPTION -mdebug -p audio-test - - ./out/Linux_x86_64/debug/staging/$BUILDER/audio-test/usr/bin/audio-test + - lutin -w -j4 -C -P -c $BUILDER $COMPILATOR_OPTION -m $CONF $GCOV -p audio-test + - ./out/Linux_x86_64/$CONF/staging/$BUILDER/audio-test/usr/bin/audio-test notifications: email: diff --git a/audio/Duration.h b/audio/Duration.h index 24c712b..7284d68 100644 --- a/audio/Duration.h +++ b/audio/Duration.h @@ -8,7 +8,7 @@ #define __AUDIO_DURATION_H__ #include -#include +#include namespace audio { class Duration { diff --git a/audio/Time.h b/audio/Time.h index 936091b..8954aad 100644 --- a/audio/Time.h +++ b/audio/Time.h @@ -9,7 +9,7 @@ #include #include -#include +#include namespace audio { class Duration; diff --git a/lutin_audio.py b/lutin_audio.py index e60edf2..b3e6929 100644 --- a/lutin_audio.py +++ b/lutin_audio.py @@ -26,7 +26,27 @@ def create(target): 'audio/float_t.cpp', 'audio/double_t.cpp' ]) + myModule.add_header_file([ + 'audio/types.h', + 'audio/debug.h', + 'audio/debugRemove.h', + 'audio/channel.h', + 'audio/format.h', + 'audio/Time.h', + 'audio/Duration.h', + 'audio/int8_8_t.h', + 'audio/int8_16_t.h', + 'audio/int16_16_t.h', + 'audio/int16_32_t.h', + 'audio/int24_24_t.h', + 'audio/int24_32_t.h', + 'audio/int32_32_t.h', + 'audio/int32_64_t.h', + 'audio/int64_64_t.h', + 'audio/float_t.h', + 'audio/double_t.h' + ]) myModule.add_module_depend(['etk']) - myModule.add_export_path(tools.get_current_path(__file__)) + myModule.add_path(tools.get_current_path(__file__)) return myModule diff --git a/test/main.cpp b/test/main.cpp index 94c2af2..69a2221 100644 --- a/test/main.cpp +++ b/test/main.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include