Install step created by app-templates submodule

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

diff --git a/conf.d/app-templates b/conf.d/app-templates
index 5b4dfe2..42e5f14 160000 (submodule)
--- a/conf.d/app-templates
+++ b/conf.d/app-templates
@@ -1 +1 @@
-Subproject commit 5b4dfe23ef1141d8f7595a157ca7a8ee5ad8ad07
+Subproject commit 42e5f14ffa00542385d0d60ee8b00494f590ab8c

diff --git a/conf.d/autobuild/agl/autobuild b/conf.d/autobuild/agl/autobuild
index 759f6be..4811441 100755 (executable)
--- a/conf.d/autobuild/agl/autobuild
+++ b/conf.d/autobuild/agl/autobuild
@@ -18,7 +18,7 @@ THISFILE  := $(lastword $(MAKEFILE_LIST))
 BUILD_DIR := $(abspath $(dir $(THISFILE)/../../../../..)/build)
 DEST      := ${BUILD_DIR}/target
 
-.PHONY: all clean distclean configure build package help
+.PHONY: all clean distclean configure build package help update
 
 all: help
 
@@ -35,6 +35,9 @@ help:
        @echo "Usage: ./conf.d/autobuild/agl/autobuild package DEST=${HOME}/opt"
        @echo "Don't use your build dir as DEST as wgt file is generated at this location"
 
+update: configure
+       @cmake --build ${BUILD_DIR} --target autobuild
+
 clean:
        @([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} clean) || echo Nothing to clean
 

diff --git a/conf.d/autobuild/linux/autobuild b/conf.d/autobuild/linux/autobuild
index 759f6be..4811441 100755 (executable)
--- a/conf.d/autobuild/linux/autobuild
+++ b/conf.d/autobuild/linux/autobuild
@@ -18,7 +18,7 @@ THISFILE  := $(lastword $(MAKEFILE_LIST))
 BUILD_DIR := $(abspath $(dir $(THISFILE)/../../../../..)/build)
 DEST      := ${BUILD_DIR}/target
 
-.PHONY: all clean distclean configure build package help
+.PHONY: all clean distclean configure build package help update
 
 all: help
 
@@ -35,6 +35,9 @@ help:
        @echo "Usage: ./conf.d/autobuild/agl/autobuild package DEST=${HOME}/opt"
        @echo "Don't use your build dir as DEST as wgt file is generated at this location"
 
+update: configure
+       @cmake --build ${BUILD_DIR} --target autobuild
+
 clean:
        @([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} clean) || echo Nothing to clean
 

diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 553845d..56b0898 100644 (file)
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -89,11 +89,6 @@ set(CXX_COMPILE_OPTIONS -pthread CACHE STRING "Compilation flags for C++ languag
 #set(CCOV_COMPILE_OPTIONS "-g -O2 --coverage" CACHE STRING "Compilation flags for CCOV build type.")
 #set(RELEASE_COMPILE_OPTIONS "-g -O2" CACHE STRING "Compilation flags for RELEASE build type.")
 
-# Print a helper message when every thing is finished
-# ----------------------------------------------------
-set(CLOSING_MESSAGE "Test with: afb-daemon --rootdir=\$\$(pwd)/package --binding=\$\$(pwd)/package/lib/afb-low-can.so --port=1234 --tracereq=common --token=\"1\" --verbose")
-set(PACKAGE_MESSAGE "Install widget file using in the target : afm-util install ${PROJECT_NAME}.wgt")
-
 # (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable]
 # ---------------------------------------------------------------------
 set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt)
@@ -102,6 +97,7 @@ set(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib)
 
 # Optional location for config.xml.in
 # -----------------------------------
+set(WIDGET_ICON ${PROJECT_APP_TEMPLATES_DIR}/wgt/${PROJECT_ICON})
 set(WIDGET_CONFIG_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/conf.d/wgt/config.xml.in)
 
 # Mandatory widget Mimetype specification of the main unit
@@ -158,6 +154,18 @@ set(WIDGET_ENTRY_POINT lib/afb-low-can.so)
 #set(AFB_TOKEN   ""      CACHE PATH "Default AFB_TOKEN")
 #set(AFB_REMPORT "1234" CACHE PATH "Default AFB_TOKEN")
 
+# Optional schema validator about now only XML, LUA and JSON
+# are supported
+#------------------------------------------------------------
+#set(LUA_CHECKER "luac" "-p" CACHE STRING "LUA compiler")
+#set(XML_CHECKER "xmllint" CACHE STRING "XML linter")
+#set(JSON_CHECKER "json_verify" CACHE STRING "JSON linter")
+
+# Print a helper message when every thing is finished
+# ----------------------------------------------------
+set(CLOSING_MESSAGE "Test with: afb-daemon --rootdir=\$\$(pwd)/package --binding=\$\$(pwd)/package/lib/afb-low-can.so --port=1234 --tracereq=common --token=\"1\" --verbose")
+set(PACKAGE_MESSAGE "Install widget file using in the target : afm-util install ${PROJECT_NAME}.wgt")
+
 # This include is mandatory and MUST happens at the end
 # of this file, else you expose you to unexpected behavior
 # -----------------------------------------------------------

diff --git a/low-can-binding/CMakeLists.txt b/low-can-binding/CMakeLists.txt
index 44ae9ef..9742580 100644 (file)
--- a/low-can-binding/CMakeLists.txt
+++ b/low-can-binding/CMakeLists.txt
@@ -63,7 +63,3 @@ PROJECT_TARGET_ADD(low-can)
                bitfield-c
                ${link_libraries})
 
-       # installation directory
-       INSTALL(TARGETS ${TARGET_NAME}
-               LIBRARY DESTINATION ${BINDINGS_INSTALL_DIR})
-