Update build and package configuration file.

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

diff --git a/CAN-binder/conf.d/app-templates b/CAN-binder/conf.d/app-templates
index cc640c4..21ae95d 160000 (submodule)
--- a/CAN-binder/conf.d/app-templates
+++ b/CAN-binder/conf.d/app-templates
@@ -1 +1 @@
-Subproject commit cc640c4cfed7d4a35cbbdbb23e09b9e76c88902b
+Subproject commit 21ae95d8eb61745ca54fd143e25dba065a817f6a

diff --git a/CAN-binder/conf.d/config.cmake b/CAN-binder/conf.d/config.cmake
index 8340a26..0b0cfa0 100644 (file)
--- a/CAN-binder/conf.d/config.cmake
+++ b/CAN-binder/conf.d/config.cmake
@@ -80,6 +80,31 @@ set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt)
 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)
 
+# Optional location for config.xml.in
+# -----------------------------------
+set(WIDGET_CONFIG_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/conf.d/wgt/config.xml.in)
+
+# Mandatory widget Mimetype specification
+# --------------------------------------------------
+# Choose between :
+# - application/vnd.agl.service
+# - application/vnd.agl.native
+# - application/x-executable
+# - text/html
+#
+set(WIDGET_TYPE application/vnd.agl.service)
+
+# Mandatory Widget entry point file.
+# ----------------------------------------------------
+# This is the file that will be executed, loaded,...
+# at launch time by the application framework
+#
+# !IMPORTANT! : Service Widget Mimetype has to specified
+# the WIDGET_ENTRY_POINT "lib" which is the default directory
+# that holds the bindings.
+#
+set(WIDGET_ENTRY_POINT lib/afs-low-can.so)
+
 # Optional dependencies order
 # ---------------------------
 #set(EXTRA_DEPENDENCIES_ORDER)
@@ -92,12 +117,20 @@ set(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib)
 # -------------------------
 #set(EXTRA_LINK_LIBRARIES)
 
-# Optional force installation prefix
+# Optional force binding installation
 # ------------------------------------
-set(INSTALL_PREFIX /opt )
-# set(WIDGET_PREFIX DestinationPath)
+# set(BINDINGS_INSTALL_PREFIX PrefixPath )
 
 # Optional force binding Linking flag
 # ------------------------------------
 # set(BINDINGS_LINK_FLAG LinkOptions )
 
+# Optional force package prefix generation, like widget
+# -----------------------------------------------------
+# set(PACKAGE_PREFIX DestinationPath)
+
+# Optional Application Framework security token
+# and port use for remote debugging.
+#------------------------------------------------------------
+#set(AFB_TOKEN   ""      CACHE PATH "Default AFB_TOKEN")
+#set(AFB_REMPORT "1234" CACHE PATH "Default AFB_TOKEN")

diff --git a/CAN-binder/conf.d/wgt/config.xml.in b/CAN-binder/conf.d/wgt/config.xml.in
new file mode 100644 (file)
index 0000000..7e14751
--- /dev/null
+++ b/CAN-binder/conf.d/wgt/config.xml.in
@@ -0,0 +1,20 @@
+<?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="@PROJECT_ICON@"/>
+       <content src="@WIDGET_ENTRY_POINT@" type="@WIDGET_TYPE@"/>
+       <description>@PROJECT_DESCRIPTION@</description>
+       <author>@PROJECT_AUTHOR@ &lt;@PROJECT_AUTHOR_MAIL@&gt;</author>
+       <license>@PROJECT_LICENSE@</license>
+
+       <feature name="urn:AGL:widget:required-permission">
+               <param name="#target" value="main" />
+               <param name="urn:AGL:permission::public:no-htdocs" value="required" />
+               <param name="urn:AGL:permission::owner:car:*" value="required" />
+       </feature>
+
+       <feature name="urn:AGL:widget:provided-api">
+               <param name="#target" value="main" />
+               <param name="low-can" value="ws" />
+       </feature>
+</widget>