From a3cecd20f812c3fc71141a487443568c861c160a Mon Sep 17 00:00:00 2001
From: Fulup Ar Foll <fulup@iot.bzh>
Date: Tue, 25 Jul 2017 17:33:52 +0200
Subject: Update HTML test page to new template. Added Config file selection
 from UI.

---
 conf.d/app-templates             |  2 +-
 conf.d/autobuild/agl/autobuild   | 21 +++++++++++++++++----
 conf.d/autobuild/linux/autobuild | 21 +++++++++++++++++----
 conf.d/config.cmake              |  2 ++
 4 files changed, 37 insertions(+), 9 deletions(-)

(limited to 'conf.d')

diff --git a/conf.d/app-templates b/conf.d/app-templates
index db6a07f..8f3bc0b 160000
--- a/conf.d/app-templates
+++ b/conf.d/app-templates
@@ -1 +1 @@
-Subproject commit db6a07f636a3f2a381dfcc0f52b16f59127496f0
+Subproject commit 8f3bc0b6f25a5560a308078342a8ed3cc6dba13f
diff --git a/conf.d/autobuild/agl/autobuild b/conf.d/autobuild/agl/autobuild
index 31e29f7..759f6be 100755
--- a/conf.d/autobuild/agl/autobuild
+++ b/conf.d/autobuild/agl/autobuild
@@ -16,10 +16,24 @@
 
 THISFILE  := $(lastword $(MAKEFILE_LIST))
 BUILD_DIR := $(abspath $(dir $(THISFILE)/../../../../..)/build)
+DEST      := ${BUILD_DIR}/target
 
-.PHONY: all clean distclean configure build package
+.PHONY: all clean distclean configure build package help
 
-all: build
+all: help
+
+help:
+	@echo "List of targets available:"
+	@echo ""
+	@echo "- all"
+	@echo "- clean"
+	@echo "- distclean"
+	@echo "- configure"
+	@echo "- build"
+	@echo "- package"
+	@echo ""
+	@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"
 
 clean:
 	@([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} clean) || echo Nothing to clean
@@ -38,9 +52,8 @@ package: build
 	@mkdir -p ${BUILD_DIR}/$@/lib
 	@mkdir -p ${BUILD_DIR}/$@/htdocs
 	@mkdir -p ${BUILD_DIR}/$@/data
-	@[ "${DEST}" ] && mkdir -p ${DEST}
 	@cmake --build ${BUILD_DIR} --target widget
-	@[ "${DEST}" ] && cp ${BUILD_DIR}/*wgt ${DEST}
+	@mkdir -p ${DEST} && cp ${BUILD_DIR}/*wgt ${DEST}
 
 ${BUILD_DIR}/Makefile:
 	@[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
diff --git a/conf.d/autobuild/linux/autobuild b/conf.d/autobuild/linux/autobuild
index 31e29f7..759f6be 100755
--- a/conf.d/autobuild/linux/autobuild
+++ b/conf.d/autobuild/linux/autobuild
@@ -16,10 +16,24 @@
 
 THISFILE  := $(lastword $(MAKEFILE_LIST))
 BUILD_DIR := $(abspath $(dir $(THISFILE)/../../../../..)/build)
+DEST      := ${BUILD_DIR}/target
 
-.PHONY: all clean distclean configure build package
+.PHONY: all clean distclean configure build package help
 
-all: build
+all: help
+
+help:
+	@echo "List of targets available:"
+	@echo ""
+	@echo "- all"
+	@echo "- clean"
+	@echo "- distclean"
+	@echo "- configure"
+	@echo "- build"
+	@echo "- package"
+	@echo ""
+	@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"
 
 clean:
 	@([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} clean) || echo Nothing to clean
@@ -38,9 +52,8 @@ package: build
 	@mkdir -p ${BUILD_DIR}/$@/lib
 	@mkdir -p ${BUILD_DIR}/$@/htdocs
 	@mkdir -p ${BUILD_DIR}/$@/data
-	@[ "${DEST}" ] && mkdir -p ${DEST}
 	@cmake --build ${BUILD_DIR} --target widget
-	@[ "${DEST}" ] && cp ${BUILD_DIR}/*wgt ${DEST}
+	@mkdir -p ${DEST} && cp ${BUILD_DIR}/*wgt ${DEST}
 
 ${BUILD_DIR}/Makefile:
 	@[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
diff --git a/conf.d/config.cmake b/conf.d/config.cmake
index 5dfb013..a386fe7 100644
--- a/conf.d/config.cmake
+++ b/conf.d/config.cmake
@@ -74,6 +74,8 @@ add_compile_options()
 # ---------------------------------------------------------
 add_compile_options(-DCONTROL_CDEV_TX="/dev/inic-usb-ctx")
 add_compile_options(-DCONTROL_CDEV_RX="/dev/inic-usb-crx")
+add_compile_options(-DUCS2_CFG_PATH="/etc/default/ucs:./data")
+
 
 # LANG Specific compile flags set for all build types
 set(CMAKE_C_FLAGS "")
-- 
cgit 1.2.3-korg