From 1888a208a2daacaabd28427bb519ce51ac283837 Mon Sep 17 00:00:00 2001 From: Loïc Collignon Date: Wed, 13 Jun 2018 11:08:39 +0200 Subject: Fix issue that prevent config file deployment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The required config file was not deployed during the widget creation. Also removed a useless and empty source file. Change-Id: Icaca2ef600441dba75d728a76a175049d31966a9 Signed-off-by: Loïc Collignon --- conf.d/CMakeLists.txt | 19 ++++++++ conf.d/project/CMakeLists.txt | 11 +---- conf.d/project/etc/CMakeLists.txt | 28 ++++++++++++ conf.d/project/etc/policy-4a-sample1.json | 72 +++++++++++++++++++++++++++++++ conf.d/project/policy-4a-sample1.json | 72 ------------------------------- 5 files changed, 120 insertions(+), 82 deletions(-) create mode 100644 conf.d/CMakeLists.txt create mode 100644 conf.d/project/etc/CMakeLists.txt create mode 100644 conf.d/project/etc/policy-4a-sample1.json delete mode 100644 conf.d/project/policy-4a-sample1.json (limited to 'conf.d') diff --git a/conf.d/CMakeLists.txt b/conf.d/CMakeLists.txt new file mode 100644 index 0000000..0d82354 --- /dev/null +++ b/conf.d/CMakeLists.txt @@ -0,0 +1,19 @@ +########################################################################### +# Copyright 2018 IoT.bzh +# +# author: Loïc Collignon +# +# 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. +########################################################################### + +PROJECT_SUBDIRS_ADD(${PROJECT_SRC_DIR_PATTERN}) diff --git a/conf.d/project/CMakeLists.txt b/conf.d/project/CMakeLists.txt index 56271b0..0d82354 100644 --- a/conf.d/project/CMakeLists.txt +++ b/conf.d/project/CMakeLists.txt @@ -16,13 +16,4 @@ # limitations under the License. ########################################################################### -PROJECT_TARGET_ADD(4a-hl-policy-config) - - file(GLOB CONF_FILES "*.json") - - add_input_files("${CONF_FILES}") - - SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES - LABELS "BINDING-CONFIG" - OUTPUT_NAME ${TARGET_NAME} - ) +PROJECT_SUBDIRS_ADD(${PROJECT_SRC_DIR_PATTERN}) diff --git a/conf.d/project/etc/CMakeLists.txt b/conf.d/project/etc/CMakeLists.txt new file mode 100644 index 0000000..56271b0 --- /dev/null +++ b/conf.d/project/etc/CMakeLists.txt @@ -0,0 +1,28 @@ +########################################################################### +# Copyright 2018 IoT.bzh +# +# author: Loïc Collignon +# +# 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. +########################################################################### + +PROJECT_TARGET_ADD(4a-hl-policy-config) + + file(GLOB CONF_FILES "*.json") + + add_input_files("${CONF_FILES}") + + SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES + LABELS "BINDING-CONFIG" + OUTPUT_NAME ${TARGET_NAME} + ) diff --git a/conf.d/project/etc/policy-4a-sample1.json b/conf.d/project/etc/policy-4a-sample1.json new file mode 100644 index 0000000..8aa7a03 --- /dev/null +++ b/conf.d/project/etc/policy-4a-sample1.json @@ -0,0 +1,72 @@ +{ + "$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json", + "metadata": { + "uid": "4a-policy", + "version": "0.1", + "api": "4a-policy", + "require": [], + "info": "Basic Audio Policy Control for Audio-4a - Sample 1", + "author": "Loïc Collignon ", + "date": "2018-05-25" + }, + "onload": [], + "controls": [], + "events": [], + "ahl-4a": { + "hals": ["4a-hal-ctxnop-laptop"], + "roles": [ + { + "uid": "multimedia", + "description": "Multimedia content (e.g. tuner, media player, etc.)", + "priority": 0, + "stream": "multimedia" + }, + { + "uid": "emergency", + "description": "Safety-relevant or critical alerts/alarms", + "priority": 100, + "stream": "emergency", + "interrupts":[ + {"type": "ramp", "args": { "uid": "ramp-slow", "volume": 30} } + ] + }, + { + "uid": "navigation", + "name": "navigation", + "description": "Navigation instructions (GPS, turn directions, etc...)", + "priority": 25, + "stream": "navigation", + "interrupts":[ + {"type": "ramp", "args": { "uid": "ramp-slow", "volume": 30} } + ] + } + ] + }, + "roles":[ + { + "uid": "multimedia", + "description": "Multimedia content (e.g. tuner, media player, etc.)", + "priority": 0, + "stream": "multimedia" + }, + { + "uid": "emergency", + "description": "Safety-relevant or critical alerts/alarms", + "priority": 100, + "stream": "emergency", + "interrupts":[ + {"type": "ramp", "args": { "uid": "ramp-slow", "volume": 30} } + ] + }, + { + "uid": "navigation", + "name": "navigation", + "description": "Navigation instructions (GPS, turn directions, etc...)", + "priority": 25, + "stream": "navigation", + "interrupts":[ + {"type": "ramp", "args": { "uid": "ramp-slow", "volume": 30} } + ] + } + ] +} diff --git a/conf.d/project/policy-4a-sample1.json b/conf.d/project/policy-4a-sample1.json deleted file mode 100644 index 8aa7a03..0000000 --- a/conf.d/project/policy-4a-sample1.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json", - "metadata": { - "uid": "4a-policy", - "version": "0.1", - "api": "4a-policy", - "require": [], - "info": "Basic Audio Policy Control for Audio-4a - Sample 1", - "author": "Loïc Collignon ", - "date": "2018-05-25" - }, - "onload": [], - "controls": [], - "events": [], - "ahl-4a": { - "hals": ["4a-hal-ctxnop-laptop"], - "roles": [ - { - "uid": "multimedia", - "description": "Multimedia content (e.g. tuner, media player, etc.)", - "priority": 0, - "stream": "multimedia" - }, - { - "uid": "emergency", - "description": "Safety-relevant or critical alerts/alarms", - "priority": 100, - "stream": "emergency", - "interrupts":[ - {"type": "ramp", "args": { "uid": "ramp-slow", "volume": 30} } - ] - }, - { - "uid": "navigation", - "name": "navigation", - "description": "Navigation instructions (GPS, turn directions, etc...)", - "priority": 25, - "stream": "navigation", - "interrupts":[ - {"type": "ramp", "args": { "uid": "ramp-slow", "volume": 30} } - ] - } - ] - }, - "roles":[ - { - "uid": "multimedia", - "description": "Multimedia content (e.g. tuner, media player, etc.)", - "priority": 0, - "stream": "multimedia" - }, - { - "uid": "emergency", - "description": "Safety-relevant or critical alerts/alarms", - "priority": 100, - "stream": "emergency", - "interrupts":[ - {"type": "ramp", "args": { "uid": "ramp-slow", "volume": 30} } - ] - }, - { - "uid": "navigation", - "name": "navigation", - "description": "Navigation instructions (GPS, turn directions, etc...)", - "priority": 25, - "stream": "navigation", - "interrupts":[ - {"type": "ramp", "args": { "uid": "ramp-slow", "volume": 30} } - ] - } - ] -} -- cgit 1.2.3-korg