diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2018-10-11 12:28:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@automotivelinux.org> | 2018-10-11 12:28:18 +0000 |
| commit | 152d6e083b84c6327e08921a6b4bb645c6b5f0c8 (patch) | |
| tree | 04dde92faab1d5231f864aba10e7a324f78b43f2 | |
| parent | 2dfacacfa0376bc4b4f5dd6f6a8f3fb3dca89c08 (diff) | |
| parent | e7ba7ca4eae20ab2db682bb780c7a4d5b1d394f5 (diff) | |
Merge "Drop 2017 suffix"
| -rw-r--r-- | doc/ApplicationGuide.md | 2 | ||||
| -rw-r--r-- | package/root/config.xml | 4 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/ApplicationGuide.md b/doc/ApplicationGuide.md index 2240bb1..a3c2e35 100644 --- a/doc/ApplicationGuide.md +++ b/doc/ApplicationGuide.md @@ -357,7 +357,7 @@ $ repo sync Then you can get the following recipe. -* `meta-agl-devel/meta-hmi-framework/recipes-graphics/agl-service-windowmanager-2017` +* `meta-agl-devel/meta-hmi-framework/recipes-graphics/agl-service-windowmanager` * `meta-agl-devel/meta-hmi-framework/recipes-graphics/libwindowmanager` diff --git a/package/root/config.xml b/package/root/config.xml index d969b0b..a053f31 100644 --- a/package/root/config.xml +++ b/package/root/config.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<widget xmlns="http://www.w3.org/ns/widgets" id="windowmanager-service-2017" version="0.1"> - <name>windowmanager-service-2017</name> +<widget xmlns="http://www.w3.org/ns/widgets" id="windowmanager-service" version="0.1"> + <name>windowmanager-service</name> <content src="config.xml" type="application/vnd.agl.service"/> <description>Window Manager</description> <author>TOYOTA</author> diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3c8da4c..91908e8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -118,5 +118,5 @@ add_custom_command(TARGET ${TARGETS_WM} POST_BUILD ) add_custom_target(package DEPENDS ${PROJECT_BINARY_DIR}/package/root - COMMAND wgtpkg-pack -f -o ${PROJECT_BINARY_DIR}/package/${TARGETS_WM}-2017.wgt ${PROJECT_BINARY_DIR}/package/root + COMMAND wgtpkg-pack -f -o ${PROJECT_BINARY_DIR}/package/${TARGETS_WM}.wgt ${PROJECT_BINARY_DIR}/package/root ) |