[DEV] update Build interface

This commit is contained in:
Edouard DUPIN 2015-09-14 21:11:04 +02:00
parent 5cab7f39eb
commit dbd66a0157
13 changed files with 43 additions and 30 deletions

View File

@ -3,10 +3,6 @@ language:
sudo: false sudo: false
compiler:
- clang
- gcc
os: os:
- linux - linux
- osx - osx
@ -26,8 +22,18 @@ 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/generic-library/speex-dsp-lutin.git --recursive - git clone https://github.com/generic-library/speex-dsp-lutin.git --recursive
- git clone https://github.com/generic-library/z-lutin.git --recursive - git clone https://github.com/generic-library/z-lutin.git --recursive
@ -39,13 +45,12 @@ before_script:
- git clone https://github.com/musicdsp/audio-orchestra.git - git clone https://github.com/musicdsp/audio-orchestra.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-river-test - lutin -w -j4 -C -P -c $BUILDER $COMPILATOR_OPTION -m $CONF $GCOV -p audio-river-test
# - ./out/Linux_x86_64/debug/staging/$BUILDER/audio-river-test/usr/bin/audio-river-test -l6 # - ./out/Linux_x86_64/$CONF/staging/$BUILDER/audio-river-test/usr/bin/audio-river-test -l6
notifications: notifications:
email: email:

View File

@ -10,10 +10,10 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <stdint.h> #include <stdint.h>
#include <etk/mutex.h> #include <mutex>
#include <etk/chrono.h> #include <chrono>
#include <etk/functional.h> #include <functional>
#include <etk/memory.h> #include <memory>
#include <audio/format.h> #include <audio/format.h>
#include <audio/channel.h> #include <audio/channel.h>
#include <audio/drain/Process.h> #include <audio/drain/Process.h>

View File

@ -9,7 +9,7 @@
#include <string> #include <string>
#include <stdint.h> #include <stdint.h>
#include <etk/memory.h> #include <memory>
#include <audio/river/Interface.h> #include <audio/river/Interface.h>
#include <audio/format.h> #include <audio/format.h>
#include <audio/channel.h> #include <audio/channel.h>

View File

@ -13,7 +13,7 @@
#include <audio/river/io/NodeOrchestra.h> #include <audio/river/io/NodeOrchestra.h>
#include <audio/river/io/NodePortAudio.h> #include <audio/river/io/NodePortAudio.h>
#include <etk/os/FSNode.h> #include <etk/os/FSNode.h>
#include <etk/memory.h> #include <memory>
#include <etk/types.h> #include <etk/types.h>
#include <utility> #include <utility>

View File

@ -12,10 +12,10 @@
#include <map> #include <map>
#include <list> #include <list>
#include <stdint.h> #include <stdint.h>
#include <etk/mutex.h> #include <mutex>
#include <etk/chrono.h> #include <chrono>
#include <etk/functional.h> #include <functional>
#include <etk/memory.h> #include <memory>
#include <audio/format.h> #include <audio/format.h>
#include <audio/channel.h> #include <audio/channel.h>
#include <ejson/ejson.h> #include <ejson/ejson.h>

View File

@ -11,9 +11,9 @@
#include <vector> #include <vector>
#include <list> #include <list>
#include <stdint.h> #include <stdint.h>
#include <etk/chrono.h> #include <chrono>
#include <etk/functional.h> #include <functional>
#include <etk/memory.h> #include <memory>
#include <audio/format.h> #include <audio/format.h>
#include <audio/channel.h> #include <audio/channel.h>
#include "Manager.h" #include "Manager.h"

View File

@ -7,8 +7,8 @@
#include <audio/river/io/NodeAEC.h> #include <audio/river/io/NodeAEC.h>
#include <audio/river/debug.h> #include <audio/river/debug.h>
#include <etk/types.h> #include <etk/types.h>
#include <etk/memory.h> #include <memory>
#include <etk/functional.h> #include <functional>
#undef __class__ #undef __class__
#define __class__ "io::NodeAEC" #define __class__ "io::NodeAEC"

View File

@ -8,7 +8,7 @@
#include <audio/river/io/NodeFile.h> #include <audio/river/io/NodeFile.h>
#include <audio/river/debug.h> #include <audio/river/debug.h>
#include <etk/memory.h> #include <memory>
#undef __class__ #undef __class__
#define __class__ "io::NodeFile" #define __class__ "io::NodeFile"

View File

@ -7,8 +7,8 @@
#include <audio/river/io/NodeMuxer.h> #include <audio/river/io/NodeMuxer.h>
#include <audio/river/debug.h> #include <audio/river/debug.h>
#include <etk/types.h> #include <etk/types.h>
#include <etk/memory.h> #include <memory>
#include <etk/functional.h> #include <functional>
#undef __class__ #undef __class__
#define __class__ "io::NodeMuxer" #define __class__ "io::NodeMuxer"

View File

@ -8,7 +8,7 @@
#include <audio/river/io/NodeOrchestra.h> #include <audio/river/io/NodeOrchestra.h>
#include <audio/river/debug.h> #include <audio/river/debug.h>
#include <etk/memory.h> #include <memory>
#undef __class__ #undef __class__
#define __class__ "io::NodeOrchestra" #define __class__ "io::NodeOrchestra"

View File

@ -8,7 +8,7 @@
#include <audio/river/io/NodePortAudio.h> #include <audio/river/io/NodePortAudio.h>
#include <audio/river/debug.h> #include <audio/river/debug.h>
#include <etk/memory.h> #include <memory>
#include <audio/Time.h> #include <audio/Time.h>
#include <audio/Duration.h> #include <audio/Duration.h>

View File

@ -22,10 +22,18 @@ def create(target):
'audio/river/io/NodeMuxer.cpp', 'audio/river/io/NodeMuxer.cpp',
'audio/river/io/Manager.cpp' 'audio/river/io/Manager.cpp'
]) ])
myModule.add_header_file([
'audio/river/river.h',
'audio/river/Manager.h',
'audio/river/Interface.h',
'audio/river/io/Group.h',
'audio/river/io/Node.h',
'audio/river/io/Manager.h'
])
myModule.add_optionnal_module_depend('audio-orchestra', ["c++", "-DAUDIO_RIVER_BUILD_ORCHESTRA"]) myModule.add_optionnal_module_depend('audio-orchestra', ["c++", "-DAUDIO_RIVER_BUILD_ORCHESTRA"])
myModule.add_optionnal_module_depend('portaudio', ["c++", "-DAUDIO_RIVER_BUILD_PORTAUDIO"]) myModule.add_optionnal_module_depend('portaudio', ["c++", "-DAUDIO_RIVER_BUILD_PORTAUDIO"])
myModule.add_module_depend(['audio', 'audio-drain', 'ejson']) myModule.add_module_depend(['audio', 'audio-drain', 'ejson'])
myModule.add_export_path(tools.get_current_path(__file__)) myModule.add_path(tools.get_current_path(__file__))
# add the currrent module at the # add the currrent module at the
return myModule return myModule

View File

@ -14,7 +14,7 @@
#include <math.h> #include <math.h>
#include <sstream> #include <sstream>
#include <unistd.h> #include <unistd.h>
#include <etk/thread.h> #include <thread>
#include "testAEC.h" #include "testAEC.h"
#include "testEchoDelay.h" #include "testEchoDelay.h"
#include "testFormat.h" #include "testFormat.h"