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>

11 files changed, 8 insertions, 18 deletions

diff --git a/afb-helpers b/afb-helpers
-Subproject 43ec9716bf83d8a6e5ff15909705cb1adc3c189
+Subproject a37225fc0c56ef75abce79373b66e8349d427ff
diff --git a/conf.d/app-templates b/conf.d/app-templates
-Subproject aa68dbd12c60f9eb0015a508a22d8650914f8e5
+Subproject f94e45e8a48e16e3001cb55c4f8c3c0a2a2c9e2
diff --git a/conf.d/cmake/00-debian-osconfig.cmake b/conf.d/cmake/00-debian-osconfig.cmake
deleted file mode 100644
index 2ce0ad3..0000000
--- a/conf.d/cmake/00-debian-osconfig.cmake
+++ /dev/null
@@ -1 +0,0 @@
-list(APPEND PKG_REQUIRED_LIST lua-5.3>=5.3)
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index cd1dee1..446534c 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -19,7 +19,6 @@
 # Project Info
 # ------------------
 set(PROJECT_NAME signal-composer)
-set(PROJECT_VERSION "5.0")
 set(PROJECT_PRETTY_NAME "Signal composer")
 set(PROJECT_DESCRIPTION "Signal composer API connected to low level AGL services")
 set(PROJECT_URL "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/agl-service-signal-composer")
@@ -45,7 +44,7 @@ set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates")
 
 # Compilation Mode (DEBUG, RELEASE)
 # ----------------------------------
-set(CMAKE_BUILD_TYPE "DEBUG")
+set(BUILD_TYPE "DEBUG")
 
 
 # Kernel selection if needed. You can choose between a
@@ -79,7 +78,7 @@ set (PKG_REQUIRED_LIST
 # Prefix path where will be installed the files
 # Default: /usr/local (need root permission to write in)
 # ------------------------------------------------------
-set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt)
+set(INSTALL_PREFIX $ENV{HOME}/opt)
 
 # Customize link option
 # -----------------------------
@@ -132,11 +131,7 @@ set(CONTROL_SUPPORT_LUA 1)
 add_definitions(-DCONTROL_PLUGIN_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib/plugins:${CMAKE_BINARY_DIR}/package/lib/plugins:${CMAKE_BINARY_DIR}/package/var")
 add_definitions(-DCONTROL_CONFIG_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/etc:${CMAKE_BINARY_DIR}/package/etc")
 add_definitions(-DCTL_PLUGIN_MAGIC=1286576532)
-
-# (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable]
-# ---------------------------------------------------------------------
-set(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/lib64/pkgconfig ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
-set(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib)
+add_definitions(-DAFB_BINDING_VERSION=2)
 
 # Optional location for config.xml.in
 # -----------------------------------
diff --git a/ctl-utilities b/ctl-utilities
-Subproject 1ff524bc55b3ff10b7ab2a5f2cafbb41fce2294
+Subproject ff14c58cb3390065a20f598d58efaea088d7107
diff --git a/plugins/builtin.cpp b/plugins/builtin.cpp
index b42bd1d..e56d413 100644
--- a/plugins/builtin.cpp
+++ b/plugins/builtin.cpp
@@ -16,7 +16,6 @@
  *
 */
 
-#define AFB_BINDING_VERSION 2
 #include <afb/afb-binding.h>
 #include <systemd/sd-event.h>
 #include <json-c/json_object.h>
diff --git a/plugins/gps.cpp b/plugins/gps.cpp
index 60aa80a..646754a 100644
--- a/plugins/gps.cpp
+++ b/plugins/gps.cpp
@@ -18,7 +18,6 @@
 
 #define CTL_PLUGIN_MAGIC 1286576532
 
-#define AFB_BINDING_VERSION 2
 #include <afb/afb-binding.h>
 #include <systemd/sd-event.h>
 #include <json-c/json_object.h>
diff --git a/plugins/low-can.cpp b/plugins/low-can.cpp
index e3b505e..7bbe763 100644
--- a/plugins/low-can.cpp
+++ b/plugins/low-can.cpp
@@ -16,7 +16,6 @@
  *
 */
 
-#define AFB_BINDING_VERSION 2
 #define CTL_PLUGIN_MAGIC 1286576532
 #include <afb/afb-binding.h>
 #include <systemd/sd-event.h>
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}