From d72df9cf035041e40a5007b8eb2316a3dcde4e6a Mon Sep 17 00:00:00 2001
From: Loïc Collignon <loic.collignon@iot.bzh>
Date: Wed, 18 Jul 2018 15:38:40 +0200
Subject: Change the way the config.xml is generated
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The 4A framework support is optional, but when you enable it, you should
deploy another config.xml file. The old way does not work and the
config.xml does not mention that it depend on ahl-4a. This fix this
issue.

Change-Id: I76cbec248a9805360645199735d1cac39c0a701b
Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
---
 conf.d/cmake/config.cmake   | 14 ++++++--------
 conf.d/wgt/config-4a.xml.in | 25 -------------------------
 conf.d/wgt/config.xml.in    |  1 +
 3 files changed, 7 insertions(+), 33 deletions(-)
 delete mode 100644 conf.d/wgt/config-4a.xml.in

diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 92c7ee1..883e10c 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -26,6 +26,12 @@ set(PROJECT_ICON "icon.png")
 set(PROJECT_LICENSE "APL2.0")
 set(PROJECT_LANGUAGES,"C")
 
+if (HAVE_4A_FRAMEWORK)
+	set(OPTIONAL_DEPENDENCIES "<param name=\"ahl-4a\" value=\"ws\" />")
+else()
+	set(OPTIONAL_DEPENDENCIES "<!-- no optional dependencies -->")
+endif()
+
 # Where are stored default templates files from submodule or subtree app-templates in your project tree
 # relative to the root project directory
 set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates")
@@ -84,14 +90,6 @@ set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt)
 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
-# -----------------------------------
-if(HAVE_4A_FRAMEWORK)
-	set(WIDGET_CONFIG_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/conf.d/wgt/config-4a.xml.in)
-else()
-	set(WIDGET_CONFIG_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/conf.d/wgt/config.xml.in)
-endif()
-
 # Mandatory widget Mimetype specification of the main unit
 # --------------------------------------------------------------------------
 # Choose between :
diff --git a/conf.d/wgt/config-4a.xml.in b/conf.d/wgt/config-4a.xml.in
deleted file mode 100644
index a6ab311..0000000
--- a/conf.d/wgt/config-4a.xml.in
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<widget xmlns="http://www.w3.org/ns/widgets" id="@PROJECT_NAME@" version="@PROJECT_VERSION@">
-	<name>@PROJECT_NAME@</name>
-	<icon src="@PROJECT_ICON@"/>
-	<content src="@WIDGET_ENTRY_POINT@" type="@WIDGET_TYPE@"/>
-	<description>@PROJECT_DESCRIPTION@</description>
-	<author>@PROJECT_AUTHOR@ &lt;@PROJECT_AUTHOR_MAIL@&gt;</author>
-	<license>@PROJECT_LICENSE@</license>
-
-	<feature name="urn:AGL:widget:required-permission">
-		<param name="urn:AGL:permission::public:hidden" value="required" />
-		<param name="urn:AGL:permission::public:no-htdocs" value="required" />
-		<param name="urn:AGL:permission:audio:public:audiostream" value="required" />
-	</feature>
-
-	<feature name="urn:AGL:widget:provided-api">
-		<param name="mediaplayer" value="ws" />
-	</feature>
-
-	<feature name="urn:AGL:widget:required-api">
-		<param name="mediascanner" value="ws" />
-		<param name="ahl-4a" value="ws" />
-		<param name="@WIDGET_ENTRY_POINT@" value="local" />
-	</feature>
-</widget>
diff --git a/conf.d/wgt/config.xml.in b/conf.d/wgt/config.xml.in
index 00711b6..30cb76e 100644
--- a/conf.d/wgt/config.xml.in
+++ b/conf.d/wgt/config.xml.in
@@ -18,6 +18,7 @@
 
 	<feature name="urn:AGL:widget:required-api">
 		<param name="mediascanner" value="ws" />
+		@OPTIONAL_DEPENDENCIES@
 		<param name="@WIDGET_ENTRY_POINT@" value="local" />
 	</feature>
 </widget>
-- 
cgit 1.2.3-korg