Fix the build for master with latest binder

Update config.cmake file with app-templates improvments:

- Now versioning is handled by app-templates based on gerrit tags
- Binding version set up in config.cmake rather than in code.
- Update variables name for build type and install prefix.

Submodule afb-helpers 43ec971..a37225f:
  > Fix: use of GetBindingDirPath without dynapi
  > Retrieve directory list from environment variables
  > Remove the file .gitmodules
  > Remove unnecessary 'AFB_DEBUG' redefinition
  > Use binding version to handle dynapi
  > At search, use the prefix parameter as a prefix
  > Remove deprecated use of cmake/Qt macro
  > Rename method to avoid conflict with Qt's one

Submodule conf.d/app-templates aa68dbd..f94e45e:
  > Align sample on actual default compile options
  > Add support to binding version 3.
  > Warning if not using wgtpkg-pack to make a widget
  > Rework CMAKE_INSTALL_PREFIX and INSTALL_PREFIX var
  > Be able to overwrite BUILD_TYPE using CLI
  > Use CACHE variable for other common CMAKE variable
  > Fix:: wrong wgt using RELEASE BUILD TYPE
  > Fix: SYSROOT location detection... Wrong test.
  > Change the default debug compilation options.
  > Clearer coverage compilation options configuration

Submodule ctl-utilities 1ff524b..ff14c58:
  > Fix : typo introduced in a previous commit.
  > Use prefix variable to find controller's plugins
  > Use binding version to set controller definitions
  > ctl-lua: typo fix
  > asynchronism for test: LockWait added
  > Fix: plugin api assignement order
  > Execute ConfigExec only if section is existing
  > Always set the api member even if NULL.
  > Ability to add a plugin after the initial load
  > Be able to dispatch required api at the wanted time

Depends-On : I135a723d21d70b8c54f4cab1c534210757318ed0

Change-Id: I90938f53dd1f606b3aa39a549e618c0fe413870c
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

3 files changed, 5 insertions, 6 deletions

diff --git a/signal-composer-binding/signal-composer-binding.cpp b/signal-composer-binding/signal-composer-binding.cpp
index 50eb03b..0d9c8e3 100644
--- a/signal-composer-binding/signal-composer-binding.cpp
+++ b/signal-composer-binding/signal-composer-binding.cpp
@@ -265,7 +265,7 @@ void get(struct afb_req request)
 int loadConf()
 {
 	int err = 0;
-	std::string bindingDirPath = GetBindingDirPath(nullptr);
+	std::string bindingDirPath = GetBindingDirPath();
 	std::string rootdir = bindingDirPath + "/etc";
 
 	err = Composer::instance().loadConfig(rootdir);
diff --git a/signal-composer-binding/signal-composer-binding.hpp b/signal-composer-binding/signal-composer-binding.hpp
index 24943ca..8ffdd76 100644
--- a/signal-composer-binding/signal-composer-binding.hpp
+++ b/signal-composer-binding/signal-composer-binding.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#define AFB_BINDING_VERSION 2
 #include <afb/afb-binding>
 
 void onEvent(const char *event, struct json_object *object);
diff --git a/signal-composer-binding/signal-composer.cpp b/signal-composer-binding/signal-composer.cpp
index 4b92f7e..535e85b 100644
--- a/signal-composer-binding/signal-composer.cpp
+++ b/signal-composer-binding/signal-composer.cpp
@@ -62,19 +62,19 @@ static struct signalCBT pluginHandle = {
 };
 
 CtlSectionT Composer::ctlSections_[] = {
-	[0]={.key="plugins" , .uid="plugins", .info=nullptr,
+	[0]={.key="plugins" , .uid="plugins", .info=nullptr, .prefix=nullptr,
 		.loadCB=PluginConfig,
 		.handle=&pluginHandle,
 		.actions=nullptr},
-	[1]={.key="sources" , .uid="sources", .info=nullptr,
+	[1]={.key="sources" , .uid="sources", .info=nullptr, .prefix=nullptr,
 		 .loadCB=loadSourcesAPI,
 		 .handle=nullptr,
 		 .actions=nullptr},
-	[2]={.key="signals" , .uid="signals", .info=nullptr,
+	[2]={.key="signals" , .uid="signals", .info=nullptr, .prefix=nullptr,
 		 .loadCB=loadSignals,
 		 .handle=nullptr,
 		 .actions=nullptr},
-	[3]={.key=nullptr, .uid=nullptr, .info=nullptr,
+	[3]={.key=nullptr, .uid=nullptr, .info=nullptr, .prefix=nullptr,
 		 .loadCB=nullptr,
 		 .handle=nullptr,
 		 .actions=nullptr}