diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2018-07-19 11:29:33 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2018-07-22 00:08:12 +0200 |
| commit | 1eb97bc1126943b2d2a3ef631ed019231ba06da5 (patch) | |
| tree | b17ceb2d891d3d8ec7aacc555898d8aaf0db734f /plugins | |
| parent | 64fcae698a48acf6bd7f05d168b5cd4badcf0bd3 (diff) | |
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>
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/builtin.cpp | 1 | ||||
| -rw-r--r-- | plugins/gps.cpp | 1 | ||||
| -rw-r--r-- | plugins/low-can.cpp | 1 |
3 files changed, 0 insertions, 3 deletions
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> |