From e2cd83105eeaec7d820d3cb1dbebf65b22024084 Mon Sep 17 00:00:00 2001 From: Tadao Tanikawa Date: Tue, 12 Dec 2017 23:34:11 +0900 Subject: Cleaning Change-Id: I1c680d21fe45c63a415c7caf5fa816f2819c2593 Signed-off-by: Tadao Tanikawa --- xdg-launcher/CMakeLists.txt | 18 +- xdg-launcher/package/hvac/config.xml | 2 +- xdg-launcher/package/navi/config.xml | 2 +- xdg-launcher/package/runxdg/config.xml | 17 -- xdg-launcher/package/runxdg/icon.svg | 279 ---------------------------- xdg-launcher/package/runxdg/runxdg.toml | 22 --- xdg-launcher/package/simple-egl/config.xml | 17 ++ xdg-launcher/package/simple-egl/icon.svg | 279 ++++++++++++++++++++++++++++ xdg-launcher/package/simple-egl/runxdg.toml | 22 +++ 9 files changed, 327 insertions(+), 331 deletions(-) delete mode 100644 xdg-launcher/package/runxdg/config.xml delete mode 100644 xdg-launcher/package/runxdg/icon.svg delete mode 100644 xdg-launcher/package/runxdg/runxdg.toml create mode 100644 xdg-launcher/package/simple-egl/config.xml create mode 100644 xdg-launcher/package/simple-egl/icon.svg create mode 100644 xdg-launcher/package/simple-egl/runxdg.toml 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 @@ HVAC - + Launcher for XDG application on AGL HomeScreen 2017 Panasonic Corporation MIT 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 @@ Navigation - + Launcher for XDG application on AGL HomeScreen 2017 Panasonic Corporation MIT diff --git a/xdg-launcher/package/runxdg/config.xml b/xdg-launcher/package/runxdg/config.xml deleted file mode 100644 index f435346..0000000 --- a/xdg-launcher/package/runxdg/config.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - runxdg - - - Launcher for XDG application on AGL HomeScreen 2017 - Panasonic Corporation - MIT - - - - - - - - - diff --git a/xdg-launcher/package/runxdg/icon.svg b/xdg-launcher/package/runxdg/icon.svg deleted file mode 100644 index 91661a7..0000000 --- a/xdg-launcher/package/runxdg/icon.svg +++ /dev/null @@ -1,279 +0,0 @@ - - - -image/svg+xmlMULTIMEDIA - \ No newline at end of file diff --git a/xdg-launcher/package/runxdg/runxdg.toml b/xdg-launcher/package/runxdg/runxdg.toml deleted file mode 100644 index fa1e3b3..0000000 --- a/xdg-launcher/package/runxdg/runxdg.toml +++ /dev/null @@ -1,22 +0,0 @@ -[application] -# name: identifier for WindowManager (used in layers.json) -# e.g. name = "WebBrowser" -name = "RunXDG" - -# launch by "POSIX"(fork/exec), "AFM_DBUS"(afm via dbus), "AFM_WEBSOCKET"(afm via websockt) -method = "POSIX" - -# path: path to the executable -# e.g. -# path = "/usr/bin/chromium" -path = "/usr/bin/weston-simple-egl" - -# params: arguments of the excecutable -# e.g. -# params = [ -# "--mus", -# "--no-sandbox", -# '--window-size="1080,1488"', -# "--ozone-platform=wayland", -# "" -# ] diff --git a/xdg-launcher/package/simple-egl/config.xml b/xdg-launcher/package/simple-egl/config.xml new file mode 100644 index 0000000..dbf701a --- /dev/null +++ b/xdg-launcher/package/simple-egl/config.xml @@ -0,0 +1,17 @@ + + + SimpleEGL + + + Launcher for XDG application on AGL HomeScreen 2017 + Panasonic Corporation + MIT + + + + + + + + + diff --git a/xdg-launcher/package/simple-egl/icon.svg b/xdg-launcher/package/simple-egl/icon.svg new file mode 100644 index 0000000..91661a7 --- /dev/null +++ b/xdg-launcher/package/simple-egl/icon.svg @@ -0,0 +1,279 @@ + + + +image/svg+xmlMULTIMEDIA + \ No newline at end of file diff --git a/xdg-launcher/package/simple-egl/runxdg.toml b/xdg-launcher/package/simple-egl/runxdg.toml new file mode 100644 index 0000000..fa1e3b3 --- /dev/null +++ b/xdg-launcher/package/simple-egl/runxdg.toml @@ -0,0 +1,22 @@ +[application] +# name: identifier for WindowManager (used in layers.json) +# e.g. name = "WebBrowser" +name = "RunXDG" + +# launch by "POSIX"(fork/exec), "AFM_DBUS"(afm via dbus), "AFM_WEBSOCKET"(afm via websockt) +method = "POSIX" + +# path: path to the executable +# e.g. +# path = "/usr/bin/chromium" +path = "/usr/bin/weston-simple-egl" + +# params: arguments of the excecutable +# e.g. +# params = [ +# "--mus", +# "--no-sandbox", +# '--window-size="1080,1488"', +# "--ozone-platform=wayland", +# "" +# ] -- cgit 1.2.3-korg