Updates to fix building with SDK and remove submodule usagehalibut_8.0.6halibut_8.0.5halibut_8.0.4halibut/8.0.6halibut/8.0.5halibut/8.0.48.0.68.0.58.0.4halibut

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>

1 files changed, 57 insertions, 14 deletions

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