[DEV] update Build interface
This commit is contained in:
parent
145d930567
commit
71fc8af983
21
.travis.yml
21
.travis.yml
@ -3,10 +3,6 @@ language:
|
|||||||
|
|
||||||
sudo: false
|
sudo: false
|
||||||
|
|
||||||
compiler:
|
|
||||||
- clang
|
|
||||||
- gcc
|
|
||||||
|
|
||||||
os:
|
os:
|
||||||
- linux
|
- linux
|
||||||
- osx
|
- osx
|
||||||
@ -26,18 +22,27 @@ 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/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-orchestra
|
- lutin -w -j4 -C -P -c $BUILDER $COMPILATOR_OPTION -m $CONF $GCOV -p audio-orchestra
|
||||||
# - ./out/Linux_x86_64/debug/staging/$BUILDER/audio-orchestra/usr/bin/audio-orchestra -l6
|
# - ./out/Linux_x86_64/$CONF/staging/$BUILDER/audio-orchestra/usr/bin/audio-orchestra -l6
|
||||||
|
|
||||||
notifications:
|
notifications:
|
||||||
email:
|
email:
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
/* include auto generated file */
|
/* include auto generated file */
|
||||||
#include <org_musicdsp_orchestra_OrchestraConstants.h>
|
#include <org_musicdsp_orchestra_OrchestraConstants.h>
|
||||||
#include <jvm-basics/jvm-basics.h>
|
#include <jvm-basics/jvm-basics.h>
|
||||||
#include <etk/memory.h>
|
#include <memory>
|
||||||
#include <ejson/ejson.h>
|
#include <ejson/ejson.h>
|
||||||
|
|
||||||
class AndroidOrchestraContext {
|
class AndroidOrchestraContext {
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
#include <audio/orchestra/error.h>
|
#include <audio/orchestra/error.h>
|
||||||
#include <audio/orchestra/StreamOptions.h>
|
#include <audio/orchestra/StreamOptions.h>
|
||||||
#include <audio/format.h>
|
#include <audio/format.h>
|
||||||
#include <etk/memory.h>
|
#include <memory>
|
||||||
|
|
||||||
namespace audio {
|
namespace audio {
|
||||||
namespace orchestra {
|
namespace orchestra {
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
#include <audio/orchestra/Interface.h>
|
#include <audio/orchestra/Interface.h>
|
||||||
#include <audio/orchestra/debug.h>
|
#include <audio/orchestra/debug.h>
|
||||||
#include <etk/thread.h>
|
#include <thread>
|
||||||
#include <etk/thread/tools.h>
|
#include <etk/thread/tools.h>
|
||||||
#include <audio/orchestra/api/Core.h>
|
#include <audio/orchestra/api/Core.h>
|
||||||
|
|
||||||
|
@ -7,12 +7,12 @@
|
|||||||
|
|
||||||
#ifndef __AUDIO_ORCHESTRA_CB_H__
|
#ifndef __AUDIO_ORCHESTRA_CB_H__
|
||||||
#define __AUDIO_ORCHESTRA_CB_H__
|
#define __AUDIO_ORCHESTRA_CB_H__
|
||||||
#include <etk/thread.h>
|
#include <thread>
|
||||||
#include <etk/condition_variable.h>
|
#include <condition_variable>
|
||||||
#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/channel.h>
|
#include <audio/channel.h>
|
||||||
#include <audio/format.h>
|
#include <audio/format.h>
|
||||||
#include <audio/orchestra/error.h>
|
#include <audio/orchestra/error.h>
|
||||||
|
@ -25,6 +25,22 @@ def create(target):
|
|||||||
'audio/orchestra/StreamOptions.cpp',
|
'audio/orchestra/StreamOptions.cpp',
|
||||||
'audio/orchestra/api/Dummy.cpp'
|
'audio/orchestra/api/Dummy.cpp'
|
||||||
])
|
])
|
||||||
|
myModule.add_header_file([
|
||||||
|
'audio/orchestra/debug.h',
|
||||||
|
'audio/orchestra/status.h',
|
||||||
|
'audio/orchestra/type.h',
|
||||||
|
'audio/orchestra/mode.h',
|
||||||
|
'audio/orchestra/state.h',
|
||||||
|
'audio/orchestra/error.h',
|
||||||
|
'audio/orchestra/base.h',
|
||||||
|
'audio/orchestra/Interface.h',
|
||||||
|
'audio/orchestra/Flags.h',
|
||||||
|
'audio/orchestra/Api.h',
|
||||||
|
'audio/orchestra/DeviceInfo.h',
|
||||||
|
'audio/orchestra/StreamOptions.h',
|
||||||
|
'audio/orchestra/CallbackInfo.h',
|
||||||
|
'audio/orchestra/StreamParameters.h'
|
||||||
|
])
|
||||||
myModule.add_module_depend(['audio', 'etk'])
|
myModule.add_module_depend(['audio', 'etk'])
|
||||||
# add all the time the dummy interface
|
# add all the time the dummy interface
|
||||||
myModule.add_export_flag('c++', ['-DORCHESTRA_BUILD_DUMMY'])
|
myModule.add_export_flag('c++', ['-DORCHESTRA_BUILD_DUMMY'])
|
||||||
@ -80,7 +96,7 @@ def create(target):
|
|||||||
else:
|
else:
|
||||||
debug.warning("unknow target for audio_orchestra : " + target.name);
|
debug.warning("unknow target for audio_orchestra : " + target.name);
|
||||||
|
|
||||||
myModule.add_export_path(tools.get_current_path(__file__))
|
myModule.add_path(tools.get_current_path(__file__))
|
||||||
|
|
||||||
return myModule
|
return myModule
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user