From 6e125d4a62777b95a7b6ef180be63bb5abed1380 Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Mon, 14 Sep 2015 21:11:04 +0200
Subject: [PATCH] [DEV] update Build interface

---
 .travis.yml                     | 21 +++++++++++++--------
 audio/drain/Algo.h              |  6 +++---
 audio/drain/CircularBuffer.h    |  2 +-
 audio/drain/EndPointCallback.h  |  2 +-
 audio/drain/EndPointWrite.h     |  4 ++--
 audio/drain/Equalizer.h         |  2 +-
 audio/drain/IOFormatInterface.h |  6 +++---
 audio/drain/Process.h           |  4 ++--
 audio/drain/Resampler.h         |  2 +-
 audio/drain/Volume.h            |  2 +-
 audio/drain/airtalgo.h          |  2 +-
 lutin_audio-drain.py            | 22 +++++++++++++++++++++-
 12 files changed, 50 insertions(+), 25 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 79759bb..50be86c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,10 +3,6 @@ language:
 
 sudo: false
 
-compiler:
-  - clang
-  - gcc
-
 os:
   - linux
   - osx
@@ -26,8 +22,18 @@ 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:
   - 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 --recurse-submodules
   - git clone https://github.com/generic-library/speex-dsp-lutin.git --recurse-submodules
   - git clone https://github.com/generic-library/z-lutin.git --recurse-submodules
@@ -37,12 +43,11 @@ before_script:
   - git clone https://github.com/musicdsp/audio-algo-drain.git
   - pwd
   - ls -l
-  - 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-drain-test
-  - ./out/Linux_x86_64/debug/staging/$BUILDER/audio-drain-test/usr/bin/audio-drain-test -l6
+  - lutin -w -j4 -C -P -c $BUILDER $COMPILATOR_OPTION -m $CONF $GCOV -p audio-drain-test
+  - ./out/Linux_x86_64/$CONF/staging/$BUILDER/audio-drain-test/usr/bin/audio-drain-test -l6
 
 notifications:
   email:
diff --git a/audio/drain/Algo.h b/audio/drain/Algo.h
index 128d67f..a4326ec 100644
--- a/audio/drain/Algo.h
+++ b/audio/drain/Algo.h
@@ -13,9 +13,9 @@
 #include <stdint.h>
 #include <audio/format.h>
 #include <audio/channel.h>
-#include <etk/chrono.h>
-#include <etk/functional.h>
-#include <etk/memory.h>
+#include <chrono>
+#include <functional>
+#include <memory>
 #include "AutoLogInOut.h"
 #include "IOFormatInterface.h"
 #include <audio/Time.h>
diff --git a/audio/drain/CircularBuffer.h b/audio/drain/CircularBuffer.h
index 856bbeb..12055bf 100644
--- a/audio/drain/CircularBuffer.h
+++ b/audio/drain/CircularBuffer.h
@@ -10,7 +10,7 @@
 
 #include <etk/types.h>
 #include <vector>
-#include <etk/chrono.h>
+#include <chrono>
 #include <audio/Time.h>
 #include <audio/Duration.h>
 
diff --git a/audio/drain/EndPointCallback.h b/audio/drain/EndPointCallback.h
index 4024ece..402dba8 100644
--- a/audio/drain/EndPointCallback.h
+++ b/audio/drain/EndPointCallback.h
@@ -8,7 +8,7 @@
 #define __AUDIO_DRAIN_ALGO_END_POINT_CALLBACK_H__
 
 #include <audio/drain/EndPoint.h>
-#include <etk/functional.h>
+#include <functional>
 
 namespace audio {
 	namespace drain {
diff --git a/audio/drain/EndPointWrite.h b/audio/drain/EndPointWrite.h
index 8116178..8422744 100644
--- a/audio/drain/EndPointWrite.h
+++ b/audio/drain/EndPointWrite.h
@@ -8,8 +8,8 @@
 #define __AUDIO_DRAIN_ALGO_ALGO_END_POINT_WRITE_H__
 
 #include <audio/drain/EndPoint.h>
-#include <etk/functional.h>
-#include <etk/mutex.h>
+#include <functional>
+#include <mutex>
 #include <audio/drain/CircularBuffer.h>
 
 namespace audio {
diff --git a/audio/drain/Equalizer.h b/audio/drain/Equalizer.h
index 7158c2b..c1103b5 100644
--- a/audio/drain/Equalizer.h
+++ b/audio/drain/Equalizer.h
@@ -8,7 +8,7 @@
 #define __AUDIO_DRAIN_ALGO_EQUALIZER_H__
 
 #include <audio/drain/Algo.h>
-#include <etk/memory.h>
+#include <memory>
 #include <ejson/Object.h>
 #include <audio/algo/drain/Equalizer.h>
 
diff --git a/audio/drain/IOFormatInterface.h b/audio/drain/IOFormatInterface.h
index 4fed8d7..c8acc34 100644
--- a/audio/drain/IOFormatInterface.h
+++ b/audio/drain/IOFormatInterface.h
@@ -13,9 +13,9 @@
 #include <stdint.h>
 #include <audio/format.h>
 #include <audio/channel.h>
-#include <etk/chrono.h>
-#include <etk/functional.h>
-#include <etk/memory.h>
+#include <chrono>
+#include <functional>
+#include <memory>
 #include "AutoLogInOut.h"
 #include "debug.h"
 
diff --git a/audio/drain/Process.h b/audio/drain/Process.h
index 8c24188..8542a8d 100644
--- a/audio/drain/Process.h
+++ b/audio/drain/Process.h
@@ -14,8 +14,8 @@
 #include <audio/format.h>
 #include <audio/channel.h>
 #include <audio/drain/Algo.h>
-#include <etk/chrono.h>
-#include <etk/memory.h>
+#include <chrono>
+#include <memory>
 #include <etk/os/FSNode.h>
 
 namespace audio {
diff --git a/audio/drain/Resampler.h b/audio/drain/Resampler.h
index 23d6837..64b0e57 100644
--- a/audio/drain/Resampler.h
+++ b/audio/drain/Resampler.h
@@ -11,7 +11,7 @@
 #ifdef HAVE_SPEEX_DSP_RESAMPLE
 	#include <speex/speex_resampler.h>
 #endif
-#include <etk/memory.h>
+#include <memory>
 
 namespace audio {
 	namespace drain {
diff --git a/audio/drain/Volume.h b/audio/drain/Volume.h
index 1ef7ae3..c381cec 100644
--- a/audio/drain/Volume.h
+++ b/audio/drain/Volume.h
@@ -11,7 +11,7 @@
 #ifdef HAVE_SPEEX_DSP_RESAMPLE
 	#include <speex/speex_resampler.h>
 #endif
-#include <etk/memory.h>
+#include <memory>
 
 namespace audio {
 	namespace drain {
diff --git a/audio/drain/airtalgo.h b/audio/drain/airtalgo.h
index 3af205f..c69f2ef 100644
--- a/audio/drain/airtalgo.h
+++ b/audio/drain/airtalgo.h
@@ -10,7 +10,7 @@
 #include <string>
 #include <audio/format.h>
 #include <audio/drain/channel.h>
-#include <etk/chrono.h>
+#include <chrono>
 
 namespace audio {
 	namespace drain {
diff --git a/lutin_audio-drain.py b/lutin_audio-drain.py
index 13bcff3..3d396f8 100644
--- a/lutin_audio-drain.py
+++ b/lutin_audio-drain.py
@@ -29,10 +29,30 @@ def create(target):
 		'audio/drain/Equalizer.cpp'
 		])
 	
+	myModule.add_header_file([
+		'audio/drain/debug.h',
+		'audio/drain/debugRemove.h',
+		'audio/drain/airtalgo.h',
+		'audio/drain/Algo.h',
+		'audio/drain/ChannelReorder.h',
+		'audio/drain/CircularBuffer.h',
+		'audio/drain/EndPointCallback.h',
+		'audio/drain/EndPoint.h',
+		'audio/drain/EndPointRead.h',
+		'audio/drain/EndPointWrite.h',
+		'audio/drain/FormatUpdate.h',
+		'audio/drain/Process.h',
+		'audio/drain/Resampler.h',
+		'audio/drain/Volume.h',
+		'audio/drain/IOFormatInterface.h',
+		'audio/drain/AutoLogInOut.h',
+		'audio/drain/Equalizer.h'
+		])
+	
 	# TODO: myModule.add_optional_module_depend('speexdsp', "HAVE_SPEEX_DSP_RESAMPLE")
 	myModule.compile_flags('c++', "-DHAVE_SPEEX_DSP_RESAMPLE")
 	myModule.add_module_depend(['etk', 'audio', 'ejson', 'speex-dsp', 'audio-algo-drain'])
-	myModule.add_export_path(tools.get_current_path(__file__))
+	myModule.add_path(tools.get_current_path(__file__))
 	
 	# add the currrent module at the 
 	return myModule