From 1f3a5dd4806df07914a5e3c9bb9979a3ec2f1b85 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/algo/river/Lms.h        |  4 ++--
 audio/algo/river/Nlms.h       |  4 ++--
 audio/algo/river/Suppressor.h |  4 ++--
 lutin_audio-algo-river.py     | 10 +++++++++-
 test/main.cpp                 |  2 +-
 6 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 48b53cd..d7fcbfd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,10 +3,6 @@ language:
 
 sudo: false
 
-compiler:
-  - clang
-  - gcc
-
 os:
   - linux
   - osx
@@ -26,19 +22,28 @@ 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 --recursive
   - git clone https://github.com/atria-soft/etk.git
   - git clone https://github.com/musicdsp/audio.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-algo-river-test
-#  - ./out/Linux_x86_64/debug/staging/$BUILDER/audio-algo-river-test/usr/bin/audio-algo-river-test -l6
+  - lutin -w -j4 -C -P -c $BUILDER $COMPILATOR_OPTION -m $CONF $GCOV -p audio-algo-river-test
+#  - ./out/Linux_x86_64/$CONF/staging/$BUILDER/audio-algo-river-test/usr/bin/audio-algo-river-test -l6
 
 notifications:
   email:
diff --git a/audio/algo/river/Lms.h b/audio/algo/river/Lms.h
index fdb5da6..5aa7099 100644
--- a/audio/algo/river/Lms.h
+++ b/audio/algo/river/Lms.h
@@ -9,9 +9,9 @@
 #define __AUDIO_ALGO_RIVER_LMS_H__
 
 #include <etk/types.h>
-#include <etk/chrono.h>
+#include <chrono>
 #include <audio/format.h>
-#include <etk/memory.h>
+#include <memory>
 
 namespace audio {
 	namespace algo {
diff --git a/audio/algo/river/Nlms.h b/audio/algo/river/Nlms.h
index 64caf4b..4c73faa 100644
--- a/audio/algo/river/Nlms.h
+++ b/audio/algo/river/Nlms.h
@@ -9,9 +9,9 @@
 #define __AUDIO_ALGO_RIVER_NLMS_H__
 
 #include <etk/types.h>
-#include <etk/chrono.h>
+#include <chrono>
 #include <audio/format.h>
-#include <etk/memory.h>
+#include <memory>
 
 namespace audio {
 	namespace algo {
diff --git a/audio/algo/river/Suppressor.h b/audio/algo/river/Suppressor.h
index 02d21b9..2aba097 100644
--- a/audio/algo/river/Suppressor.h
+++ b/audio/algo/river/Suppressor.h
@@ -9,9 +9,9 @@
 #define __AUDIO_ALGO_RIVER_LMS_H__
 
 #include <etk/types.h>
-#include <etk/chrono.h>
+#include <chrono>
 #include <audio/format.h>
-#include <etk/memory.h>
+#include <memory>
 
 namespace audio {
 	namespace algo {
diff --git a/lutin_audio-algo-river.py b/lutin_audio-algo-river.py
index dcfa895..12a59fe 100644
--- a/lutin_audio-algo-river.py
+++ b/lutin_audio-algo-river.py
@@ -18,8 +18,16 @@ def create(target):
 		'audio/algo/river/Nlms.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_export_path(tools.get_current_path(__file__))
+	myModule.add_path(tools.get_current_path(__file__))
 	# return module
 	return myModule
 
diff --git a/test/main.cpp b/test/main.cpp
index 5481262..d7c2c9c 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -9,7 +9,7 @@
 #include <audio/algo/river/Lms.h>
 #include <audio/algo/river/Nlms.h>
 #include <etk/os/FSNode.h>
-#include <etk/chrono.h>
+#include <chrono>
 #include <etk/thread/tools.h>
 
 #include <unistd.h>