summaryrefslogtreecommitdiffstats
path: root/conf.d
diff options
context:
space:
mode:
authorTobias Jahnke <tobias.jahnke@microchip.com>2019-08-15 10:02:10 +0200
committerTobias Jahnke <tobias.jahnke@microchip.com>2019-08-16 15:54:29 +0200
commitcc1756d5e7e32e108f8baf4787ba9a811370aefd (patch)
treebba6dee90087901b391178c460ac7d8de205c999 /conf.d
parentfa46d3cd2c0166d064a720bd5e621b11751a9977 (diff)
Fix widget configuration
Bug-AGL: SPEC-2738 - move license comment before xml tags into license section - set correct license type in config.cmake Signed-off-by: Tobias Jahnke <tobias.jahnke@microchip.com> Change-Id: I9ff5b83dad5e0ea1de51beabec0b917ee3b89a2f Signed-off-by: Tobias Jahnke <tobias.jahnke@microchip.com>
Diffstat (limited to 'conf.d')
-rw-r--r--conf.d/cmake/config.cmake2
-rw-r--r--conf.d/wgt/config.xml.in30
2 files changed, 15 insertions, 17 deletions
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 6219fad..1f9049a 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -28,7 +28,7 @@ set(PROJECT_URL "https://git.automotivelinux.org/apps/agl-service-unicens-contro
set(PROJECT_ICON "icon-service.png")
set(PROJECT_AUTHOR "Jahnke, Tobias")
set(PROJECT_AUTHOR_MAIL "tobias.jahnke@microchip.com")
-set(PROJECT_LICENSE "BSD-3")
+set(PROJECT_LICENSE "Apache-2.0")
set(PROJECT_LANGUAGES "C")
# Which directories inspect to find CMakeLists.txt target files
diff --git a/conf.d/wgt/config.xml.in b/conf.d/wgt/config.xml.in
index c0ff952..b2675af 100644
--- a/conf.d/wgt/config.xml.in
+++ b/conf.d/wgt/config.xml.in
@@ -1,27 +1,25 @@
-<!--
-Copyright 2019 Microchip Technology Inc. and its subsidiaries
-
-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
+<?xml version="1.0" encoding="UTF-8"?>
+<widget xmlns="http://www.w3.org/ns/widgets" id="@PROJECT_NAME@" version="@PROJECT_VERSION@">
+ <license>
+ Copyright 2019 Microchip Technology Inc. and its subsidiaries
- http://www.apache.org/licenses/LICENSE-2.0
+ 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
-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.
--->
+ http://www.apache.org/licenses/LICENSE-2.0
-<?xml version="1.0" encoding="UTF-8"?>
-<widget xmlns="http://www.w3.org/ns/widgets" id="@PROJECT_NAME@" version="@PROJECT_VERSION@">
+ 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.
+ </license>
<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::partner:scope-platform" value="required" />
<param name="urn:AGL:permission::public:hidden" value="required" />