From dbd66a0157326ebe7b2f288ef8f8916abcbfd98b 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/river/Interface.h          |  8 ++++----
 audio/river/Manager.h            |  2 +-
 audio/river/io/Manager.cpp       |  2 +-
 audio/river/io/Manager.h         |  8 ++++----
 audio/river/io/Node.h            |  6 +++---
 audio/river/io/NodeAEC.cpp       |  4 ++--
 audio/river/io/NodeFile.cpp      |  2 +-
 audio/river/io/NodeMuxer.cpp     |  4 ++--
 audio/river/io/NodeOrchestra.cpp |  2 +-
 audio/river/io/NodePortAudio.cpp |  2 +-
 lutin_audio-river.py             | 10 +++++++++-
 test/main.cpp                    |  2 +-
 13 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c4bb659..7ed373a 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 --recursive
   - git clone https://github.com/generic-library/speex-dsp-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
   - 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-river-test
-#  - ./out/Linux_x86_64/debug/staging/$BUILDER/audio-river-test/usr/bin/audio-river-test -l6
+  - lutin -w -j4 -C -P -c $BUILDER $COMPILATOR_OPTION -m $CONF $GCOV -p audio-river-test
+#  - ./out/Linux_x86_64/$CONF/staging/$BUILDER/audio-river-test/usr/bin/audio-river-test -l6
 
 notifications:
   email:
diff --git a/audio/river/Interface.h b/audio/river/Interface.h
index 342a990..e00a663 100644
--- a/audio/river/Interface.h
+++ b/audio/river/Interface.h
@@ -10,10 +10,10 @@
 #include <string>
 #include <vector>
 #include <stdint.h>
-#include <etk/mutex.h>
-#include <etk/chrono.h>
-#include <etk/functional.h>
-#include <etk/memory.h>
+#include <mutex>
+#include <chrono>
+#include <functional>
+#include <memory>
 #include <audio/format.h>
 #include <audio/channel.h>
 #include <audio/drain/Process.h>
diff --git a/audio/river/Manager.h b/audio/river/Manager.h
index 375eb4f..dcd5f18 100644
--- a/audio/river/Manager.h
+++ b/audio/river/Manager.h
@@ -9,7 +9,7 @@
 
 #include <string>
 #include <stdint.h>
-#include <etk/memory.h>
+#include <memory>
 #include <audio/river/Interface.h>
 #include <audio/format.h>
 #include <audio/channel.h>
diff --git a/audio/river/io/Manager.cpp b/audio/river/io/Manager.cpp
index 5910e34..15730af 100644
--- a/audio/river/io/Manager.cpp
+++ b/audio/river/io/Manager.cpp
@@ -13,7 +13,7 @@
 #include <audio/river/io/NodeOrchestra.h>
 #include <audio/river/io/NodePortAudio.h>
 #include <etk/os/FSNode.h>
-#include <etk/memory.h>
+#include <memory>
 #include <etk/types.h>
 #include <utility>
 
diff --git a/audio/river/io/Manager.h b/audio/river/io/Manager.h
index f6047e0..dff5ecd 100644
--- a/audio/river/io/Manager.h
+++ b/audio/river/io/Manager.h
@@ -12,10 +12,10 @@
 #include <map>
 #include <list>
 #include <stdint.h>
-#include <etk/mutex.h>
-#include <etk/chrono.h>
-#include <etk/functional.h>
-#include <etk/memory.h>
+#include <mutex>
+#include <chrono>
+#include <functional>
+#include <memory>
 #include <audio/format.h>
 #include <audio/channel.h>
 #include <ejson/ejson.h>
diff --git a/audio/river/io/Node.h b/audio/river/io/Node.h
index bb425c6..139c6ac 100644
--- a/audio/river/io/Node.h
+++ b/audio/river/io/Node.h
@@ -11,9 +11,9 @@
 #include <vector>
 #include <list>
 #include <stdint.h>
-#include <etk/chrono.h>
-#include <etk/functional.h>
-#include <etk/memory.h>
+#include <chrono>
+#include <functional>
+#include <memory>
 #include <audio/format.h>
 #include <audio/channel.h>
 #include "Manager.h"
diff --git a/audio/river/io/NodeAEC.cpp b/audio/river/io/NodeAEC.cpp
index 78546ec..0a478e8 100644
--- a/audio/river/io/NodeAEC.cpp
+++ b/audio/river/io/NodeAEC.cpp
@@ -7,8 +7,8 @@
 #include <audio/river/io/NodeAEC.h>
 #include <audio/river/debug.h>
 #include <etk/types.h>
-#include <etk/memory.h>
-#include <etk/functional.h>
+#include <memory>
+#include <functional>
 
 #undef __class__
 #define __class__ "io::NodeAEC"
diff --git a/audio/river/io/NodeFile.cpp b/audio/river/io/NodeFile.cpp
index 21de59f..8bc0fa5 100644
--- a/audio/river/io/NodeFile.cpp
+++ b/audio/river/io/NodeFile.cpp
@@ -8,7 +8,7 @@
 
 #include <audio/river/io/NodeFile.h>
 #include <audio/river/debug.h>
-#include <etk/memory.h>
+#include <memory>
 
 #undef __class__
 #define __class__ "io::NodeFile"
diff --git a/audio/river/io/NodeMuxer.cpp b/audio/river/io/NodeMuxer.cpp
index f82b720..bb4b62f 100644
--- a/audio/river/io/NodeMuxer.cpp
+++ b/audio/river/io/NodeMuxer.cpp
@@ -7,8 +7,8 @@
 #include <audio/river/io/NodeMuxer.h>
 #include <audio/river/debug.h>
 #include <etk/types.h>
-#include <etk/memory.h>
-#include <etk/functional.h>
+#include <memory>
+#include <functional>
 
 #undef __class__
 #define __class__ "io::NodeMuxer"
diff --git a/audio/river/io/NodeOrchestra.cpp b/audio/river/io/NodeOrchestra.cpp
index 25f4028..34a505e 100644
--- a/audio/river/io/NodeOrchestra.cpp
+++ b/audio/river/io/NodeOrchestra.cpp
@@ -8,7 +8,7 @@
 
 #include <audio/river/io/NodeOrchestra.h>
 #include <audio/river/debug.h>
-#include <etk/memory.h>
+#include <memory>
 
 #undef __class__
 #define __class__ "io::NodeOrchestra"
diff --git a/audio/river/io/NodePortAudio.cpp b/audio/river/io/NodePortAudio.cpp
index a622558..38e7295 100644
--- a/audio/river/io/NodePortAudio.cpp
+++ b/audio/river/io/NodePortAudio.cpp
@@ -8,7 +8,7 @@
 
 #include <audio/river/io/NodePortAudio.h>
 #include <audio/river/debug.h>
-#include <etk/memory.h>
+#include <memory>
 #include <audio/Time.h>
 #include <audio/Duration.h>
 
diff --git a/lutin_audio-river.py b/lutin_audio-river.py
index 63db134..102ba54 100644
--- a/lutin_audio-river.py
+++ b/lutin_audio-river.py
@@ -22,10 +22,18 @@ def create(target):
 		'audio/river/io/NodeMuxer.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('portaudio', ["c++", "-DAUDIO_RIVER_BUILD_PORTAUDIO"])
 	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 
 	return myModule
diff --git a/test/main.cpp b/test/main.cpp
index c25ebcf..1ac2276 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -14,7 +14,7 @@
 #include <math.h>
 #include <sstream>
 #include <unistd.h>
-#include <etk/thread.h>
+#include <thread>
 #include "testAEC.h"
 #include "testEchoDelay.h"
 #include "testFormat.h"