From a93168b0402a84e2033dad6f309dfb14f5fd6d64 Mon Sep 17 00:00:00 2001 From: Fulup Ar Foll Date: Tue, 22 Aug 2017 14:39:29 +0200 Subject: Update to latest template, rename doscript- in debug- --- Controller-afb/CMakeLists.txt | 2 +- conf.d/autobuild/agl/autobuild | 5 +- conf.d/autobuild/linux/autobuild | 5 +- conf.d/project/lua.d/debug-helloworld.lua | 36 +++++ conf.d/project/lua.d/doscript-helloworld.lua | 36 ----- nbproject/configurations.xml | 213 ++++++++++++++------------- 6 files changed, 152 insertions(+), 145 deletions(-) create mode 100644 conf.d/project/lua.d/debug-helloworld.lua delete mode 100644 conf.d/project/lua.d/doscript-helloworld.lua diff --git a/Controller-afb/CMakeLists.txt b/Controller-afb/CMakeLists.txt index c7602f8..9d27947 100644 --- a/Controller-afb/CMakeLists.txt +++ b/Controller-afb/CMakeLists.txt @@ -18,7 +18,7 @@ ADD_COMPILE_OPTIONS(-DCONTROL_ONLOAD_PROFILE="onload-default-profile") -ADD_COMPILE_OPTIONS(-DCONTROL_DOSCRIPT_PRE="doscript") +ADD_COMPILE_OPTIONS(-DCONTROL_DOSCRIPT_PRE="debug") ADD_COMPILE_OPTIONS(-DCONTROL_CONFIG_PRE="onload") ADD_COMPILE_OPTIONS(-DCONTROL_CONFIG_POST="control") ADD_COMPILE_OPTIONS(-DCONTROL_CONFIG_PATH="${CMAKE_SOURCE_DIR}/conf.d/project/config.d:${CMAKE_INSTALL_PREFIX}/controller/config.d") diff --git a/conf.d/autobuild/agl/autobuild b/conf.d/autobuild/agl/autobuild index 759f6be..4811441 100755 --- 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 --- 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/project/lua.d/debug-helloworld.lua b/conf.d/project/lua.d/debug-helloworld.lua new file mode 100644 index 0000000..7a41971 --- /dev/null +++ b/conf.d/project/lua.d/debug-helloworld.lua @@ -0,0 +1,36 @@ +--[[ + Copyright (C) 2016 "IoT.bzh" + Author Fulup Ar Foll + + 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. + + + Simple API script to be use with AGL control LuaDoCall API + - After the script is loaded by lua_docall + - Controller start function=xxxx where xxxx is taken from script filename doscript-xxxx-anything + +--]] + +function _helloworld (request, query) + + AFB:notice ("LUA HelloWorld: Simple test query=%s", query); + + if (query == nil) then + AFB:notice ("LUA HelloWorld:FX query should not be empty"); + AFB:fail (request, "LUA HelloWorld: query should not be empty"); + else + AFB:notice ("LUA HelloWorld:OK query=%s", query); + AFB:success (request, {arg0="Demat", arg1="Bonjours", arg2="Gootentag", arg3="Morning"}); + end + +end \ No newline at end of file diff --git a/conf.d/project/lua.d/doscript-helloworld.lua b/conf.d/project/lua.d/doscript-helloworld.lua deleted file mode 100644 index 7a41971..0000000 --- a/conf.d/project/lua.d/doscript-helloworld.lua +++ /dev/null @@ -1,36 +0,0 @@ ---[[ - Copyright (C) 2016 "IoT.bzh" - Author Fulup Ar Foll - - 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. - - - Simple API script to be use with AGL control LuaDoCall API - - After the script is loaded by lua_docall - - Controller start function=xxxx where xxxx is taken from script filename doscript-xxxx-anything - ---]] - -function _helloworld (request, query) - - AFB:notice ("LUA HelloWorld: Simple test query=%s", query); - - if (query == nil) then - AFB:notice ("LUA HelloWorld:FX query should not be empty"); - AFB:fail (request, "LUA HelloWorld: query should not be empty"); - else - AFB:notice ("LUA HelloWorld:OK query=%s", query); - AFB:success (request, {arg0="Demat", arg1="Bonjours", arg2="Gootentag", arg3="Morning"}); - end - -end \ No newline at end of file diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index 59c2cdd..3501376 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -132,11 +132,12 @@ false - - - - - + + + + + @@ -148,7 +149,7 @@ ${MAKE} -f Makefile install ${MAKE} -f Makefile clean build/CMakeFiles/feature_tests.bin - + @@ -161,103 +162,59 @@ ex="false" tool="0" flavor2="3"> - + - - - ../../../opt/include/alsa - /usr/include/json-c - Audio-Common - ../../../opt/include - build/Alsa-afb - + - - - build/Alsa-afb - + - - - ../../../opt/include/alsa - /usr/include/json-c - Audio-Common - ../../../opt/include - build/Alsa-afb - + - - - ../../../opt/include/alsa - /usr/include/json-c - Audio-Common - ../../../opt/include - build/Alsa-afb - + - - - ../../../opt/include/alsa - /usr/include/json-c - Audio-Common - ../../../opt/include - build/Alsa-afb - + - - - ../../../opt/include/afb - Audio-Common - /usr/include/json-c - build/Audio-Common - + - - - ../../../opt/include/afb - Audio-Common - /usr/include/json-c - build/Audio-Common - + - - - Audio-Common - /usr/include/json-c - build/Audio-Common - + - + - + + ../../../opt/include/afb + Controller-afb build/Controller-afb - + + ../../../opt/include/afb + Controller-afb /usr/include/json-c /usr/include/lua5.3 Audio-Common @@ -267,8 +224,10 @@ - + + ../../../opt/include/afb + Controller-afb /usr/include/json-c /usr/include/lua5.3 Audio-Common @@ -278,25 +237,50 @@ - + + ../../../opt/include/afb + Controller-afb /usr/include/json-c build/Controller-afb - + + ../../../opt/include + ../../../opt/include/alsa + /usr/include/p11-kit-1 /usr/include/json-c - /usr/include/lua5.3 + Audio-Common build/Controller-afb + + CONTROL_CONFIG_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings/conf.d/project/config.d:/home/fulup/opt/controller/config.d" + CONTROL_CONFIG_POST="control" + CONTROL_CONFIG_PRE="onload" + CONTROL_DOSCRIPT_PRE="debug" + CONTROL_LUA_EVENT="luaevt" + CONTROL_LUA_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings/conf.d/project/lua.d:/home/fulup/opt/controller-plugins/ctl-lua.d" + CONTROL_MAXPATH_LEN=255 + CONTROL_ONLOAD_PROFILE="onload-default-profile" + CONTROL_PLUGIN_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings/build:/home/fulup/opt/controller-plugins:/usr/lib/afb/controller-plugins/ctlplug" + CONTROL_SUPPORT_LUA + CTL_PLUGIN_MAGIC=2468013579 + MAX_LINEAR_DB_SCALE=24 + MAX_SND_CARD=16 + NATIVE_LINUX + TLV_BYTE_SIZE=256 + audio_plugin_sample_EXPORTS + - + + ../../../opt/include/afb + Controller-afb ../../../opt/include build/Controller-afb @@ -306,10 +290,9 @@ ex="false" tool="0" flavor2="3"> - + Audio-Common - ../../../opt/include build/HAL-afb/HAL-interface @@ -318,7 +301,7 @@ ex="false" tool="0" flavor2="3"> - + Audio-Common build/HAL-afb/HAL-interface @@ -326,29 +309,26 @@ - + build/HAL-afb/HAL-interface - + - + ../../../opt/include/afb HAL-afb/HAL_MOST_UNICENS - ../../../opt/include/alsa - /usr/include/json-c Audio-Common HAL-afb/HAL-interface - ../../../opt/include build/HAL-afb/HAL_MOST_UNICENS @@ -357,7 +337,7 @@ ex="false" tool="1" flavor2="4"> - + HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src @@ -368,7 +348,7 @@ ex="false" tool="1" flavor2="4"> - + HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc @@ -379,7 +359,7 @@ ex="false" tool="1" flavor2="4"> - + HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc @@ -390,7 +370,7 @@ ex="false" tool="1" flavor2="4"> - + HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src @@ -401,10 +381,9 @@ ex="false" tool="0" flavor2="3"> - + HAL-afb/HAL_MOST_UNICENS - /usr/include/json-c build/HAL-afb/HAL_MOST_UNICENS @@ -413,11 +392,10 @@ ex="false" tool="0" flavor2="3"> - + ../../../opt/include/afb HAL-afb/HAL_MOST_UNICENS - /usr/include/json-c build/HAL-afb/HAL_MOST_UNICENS @@ -426,7 +404,7 @@ ex="false" tool="0" flavor2="3"> - + ../../../opt/include/afb HAL-afb/HAL_MOST_UNICENS @@ -436,25 +414,25 @@ - + - + - + - + Shared-Interface HAL-afb/HAL-interface @@ -463,7 +441,7 @@ - + HAL-afb/HAL-interface build/HAL-afb/Unicens-USB @@ -471,11 +449,11 @@ - + - + @@ -536,9 +514,40 @@ - ../../../opt/include/afb - Alsa-afb + ../../../opt/include + ../../../opt/include/alsa + /usr/include/p11-kit-1 + /usr/include/json-c + Audio-Common + build/Alsa-afb + + CONTROL_MAXPATH_LEN=255 + MAX_LINEAR_DB_SCALE=24 + MAX_SND_CARD=16 + NATIVE_LINUX + TLV_BYTE_SIZE=256 + alsa_lowlevel_EXPORTS + + + + + + + ../../../opt/include + ../../../opt/include/alsa + /usr/include/p11-kit-1 + /usr/include/json-c + Audio-Common + build/Audio-Common + + + CONTROL_MAXPATH_LEN=255 + MAX_LINEAR_DB_SCALE=24 + MAX_SND_CARD=16 + NATIVE_LINUX + TLV_BYTE_SIZE=256 + @@ -575,14 +584,6 @@ - - - - ../../../opt/include/afb - Controller-afb - - - -- cgit 1.2.3-korg