From 9e86564a58a0f9c83edc5bb76fd8ab4c7e7a63ee Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Thu, 4 May 2017 14:28:09 +0200 Subject: [PATCH] Update with last app-templates modifications https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/app-templates Change-Id: I42eff75b790b70047e1b91b963edf458084881c9 Signed-off-by: Romain Forlot --- CAN-binder/etc/export.map | 2 +- CAN-binder/etc/macros.cmake | 7 +++---- .../{ => binding}/configuration-generated.cpp | 0 .../low-can-binding/{ => binding}/configuration.cpp | 0 .../low-can-binding/{ => binding}/configuration.hpp | 0 .../low-can-binding/{ => binding}/low-can-binding.cpp | 0 .../low-can-binding/{ => binding}/low-can-binding.hpp | 0 CAN-binder/low-can-binding/packaging/wgt/config.xml | 11 ----------- .../low-can-binding/packaging/wgt/etc/can_buses.json | 3 --- CAN-binder/low-can-binding/packaging/wgt/icon.png | Bin 4035 -> 0 bytes 10 files changed, 4 insertions(+), 19 deletions(-) rename CAN-binder/low-can-binding/{ => binding}/configuration-generated.cpp (100%) rename CAN-binder/low-can-binding/{ => binding}/configuration.cpp (100%) rename CAN-binder/low-can-binding/{ => binding}/configuration.hpp (100%) rename CAN-binder/low-can-binding/{ => binding}/low-can-binding.cpp (100%) rename CAN-binder/low-can-binding/{ => binding}/low-can-binding.hpp (100%) delete mode 100644 CAN-binder/low-can-binding/packaging/wgt/config.xml delete mode 100644 CAN-binder/low-can-binding/packaging/wgt/etc/can_buses.json delete mode 100644 CAN-binder/low-can-binding/packaging/wgt/icon.png 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 similarity index 100% rename from CAN-binder/low-can-binding/configuration-generated.cpp rename to 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 similarity index 100% rename from CAN-binder/low-can-binding/configuration.cpp rename to 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 similarity index 100% rename from CAN-binder/low-can-binding/configuration.hpp rename to 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 similarity index 100% rename from CAN-binder/low-can-binding/low-can-binding.cpp rename to 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 similarity index 100% rename from CAN-binder/low-can-binding/low-can-binding.hpp rename to 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 @@ - - - @PROJECT_NAME@ - - - This is a demo application used to control and dialog with HVAC system - Romain Forlot <romain.forlot@iot.bzh> - APL 2.0 - - - 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 deleted file mode 100644 index 9bd6a6e44f14c6dfeb5b25fe4e19555c5620bd12..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4035 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