diff options
| -rw-r--r-- | CAN-binder/etc/export.map | 2 | ||||
| -rw-r--r-- | CAN-binder/etc/macros.cmake | 7 | ||||
| -rw-r--r-- | CAN-binder/low-can-binding/binding/configuration-generated.cpp (renamed from CAN-binder/low-can-binding/configuration-generated.cpp) | 0 | ||||
| -rw-r--r-- | CAN-binder/low-can-binding/binding/configuration.cpp (renamed from CAN-binder/low-can-binding/configuration.cpp) | 0 | ||||
| -rw-r--r-- | CAN-binder/low-can-binding/binding/configuration.hpp (renamed from CAN-binder/low-can-binding/configuration.hpp) | 0 | ||||
| -rw-r--r-- | CAN-binder/low-can-binding/binding/low-can-binding.cpp (renamed from CAN-binder/low-can-binding/low-can-binding.cpp) | 0 | ||||
| -rw-r--r-- | CAN-binder/low-can-binding/binding/low-can-binding.hpp (renamed from CAN-binder/low-can-binding/low-can-binding.hpp) | 0 | ||||
| -rw-r--r-- | CAN-binder/low-can-binding/packaging/wgt/config.xml | 11 | ||||
| -rw-r--r-- | CAN-binder/low-can-binding/packaging/wgt/etc/can_buses.json | 3 | ||||
| -rw-r--r-- | CAN-binder/low-can-binding/packaging/wgt/icon.png | bin | 4035 -> 0 bytes |
10 files changed, 4 insertions, 19 deletions
diff --git a/CAN-binder/etc/export.map b/CAN-binder/etc/export.map index 52c1b4aa..ee2f4133 100644 --- a/CAN-binder/etc/export.map +++ b/CAN-binder/etc/export.map @@ -1 +1 @@ -{ global: afbBindingV1*; local: *; }; +{ global: afbBindingV*; local: *; }; diff --git a/CAN-binder/etc/macros.cmake b/CAN-binder/etc/macros.cmake index afad28a6..5e00b9d0 100644 --- a/CAN-binder/etc/macros.cmake +++ b/CAN-binder/etc/macros.cmake @@ -75,29 +75,28 @@ macro(populate_widget) set(POPULE_WIDGET_TARGET "populate_${TARGET_NAME}") get_target_property(T ${TARGET_NAME} LABELS) + get_target_property(OUT ${TARGET_NAME} OUTPUT_NAME) if(${T} STREQUAL "BINDING") add_custom_command(OUTPUT ${WIDGET_LIBDIR}/${TARGET_NAME}.so DEPENDS ${TARGET_NAME} COMMAND mkdir -p ${WIDGET_LIBDIR} - COMMAND cp ${TARGET_NAME}.so ${WIDGET_LIBDIR} + COMMAND cp ${OUT}.so ${WIDGET_LIBDIR} ) add_custom_target(${POPULE_WIDGET_TARGET} ALL DEPENDS ${WIDGET_LIBDIR}/${TARGET_NAME}.so) elseif(${T} STREQUAL "EXECUTABLE") add_custom_command(OUTPUT ${WIDGET_BINDIR}/${TARGET_NAME} DEPENDS ${TARGET_NAME} COMMAND mkdir -p ${WIDGET_BINDIR} - COMMAND cp ${TARGET_NAME} ${WIDGET_BINDIR} + COMMAND cp ${OUT} ${WIDGET_BINDIR} ) add_custom_target(${POPULE_WIDGET_TARGET} ALL DEPENDS ${WIDGET_BINDIR}/${TARGET_NAME}) elseif(${T} STREQUAL "HTDOCS") - get_target_property(OUT ${TARGET_NAME} OUTPUT_NAME) add_custom_command(OUTPUT ${WIDGET_HTTPDIR} DEPENDS ${TARGET_NAME} COMMAND cp -r ${OUT} ${WIDGET_HTTPDIR} ) add_custom_target(${POPULE_WIDGET_TARGET} ALL DEPENDS ${WIDGET_HTTPDIR}) elseif(${T} STREQUAL "DATA") - get_target_property(OUT ${TARGET_NAME} OUTPUT_NAME) add_custom_command(OUTPUT ${WIDGET_DATADIR} DEPENDS ${TARGET_NAME} COMMAND cp -r ${OUT} ${WIDGET_DATADIR} diff --git a/CAN-binder/low-can-binding/configuration-generated.cpp b/CAN-binder/low-can-binding/binding/configuration-generated.cpp index c3cecc5d..c3cecc5d 100644 --- a/CAN-binder/low-can-binding/configuration-generated.cpp +++ b/CAN-binder/low-can-binding/binding/configuration-generated.cpp diff --git a/CAN-binder/low-can-binding/configuration.cpp b/CAN-binder/low-can-binding/binding/configuration.cpp index 05d36960..05d36960 100644 --- a/CAN-binder/low-can-binding/configuration.cpp +++ b/CAN-binder/low-can-binding/binding/configuration.cpp diff --git a/CAN-binder/low-can-binding/configuration.hpp b/CAN-binder/low-can-binding/binding/configuration.hpp index a3ab8caa..a3ab8caa 100644 --- a/CAN-binder/low-can-binding/configuration.hpp +++ b/CAN-binder/low-can-binding/binding/configuration.hpp diff --git a/CAN-binder/low-can-binding/low-can-binding.cpp b/CAN-binder/low-can-binding/binding/low-can-binding.cpp index 484bb5c7..484bb5c7 100644 --- a/CAN-binder/low-can-binding/low-can-binding.cpp +++ b/CAN-binder/low-can-binding/binding/low-can-binding.cpp diff --git a/CAN-binder/low-can-binding/low-can-binding.hpp b/CAN-binder/low-can-binding/binding/low-can-binding.hpp index ed5741d8..ed5741d8 100644 --- a/CAN-binder/low-can-binding/low-can-binding.hpp +++ b/CAN-binder/low-can-binding/binding/low-can-binding.hpp diff --git a/CAN-binder/low-can-binding/packaging/wgt/config.xml b/CAN-binder/low-can-binding/packaging/wgt/config.xml deleted file mode 100644 index d735ce2b..00000000 --- a/CAN-binder/low-can-binding/packaging/wgt/config.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<widget xmlns="http://www.w3.org/ns/widgets" id="@PROJECT_NAME@" version="@PROJECT_VERSION@"> - <name>@PROJECT_NAME@</name> - <icon src="icon.png"/> - <content src="libs" type="application/vnd.agl.service"/> - <description>This is a demo application used to control and dialog with HVAC system</description> - <author>Romain Forlot <romain.forlot@iot.bzh></author> - <license>APL 2.0</license> -</widget> - - diff --git a/CAN-binder/low-can-binding/packaging/wgt/etc/can_buses.json b/CAN-binder/low-can-binding/packaging/wgt/etc/can_buses.json deleted file mode 100644 index c4292df2..00000000 --- a/CAN-binder/low-can-binding/packaging/wgt/etc/can_buses.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "canbus": "can0" -} diff --git a/CAN-binder/low-can-binding/packaging/wgt/icon.png b/CAN-binder/low-can-binding/packaging/wgt/icon.png Binary files differdeleted file mode 100644 index 9bd6a6e4..00000000 --- a/CAN-binder/low-can-binding/packaging/wgt/icon.png +++ /dev/null |
