From: Romain Forlot <romain.forlot@iot.bzh>
Date: Thu, 4 May 2017 12:28:09 +0000 (+0200)
Subject: Update with last app-templates modifications
X-Git-Tag: 3.99.1~91
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=9e86564a58a0f9c83edc5bb76fd8ab4c7e7a63ee;p=apps%2Flow-level-can-service.git

Update with last app-templates modifications

https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/app-templates

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

diff --git a/CAN-binder/etc/export.map b/CAN-binder/etc/export.map
index 52c1b4a..ee2f413 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 afad28a..5e00b9d 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 d735ce2..0000000
--- 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 &lt;romain.forlot@iot.bzh&gt;</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 c4292df..0000000
--- 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 9bd6a6e..0000000
Binary files a/CAN-binder/low-can-binding/packaging/wgt/icon.png and /dev/null differ