Cleaning

Change-Id: I1c680d21fe45c63a415c7caf5fa816f2819c2593
Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>

6 files changed, 10 insertions, 14 deletions

diff --git a/xdg-launcher/CMakeLists.txt b/xdg-launcher/CMakeLists.txt
index 3e3b8af..f644c5e 100644
--- a/xdg-launcher/CMakeLists.txt
+++ b/xdg-launcher/CMakeLists.txt
@@ -22,7 +22,6 @@ INCLUDE(FindPkgConfig)
 
 INCLUDE_DIRECTORIES(
   include
-  ${libsystemd_INCLUDE_DIRS}
   ${GLIB_INCLUDE_DIRS}
   ${GIO_INCLUDE_DIRS}
   )
@@ -32,8 +31,6 @@ LINK_DIRECTORIES(
   ${GIO_LIBRARY_DIRS}
   )
 
-PKG_CHECK_MODULES(libsystemd libsystemd>=222)
-
 SET(LIBRARIES
   libwindowmanager.so
   libhomescreen.so
@@ -45,7 +42,6 @@ SET(LIBRARIES
   libGLESv2.so
   libwayland-egl.so
   libwayland-client.so
-  ${libsystemd_LDFLAGS}
   libpthread.so
   ${GLIB_LIBRARIES}
   ${GIO_LIBRARIES}
@@ -62,20 +58,20 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIBRARIES})
 add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
   COMMAND cp -rf ${CMAKE_CURRENT_SOURCE_DIR}/package ${PROJECT_BINARY_DIR})
 
-add_custom_target(widget DEPENDS ${PROJECT_BINARY_DIR}/package/${PROJECT_NAME}/config.xml
-   		                 ${PROJECT_BINARY_DIR}/package/${PROJECT_NAME}/runxdg.toml
-  COMMAND mkdir -p ${PROJECT_BINARY_DIR}/package/${PROJECT_NAME}/bin
-  COMMAND cp -rf ${PROJECT_BINARY_DIR}/${PROJECT_NAME} ${PROJECT_BINARY_DIR}/package/${PROJECT_NAME}/bin/${PROJECT_NAME}
-  COMMAND wgtpkg-pack -f -o ${PROJECT_BINARY_DIR}/package/${PROJECT_NAME}.wgt ${PROJECT_BINARY_DIR}/package/${PROJECT_NAME}
+add_custom_target(widget DEPENDS ${PROJECT_BINARY_DIR}/package/simple-egl/config.xml
+   		                 ${PROJECT_BINARY_DIR}/package/simple-egl/runxdg.toml
+  COMMAND mkdir -p ${PROJECT_BINARY_DIR}/package/simple-egl/bin
+  COMMAND cp -rf ${PROJECT_BINARY_DIR}/${PROJECT_NAME} ${PROJECT_BINARY_DIR}/package/simple-egl/bin/${PROJECT_NAME}
+  COMMAND wgtpkg-pack -f -o ${PROJECT_BINARY_DIR}/package/simple-egl.wgt ${PROJECT_BINARY_DIR}/package/simple-egl
 
   # override hvac to test runxdg
   COMMAND mkdir -p ${PROJECT_BINARY_DIR}/package/hvac/bin
-  COMMAND cp -rf ${PROJECT_BINARY_DIR}/${PROJECT_NAME} ${PROJECT_BINARY_DIR}/package/hvac/bin/hvac
+  COMMAND cp -rf ${PROJECT_BINARY_DIR}/${PROJECT_NAME} ${PROJECT_BINARY_DIR}/package/hvac/bin/${PROJECT_NAME}
   COMMAND wgtpkg-pack -f -o ${PROJECT_BINARY_DIR}/package/hvac.wgt ${PROJECT_BINARY_DIR}/package/hvac
 
   # override navigation to test runxdg
   COMMAND mkdir -p ${PROJECT_BINARY_DIR}/package/navi/bin
-  COMMAND cp -rf ${PROJECT_BINARY_DIR}/${PROJECT_NAME} ${PROJECT_BINARY_DIR}/package/navi/bin/navi
+  COMMAND cp -rf ${PROJECT_BINARY_DIR}/${PROJECT_NAME} ${PROJECT_BINARY_DIR}/package/navi/bin/${PROJECT_NAME}
   COMMAND wgtpkg-pack -f -o ${PROJECT_BINARY_DIR}/package/navi.wgt ${PROJECT_BINARY_DIR}/package/navi
 )
 
diff --git a/xdg-launcher/package/hvac/config.xml b/xdg-launcher/package/hvac/config.xml
index c3b82b9..d6722bd 100644
--- a/xdg-launcher/package/hvac/config.xml
+++ b/xdg-launcher/package/hvac/config.xml
@@ -2,7 +2,7 @@
 <widget xmlns="http://www.w3.org/ns/widgets" id="hvac" version="0.1">
   <name>HVAC</name>
   <icon src="icon.svg"/>
-  <content src="bin/hvac" type="application/vnd.agl.native"/>
+  <content src="bin/runxdg" type="application/vnd.agl.native"/>
   <description>Launcher for XDG application on AGL HomeScreen 2017</description>
   <author>Panasonic Corporation</author>
   <license>MIT</license>
diff --git a/xdg-launcher/package/navi/config.xml b/xdg-launcher/package/navi/config.xml
index 1d47736..97c921b 100644
--- a/xdg-launcher/package/navi/config.xml
+++ b/xdg-launcher/package/navi/config.xml
@@ -2,7 +2,7 @@
 <widget xmlns="http://www.w3.org/ns/widgets" id="navigation" version="0.1">
   <name>Navigation</name>
   <icon src="icon.svg"/>
-  <content src="bin/navi" type="application/vnd.agl.native"/>
+  <content src="bin/runxdg" type="application/vnd.agl.native"/>
   <description>Launcher for XDG application on AGL HomeScreen 2017</description>
   <author>Panasonic Corporation</author>
   <license>MIT</license>
diff --git a/xdg-launcher/package/runxdg/config.xml b/xdg-launcher/package/simple-egl/config.xml
index f435346..dbf701a 100644
--- a/xdg-launcher/package/runxdg/config.xml
+++ b/xdg-launcher/package/simple-egl/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <widget xmlns="http://www.w3.org/ns/widgets" id="runxdg" version="0.1">
-  <name>runxdg</name>
+  <name>SimpleEGL</name>
   <icon src="icon.svg"/>
   <content src="bin/runxdg" type="application/vnd.agl.native"/>
   <description>Launcher for XDG application on AGL HomeScreen 2017</description>
diff --git a/xdg-launcher/package/runxdg/icon.svg b/xdg-launcher/package/simple-egl/icon.svg
index 91661a7..91661a7 100644
--- a/xdg-launcher/package/runxdg/icon.svg
+++ b/xdg-launcher/package/simple-egl/icon.svg
diff --git a/xdg-launcher/package/runxdg/runxdg.toml b/xdg-launcher/package/simple-egl/runxdg.toml
index fa1e3b3..fa1e3b3 100644
--- a/xdg-launcher/package/runxdg/runxdg.toml
+++ b/xdg-launcher/package/simple-egl/runxdg.toml