Merge "Drop 2017 suffix"

diff --git a/doc/ApplicationGuide.md b/doc/ApplicationGuide.md
index 2240bb1..a3c2e35 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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
 )