[DEV] update Build interface

This commit is contained in:
Edouard DUPIN 2015-09-14 21:11:04 +02:00
parent 4774b8fdfa
commit 1f3a5dd480
6 changed files with 29 additions and 16 deletions

View File

@ -3,10 +3,6 @@ language:
sudo: false sudo: false
compiler:
- clang
- gcc
os: os:
- linux - linux
- osx - osx
@ -26,19 +22,28 @@ addons:
install: install:
- pip install --user lutin - 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: before_script:
- cd .. - cd ..
- 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
- git clone https://github.com/generic-library/gtest-lutin.git --recursive - git clone https://github.com/generic-library/gtest-lutin.git --recursive
- git clone https://github.com/atria-soft/etk.git - git clone https://github.com/atria-soft/etk.git
- git clone https://github.com/musicdsp/audio.git - git clone https://github.com/musicdsp/audio.git
- pwd - pwd
- ls -l - ls -l
- if [ "$CXX" == "clang++" ]; then BUILDER=clang; else BUILDER=gcc; fi - if [ "$BUILDER" == "gcc" ]; then COMPILATOR_OPTION="--compilator-version=4.9"; else COMPILATOR_OPTION=""; fi
- if [ "$CXX" == "g++" ]; then COMPILATOR_OPTION="--compilator-version=4.9"; else COMPILATOR_OPTION=""; fi
script: script:
- lutin -C -P -c$BUILDER $COMPILATOR_OPTION -mdebug -p audio-algo-river-test - lutin -w -j4 -C -P -c $BUILDER $COMPILATOR_OPTION -m $CONF $GCOV -p audio-algo-river-test
# - ./out/Linux_x86_64/debug/staging/$BUILDER/audio-algo-river-test/usr/bin/audio-algo-river-test -l6 # - ./out/Linux_x86_64/$CONF/staging/$BUILDER/audio-algo-river-test/usr/bin/audio-algo-river-test -l6
notifications: notifications:
email: email:

View File

@ -9,9 +9,9 @@
#define __AUDIO_ALGO_RIVER_LMS_H__ #define __AUDIO_ALGO_RIVER_LMS_H__
#include <etk/types.h> #include <etk/types.h>
#include <etk/chrono.h> #include <chrono>
#include <audio/format.h> #include <audio/format.h>
#include <etk/memory.h> #include <memory>
namespace audio { namespace audio {
namespace algo { namespace algo {

View File

@ -9,9 +9,9 @@
#define __AUDIO_ALGO_RIVER_NLMS_H__ #define __AUDIO_ALGO_RIVER_NLMS_H__
#include <etk/types.h> #include <etk/types.h>
#include <etk/chrono.h> #include <chrono>
#include <audio/format.h> #include <audio/format.h>
#include <etk/memory.h> #include <memory>
namespace audio { namespace audio {
namespace algo { namespace algo {

View File

@ -9,9 +9,9 @@
#define __AUDIO_ALGO_RIVER_LMS_H__ #define __AUDIO_ALGO_RIVER_LMS_H__
#include <etk/types.h> #include <etk/types.h>
#include <etk/chrono.h> #include <chrono>
#include <audio/format.h> #include <audio/format.h>
#include <etk/memory.h> #include <memory>
namespace audio { namespace audio {
namespace algo { namespace algo {

View File

@ -18,8 +18,16 @@ def create(target):
'audio/algo/river/Nlms.cpp', 'audio/algo/river/Nlms.cpp',
'audio/algo/river/Suppressor.cpp' 'audio/algo/river/Suppressor.cpp'
]) ])
myModule.add_header_file([
'audio/algo/river/convolution.h',
'audio/algo/river/power.h',
'audio/algo/river/updateFilter.h',
'audio/algo/river/Lms.h',
'audio/algo/river/Nlms.h',
'audio/algo/river/Suppressor.h'
])
myModule.add_module_depend(['etk', 'audio']) myModule.add_module_depend(['etk', 'audio'])
myModule.add_export_path(tools.get_current_path(__file__)) myModule.add_path(tools.get_current_path(__file__))
# return module # return module
return myModule return myModule

View File

@ -9,7 +9,7 @@
#include <audio/algo/river/Lms.h> #include <audio/algo/river/Lms.h>
#include <audio/algo/river/Nlms.h> #include <audio/algo/river/Nlms.h>
#include <etk/os/FSNode.h> #include <etk/os/FSNode.h>
#include <etk/chrono.h> #include <chrono>
#include <etk/thread/tools.h> #include <etk/thread/tools.h>
#include <unistd.h> #include <unistd.h>