Updates to fix building with SDK and remove submodule usageicefish_8.99.5icefish_8.99.4icefish_8.99.3icefish/8.99.5icefish/8.99.4icefish/8.99.38.99.58.99.48.99.3

Update the autobuild script and CMake files to work with the SDK, and
remove now deprecated usage of the app-templates submodule.

Bug-AGL: SPEC-3055

Change-Id: I720f4d530dbd749e8426b3f12d04ad2b34d700d4
Signed-off-by: Scott Murray <scott.murray@konsulko.com>

5 files changed, 77 insertions, 35 deletions

diff --git a/.gitignore b/.gitignore
index b25c15b..5975d97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *~
+build/
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index b545da1..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "conf.d/app-templates"]
-	path = conf.d/app-templates
-	url = https://gerrit.automotivelinux.org/gerrit/apps/app-templates
diff --git a/autobuild/agl/autobuild b/autobuild/agl/autobuild
index 883293d..b306eb0 100755
--- a/autobuild/agl/autobuild
+++ b/autobuild/agl/autobuild
@@ -1,22 +1,65 @@
-#!/bin/bash
+#!/usr/bin/make -f
+# Copyright (C) 2015 - 2018 "IoT.bzh"
+# Author "Romain Forlot" <romain.forlot@iot.bzh>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#	 http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
-SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../../../"
-BUILD_DIR=$( echo "$2" | cut -d'=' -f2 )
+THISFILE  := $(lastword $(MAKEFILE_LIST))
+BUILD_DIR := $(abspath $(dir $(THISFILE))/../../build)
+DEST      := ${BUILD_DIR}
 
-# HACK: alias should be expanded in script for cmake to work properly
-shopt -s expand_aliases
-# HACK: source again the SDK because of the alias
-source $SDKTARGETSYSROOT/../../environment-setup-*
+.PHONY: all clean distclean configure build package help update
 
-pushd $BUILD_DIR
+all: help
 
-	cmake $SOURCE_DIR
-	make
+help:
+	@echo "List of targets available:"
+	@echo ""
+	@echo "- all"
+	@echo "- clean"
+	@echo "- distclean"
+	@echo "- configure"
+	@echo "- build: compilation, link and prepare files for package into a widget"
+	@echo "- package: output a widget file '*.wgt'"
+	@echo "- install: install in your ${CMAKE_INSTALL_DIR} directory"
+	@echo ""
+	@echo "Usage: ./autobuild/agl/autobuild package DEST=${HOME}/opt"
+	@echo "Don't use your build dir as DEST as wgt file is generated at this location"
 
-	if [ "$1" == "package" ]; then
-		make widget
-		cp *.wgt package/
+clean:
+	@([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} ${CLEAN_ARGS} clean) || echo Nothing to clean
+
+distclean:
+	@rm -rf ${BUILD_DIR}
+
+configure:
+	@[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
+	@[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake ${CONFIGURE_ARGS} ..)
+
+build: configure
+	@cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all
+
+package: build
+	@mkdir -p ${BUILD_DIR}/$@/bin
+	@mkdir -p ${BUILD_DIR}/$@/etc
+	@mkdir -p ${BUILD_DIR}/$@/lib
+	@mkdir -p ${BUILD_DIR}/$@/htdocs
+	@mkdir -p ${BUILD_DIR}/$@/var
+	@cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target widget
+	@if [ "${DEST}" != "${BUILD_DIR}" ]; then \
+		mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
 	fi
 
-popd
+install: build
+	@cmake --build ${BUILD_DIR} ${INSTALL_ARGS} --target install
 
diff --git a/conf.d/app-templates b/conf.d/app-templates
deleted file mode 160000
-Subproject 7ba30135732fc49bfadd5866c08be7080c9f393
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 6f3ef60..2a3c9d7 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -1,6 +1,6 @@
 ###########################################################################
-# Copyright 2015, 2016, 2017 IoT.bzh
-# Copyright 2018 Konsulko Group
+# Copyright 2015-2018 IoT.bzh
+# Copyright 2018,2019 Konsulko Group
 #
 # author: Fulup Ar Foll <fulup@iot.bzh>
 # cluster-receiver: Scott Murray <scott.murray@konsulko.com>
@@ -23,7 +23,7 @@
 set(PROJECT_NAME cluster-receiver)
 set(PROJECT_PRETTY_NAME "Cluster Receiver Demo")
 set(PROJECT_DESCRIPTION "Cluster receiver demo application")
-set(PROJECT_URL "https://github.com/konsulko/cluster-receiver")
+set(PROJECT_URL "https://gerrit.automotivelinux.org/gerrit/apps/agl-cluster-demo-receiver")
 set(PROJECT_VERSION "1.0")
 set(PROJECT_ICON "icon.png")
 set(PROJECT_AUTHOR "Scott Murray")
@@ -31,9 +31,9 @@ set(PROJECT_AUTHOR_MAIL "scott.murray@konsulko.com")
 set(PROJECT_LICENSE "APL2.0")
 set(PROJECT_LANGUAGES "CXX")
 
-# Where are stored default templates files from submodule or subtree app-templates in your project tree
+# Where are stored the project configuration files
 # relative to the root project directory
-set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates")
+set(PROJECT_CMAKE_CONF_DIR "conf.d")
 
 # Where are stored your external libraries for your project. This is 3rd party library that you don't maintain
 # but used and must be built and linked.
@@ -44,10 +44,8 @@ set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates")
 
 # Compilation Mode (DEBUG, RELEASE)
 # ----------------------------------
-#set(BUILD_TYPE "DEBUG")
-set(BUILD_TYPE "RELEASE")
-
-#set(USE_EFENCE 1)
+#set(CMAKE_BUILD_TYPE "DEBUG")
+set(USE_EFENCE 1)
 
 # Kernel selection if needed. You can choose between a
 # mandatory version to impose a minimal version.
@@ -74,14 +72,10 @@ set (PKG_REQUIRED_LIST
 	afb-daemon
 )
 
-# You can also consider to include libsystemd
-# -----------------------------------
-#list (APPEND PKG_REQUIRED_LIST libsystemd>=222)
-
 # Prefix path where will be installed the files
 # Default: /usr/local (need root permission to write in)
 # ------------------------------------------------------
-#set(INSTALL_PREFIX /opt/AGL CACHE PATH "INSTALL PREFIX PATH")
+#set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt)
 
 # Customize link option
 # -----------------------------
@@ -117,7 +111,7 @@ set (PKG_REQUIRED_LIST
 #set(DEBUG_COMPILE_OPTIONS
 # -g
 # -ggdb
-# -D_FORTIFY_SOURCE=2
+# -Wp,-U_FORTIFY_SOURCE
 # CACHE STRING "Compilation flags for DEBUG build type.")
 #set(CCOV_COMPILE_OPTIONS
 # -g
@@ -127,9 +121,13 @@ set (PKG_REQUIRED_LIST
 #set(RELEASE_COMPILE_OPTIONS
 # -g
 # -O2
-# -D_FORTIFY_SOURCE=2
 # CACHE STRING "Compilation flags for RELEASE build type.")
 
+# (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable]
+# ---------------------------------------------------------------------
+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_ICON "\"conf.d/wgt/${PROJECT_ICON}\"" CACHE PATH "Path to the widget icon")
@@ -187,7 +185,7 @@ set(AFB_REMPORT "1234" CACHE PATH "Default binder listening port")
 
 # Print a helper message when every thing is finished
 # ----------------------------------------------------
-#set(CLOSING_MESSAGE "Typical binding launch: cd ${CMAKE_BINARY_DIR}/package && afb-daemon --port=${AFB_REMPORT} --workdir=. --ldpaths=lib --roothttp=htdocs  --token=\"${AFB_TOKEN}\" --tracereq=common --verbose")
+set(CLOSING_MESSAGE "Typical binding launch: afb-daemon --port=${AFB_REMPORT} --workdir=${CMAKE_BINARY_DIR}/package --ldpaths=lib --roothttp=htdocs  --token=\"${AFB_TOKEN}\" --tracereq=common --verbose")
 set(PACKAGE_MESSAGE "Install widget file using in the target : afm-util install ${PROJECT_NAME}.wgt")
 
 # Optional schema validator about now only XML, LUA and JSON
@@ -199,5 +197,8 @@ set(PACKAGE_MESSAGE "Install widget file using in the target : afm-util install
 
 # This include is mandatory and MUST happens at the end
 # of this file, else you expose you to unexpected behavior
+#
+# This CMake module could be found at the following url:
+# https://gerrit.automotivelinux.org/gerrit/#/admin/projects/src/cmake-apps-module
 # -----------------------------------------------------------
-include(${PROJECT_APP_TEMPLATES_DIR}/cmake/common.cmake)
+include(CMakeAfbTemplates)