Updates to fix building with SDK and remove submodule usagelamprey_12.1.9lamprey_12.1.8lamprey_12.1.7lamprey_12.1.6lamprey_12.1.5lamprey_12.1.4lamprey_12.1.3lamprey_12.1.2lamprey_12.1.19lamprey_12.1.18lamprey_12.1.17lamprey_12.1.16lamprey_12.1.15lamprey_12.1.14lamprey_12.1.13lamprey_12.1.12lamprey_12.1.11lamprey_12.1.10lamprey_12.1.1lamprey_12.1.0lamprey/12.1.9lamprey/12.1.8lamprey/12.1.7lamprey/12.1.6lamprey/12.1.5lamprey/12.1.4lamprey/12.1.3lamprey/12.1.2lamprey/12.1.19lamprey/12.1.18lamprey/12.1.17lamprey/12.1.16lamprey/12.1.15lamprey/12.1.14lamprey/12.1.13lamprey/12.1.12lamprey/12.1.11lamprey/12.1.10lamprey/12.1.1lamprey/12.1.012.1.912.1.812.1.712.1.612.1.512.1.412.1.312.1.212.1.1912.1.1812.1.1712.1.1612.1.1512.1.1412.1.1312.1.1212.1.1112.1.1012.1.112.1.0lamprey

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-4117

Signed-off-by: Zhou Mingying <zhoumy@cn.fujitsu.com>
Change-Id: I66f010142f3434a7158a4443636ef100f52d382f

3 files changed, 229 insertions, 61 deletions

diff --git a/autobuild/agl/autobuild b/autobuild/agl/autobuild
index 883293d..16181b8 100755
--- a/autobuild/agl/autobuild
+++ b/autobuild/agl/autobuild
@@ -1,22 +1,128 @@
-#!/bin/bash
+#!/usr/bin/make -f
+# Copyright (C) 2015 - 2018 "IoT.bzh"
+# Copyright (C) 2020 Konsulko Group
+# 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))
+ROOT_DIR := $(abspath $(dir $(THISFILE))/../..)
 
-# 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-*
+# Build directories
+# Note that the debug/test/coverage directories are defined in relation
+# to the release directory (BUILD_DIR), this needs to be kept in mind
+# if over-riding it and building those widget types, the specific widget
+# type variable (e.g. BUILD_DIR_DEBUG) may also need to be specified
+# to yield the desired output hierarchy.
+BUILD_DIR = $(ROOT_DIR)/build
+BUILD_DIR_DEBUG = $(abspath $(BUILD_DIR)/../build-debug)
+BUILD_DIR_TEST = $(abspath $(BUILD_DIR)/../build-test)
+BUILD_DIR_COVERAGE = $(abspath $(BUILD_DIR)/../build-coverage)
 
-pushd $BUILD_DIR
+# Output directory variable for use in pattern rules.
+# This is intended for internal use only, hence the explicit override
+# definition.
+override OUTPUT_DIR = $(BUILD_DIR)
 
-	cmake $SOURCE_DIR
-	make
+# Final install directory for widgets
+DEST = $(OUTPUT_DIR)
 
-	if [ "$1" == "package" ]; then
-		make widget
-		cp *.wgt package/
+# Default build type for release/test builds
+BUILD_TYPE = RELEASE
+
+.PHONY: all help update install distclean
+.PHONY: clean clean-release clean-debug clean-test clean-coverage clean-all
+.PHONY: configure configure-release configure-debug configure-test configure-coverage
+.PHONY: build build-release build-debug build-test build-coverage build-all
+.PHONY: package package-release package-debug package-test package-coverage package-all
+
+help:
+	@echo "List of targets available:"
+	@echo ""
+	@echo "- all"
+	@echo "- help"
+	@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"
+
+all: package-all
+
+# Target specific variable over-rides so static pattern rules can be
+# used for the various type-specific targets.
+
+configure-test build-test package-test clean-test: OUTPUT_DIR = $(BUILD_DIR_TEST)
+
+configure-coverage build-coverage package-coverage clean-coverage: OUTPUT_DIR = $(BUILD_DIR_COVERAGE)
+configure-coverage build-coverage package-coverage: BUILD_TYPE = COVERAGE
+
+configure-debug build-debug package-debug clean-debug: OUTPUT_DIR = $(BUILD_DIR_DEBUG)
+configure-debug build-debug package-debug: BUILD_TYPE = DEBUG
+
+clean-release clean-test clean-debug clean-coverage:
+	@if [ -d $(OUTPUT_DIR) ]; then \
+		$(MAKE) -C $(OUTPUT_DIR) $(CLEAN_ARGS) clean; \
+	else \
+		echo Nothing to clean; \
+	fi
+
+clean: clean-release
+
+clean-all: clean-release clean-test clean-debug clean-coverage
+
+distclean: clean-all
+
+configure-release configure-test configure-debug configure-coverage:
+	@mkdir -p $(OUTPUT_DIR)
+	@if [ ! -f $(OUTPUT_DIR)/Makefile ]; then \
+		(cd $(OUTPUT_DIR) && cmake -S $(ROOT_DIR) -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) $(CONFIGURE_ARGS)); \
+	fi
+
+configure: configure-release
+
+build-release build-debug build-coverage: build-%: configure-%
+	@cmake --build $(OUTPUT_DIR) $(BUILD_ARGS) --target all
+
+# Kept for consistency, empty to avoid building everything for test widget
+build-test: configure-test
+
+build: build-release
+
+build-all: build-release build-debug build-test build-coverage
+
+package-release package-debug package-coverage: package-%: build-%
+	@cmake --build $(OUTPUT_DIR) $(PACKAGE_ARGS) --target widget
+	@if [ "$(abspath $(DEST))" != "$(abspath $(OUTPUT_DIR))" ]; then \
+		mkdir -p $(DEST) && cp $(OUTPUT_DIR)/*.wgt $(DEST); \
+	fi
+
+package-test: build-test
+	@cmake --build $(OUTPUT_DIR) $(PACKAGE_ARGS) --target test_widget
+	@if [ "$(abspath $(DEST))" != "$(abspath $(OUTPUT_DIR))" ]; then \
+		mkdir -p $(DEST) && cp $(OUTPUT_DIR)/*.wgt $(DEST); \
 	fi
 
-popd
+package: package-release
+
+package-all: package-release package-test package-coverage package-debug
+
+update: configure
+	@cmake --build $(BUILD_DIR) --target autobuild
 
+install: build
+	@cmake --build $(BUILD_DIR) $(INSTALL_ARGS) --target install
diff --git a/autobuild/linux/autobuild b/autobuild/linux/autobuild
index 035db15..16181b8 100755
--- a/autobuild/linux/autobuild
+++ b/autobuild/linux/autobuild
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
-# Copyright (C) 2015, 2016 "IoT.bzh"
+# Copyright (C) 2015 - 2018 "IoT.bzh"
+# Copyright (C) 2020 Konsulko Group
 # Author "Romain Forlot" <romain.forlot@iot.bzh>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,53 +16,113 @@
 # limitations under the License.
 
 THISFILE  := $(lastword $(MAKEFILE_LIST))
-BUILD_DIR := $(abspath $(dir $(THISFILE))/../../build)
-DEST      := ${BUILD_DIR}/target
+ROOT_DIR := $(abspath $(dir $(THISFILE))/../..)
 
-.PHONY: all clean distclean configure build package help update
+# Build directories
+# Note that the debug/test/coverage directories are defined in relation
+# to the release directory (BUILD_DIR), this needs to be kept in mind
+# if over-riding it and building those widget types, the specific widget
+# type variable (e.g. BUILD_DIR_DEBUG) may also need to be specified
+# to yield the desired output hierarchy.
+BUILD_DIR = $(ROOT_DIR)/build
+BUILD_DIR_DEBUG = $(abspath $(BUILD_DIR)/../build-debug)
+BUILD_DIR_TEST = $(abspath $(BUILD_DIR)/../build-test)
+BUILD_DIR_COVERAGE = $(abspath $(BUILD_DIR)/../build-coverage)
 
-all: help
+# Output directory variable for use in pattern rules.
+# This is intended for internal use only, hence the explicit override
+# definition.
+override OUTPUT_DIR = $(BUILD_DIR)
+
+# Final install directory for widgets
+DEST = $(OUTPUT_DIR)
+
+# Default build type for release/test builds
+BUILD_TYPE = RELEASE
+
+.PHONY: all help update install distclean
+.PHONY: clean clean-release clean-debug clean-test clean-coverage clean-all
+.PHONY: configure configure-release configure-debug configure-test configure-coverage
+.PHONY: build build-release build-debug build-test build-coverage build-all
+.PHONY: package package-release package-debug package-test package-coverage package-all
 
 help:
 	@echo "List of targets available:"
 	@echo ""
 	@echo "- all"
+	@echo "- help"
 	@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 "- install: install in your $(CMAKE_INSTALL_DIR) directory"
 	@echo ""
-	@echo "Usage: ./conf.d/autobuild/agl/autobuild package DEST=${HOME}/opt"
+	@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"
 
-update: configure
-	@cmake --build ${BUILD_DIR} --target autobuild
+all: package-all
 
-clean:
-	@([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} clean) || echo Nothing to clean
+# Target specific variable over-rides so static pattern rules can be
+# used for the various type-specific targets.
 
-distclean:
-	@rm -rf ${BUILD_DIR}
+configure-test build-test package-test clean-test: OUTPUT_DIR = $(BUILD_DIR_TEST)
 
-configure: ${BUILD_DIR}/Makefile
+configure-coverage build-coverage package-coverage clean-coverage: OUTPUT_DIR = $(BUILD_DIR_COVERAGE)
+configure-coverage build-coverage package-coverage: BUILD_TYPE = COVERAGE
 
-build: configure
-	@cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all
+configure-debug build-debug package-debug clean-debug: OUTPUT_DIR = $(BUILD_DIR_DEBUG)
+configure-debug build-debug package-debug: BUILD_TYPE = DEBUG
 
-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}/$@/data
-	@cmake --build ${BUILD_DIR} --target widget
-	@mkdir -p ${DEST} && cp ${BUILD_DIR}/*wgt ${DEST}
+clean-release clean-test clean-debug clean-coverage:
+	@if [ -d $(OUTPUT_DIR) ]; then \
+		$(MAKE) -C $(OUTPUT_DIR) $(CLEAN_ARGS) clean; \
+	else \
+		echo Nothing to clean; \
+	fi
 
-install: build
-	@cmake --build ${BUILD_DIR} --target install
+clean: clean-release
+
+clean-all: clean-release clean-test clean-debug clean-coverage
+
+distclean: clean-all
+
+configure-release configure-test configure-debug configure-coverage:
+	@mkdir -p $(OUTPUT_DIR)
+	@if [ ! -f $(OUTPUT_DIR)/Makefile ]; then \
+		(cd $(OUTPUT_DIR) && cmake -S $(ROOT_DIR) -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) $(CONFIGURE_ARGS)); \
+	fi
+
+configure: configure-release
+
+build-release build-debug build-coverage: build-%: configure-%
+	@cmake --build $(OUTPUT_DIR) $(BUILD_ARGS) --target all
 
-${BUILD_DIR}/Makefile:
-	@[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
-	@[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake ${CONFIGURE_ARGS} ..)
+# Kept for consistency, empty to avoid building everything for test widget
+build-test: configure-test
+
+build: build-release
+
+build-all: build-release build-debug build-test build-coverage
+
+package-release package-debug package-coverage: package-%: build-%
+	@cmake --build $(OUTPUT_DIR) $(PACKAGE_ARGS) --target widget
+	@if [ "$(abspath $(DEST))" != "$(abspath $(OUTPUT_DIR))" ]; then \
+		mkdir -p $(DEST) && cp $(OUTPUT_DIR)/*.wgt $(DEST); \
+	fi
+
+package-test: build-test
+	@cmake --build $(OUTPUT_DIR) $(PACKAGE_ARGS) --target test_widget
+	@if [ "$(abspath $(DEST))" != "$(abspath $(OUTPUT_DIR))" ]; then \
+		mkdir -p $(DEST) && cp $(OUTPUT_DIR)/*.wgt $(DEST); \
+	fi
+
+package: package-release
+
+package-all: package-release package-test package-coverage package-debug
+
+update: configure
+	@cmake --build $(BUILD_DIR) --target autobuild
+
+install: build
+	@cmake --build $(BUILD_DIR) $(INSTALL_ARGS) --target install
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 2e3821e..cde656b 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -1,7 +1,7 @@
 ###########################################################################
-# Copyright 2015, 2016, 2017 IoT.bzh
-# Copyright 2018 Konsulko Group
-# Copyright 2019 FUJITSU LIMITED
+# Copyright 2015-2018 IoT.bzh
+# Copyright 2019 Konsulko Group
+# Copyright 2019-2021 FUJITSU LIMITED
 #
 # author: Fulup Ar Foll <fulup@iot.bzh>
 # cluster-gauges: Scott Murray <scott.murray@konsulko.com>
@@ -32,9 +32,9 @@ set(PROJECT_AUTHOR_MAIL "ouyangj.fnst@cn.fujitsu.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.
@@ -45,10 +45,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.
@@ -75,14 +73,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
 # -----------------------------
@@ -118,7 +112,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
@@ -128,9 +122,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")
@@ -188,7 +186,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
@@ -200,5 +198,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)