From 8c5d363c334474fee33a81837f9ce4e6d2d92cd8 Mon Sep 17 00:00:00 2001 From: Tadao Tanikawa Date: Mon, 3 Dec 2018 06:42:52 +0000 Subject: [PATCH] Sort out package of examples The packages for debug of runxdg were removed because they were not good for example to use xdg-launcher. Some package are added to test AGL LifeCycle Management. Change-Id: Ic82fd1b90eb695d7e6a0c2f62bb21994424ebf51 Signed-off-by: Tadao Tanikawa --- CMakeLists.txt | 8 +- package/hvac/icon.svg | 349 ------------------------------- package/hvac/runxdg.toml | 22 -- package/{hvac => lifecycle}/bin/runxdg | 0 package/{hvac => lifecycle}/config.xml | 7 +- package/lifecycle/icon.svg | 114 ++++++++++ package/{video => lifecycle}/runxdg.toml | 2 +- package/navi/bin/runxdg | 2 - package/navi/config.xml | 17 -- package/navi/icon.svg | 183 ---------------- package/navi/runxdg.toml | 22 -- package/simple-egl/config.xml | 2 +- package/simple-egl/runxdg.toml | 2 +- package/video/bin/runxdg | 2 - package/video/config.xml | 16 -- package/video/icon.svg | 111 ---------- package/webbrowser/config.xml | 2 +- package/webbrowser/runxdg.toml | 13 +- 18 files changed, 134 insertions(+), 740 deletions(-) delete mode 100644 package/hvac/icon.svg delete mode 100644 package/hvac/runxdg.toml rename package/{hvac => lifecycle}/bin/runxdg (100%) rename package/{hvac => lifecycle}/config.xml (66%) create mode 100644 package/lifecycle/icon.svg rename package/{video => lifecycle}/runxdg.toml (96%) delete mode 100755 package/navi/bin/runxdg delete mode 100644 package/navi/config.xml delete mode 100644 package/navi/icon.svg delete mode 100644 package/navi/runxdg.toml delete mode 100755 package/video/bin/runxdg delete mode 100644 package/video/config.xml delete mode 100644 package/video/icon.svg diff --git a/CMakeLists.txt b/CMakeLists.txt index af5e6b7..5c0cad6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,14 +54,10 @@ add_custom_target(widget # simple egl COMMAND wgtpkg-pack -f -o ${PROJECT_BINARY_DIR}/package/simple-egl.wgt ${PROJECT_BINARY_DIR}/package/simple-egl # override hvac to test runxdg - COMMAND wgtpkg-pack -f -o ${PROJECT_BINARY_DIR}/package/hvac.wgt ${PROJECT_BINARY_DIR}/package/hvac - # override navigation to test runxdg - COMMAND wgtpkg-pack -f -o ${PROJECT_BINARY_DIR}/package/navi.wgt ${PROJECT_BINARY_DIR}/package/navi - - # test for video - COMMAND wgtpkg-pack -f -o ${PROJECT_BINARY_DIR}/package/video.wgt ${PROJECT_BINARY_DIR}/package/video # test for webbrowser COMMAND wgtpkg-pack -f -o ${PROJECT_BINARY_DIR}/package/webbrowser.wgt ${PROJECT_BINARY_DIR}/package/webbrowser + # test for lifecycle + COMMAND wgtpkg-pack -f -o ${PROJECT_BINARY_DIR}/package/lifecycle.wgt ${PROJECT_BINARY_DIR}/package/lifecycle ) diff --git a/package/hvac/icon.svg b/package/hvac/icon.svg deleted file mode 100644 index 67918e6..0000000 --- a/package/hvac/icon.svg +++ /dev/null @@ -1,349 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/package/hvac/runxdg.toml b/package/hvac/runxdg.toml deleted file mode 100644 index 48a0ee3..0000000 --- a/package/hvac/runxdg.toml +++ /dev/null @@ -1,22 +0,0 @@ -[application] -# role: identifier for WindowManager (used in layers.json) -# e.g. role = "WebBrowser" -role = "HVAC" - -# 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/package/hvac/bin/runxdg b/package/lifecycle/bin/runxdg similarity index 100% rename from package/hvac/bin/runxdg rename to package/lifecycle/bin/runxdg diff --git a/package/hvac/config.xml b/package/lifecycle/config.xml similarity index 66% rename from package/hvac/config.xml rename to package/lifecycle/config.xml index d6722bd..3006fd0 100644 --- a/package/hvac/config.xml +++ b/package/lifecycle/config.xml @@ -1,9 +1,9 @@ - - HVAC + + Test For LifeCycle - Launcher for XDG application on AGL HomeScreen 2017 + Test program for AGL LifeCycle Management Panasonic Corporation MIT @@ -12,6 +12,5 @@ - diff --git a/package/lifecycle/icon.svg b/package/lifecycle/icon.svg new file mode 100644 index 0000000..882e3c4 --- /dev/null +++ b/package/lifecycle/icon.svg @@ -0,0 +1,114 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/package/video/runxdg.toml b/package/lifecycle/runxdg.toml similarity index 96% rename from package/video/runxdg.toml rename to package/lifecycle/runxdg.toml index 9bcea9c..3abd014 100644 --- a/package/video/runxdg.toml +++ b/package/lifecycle/runxdg.toml @@ -1,7 +1,7 @@ [application] # role: identifier for WindowManager (used in layers.json) # e.g. role = "WebBrowser" -role = "Video" +role = "runxdg" # launch by "POSIX"(fork/exec), "AFM_DBUS"(afm via dbus), "AFM_WEBSOCKET"(afm via websockt) method = "POSIX" diff --git a/package/navi/bin/runxdg b/package/navi/bin/runxdg deleted file mode 100755 index dac903c..0000000 --- a/package/navi/bin/runxdg +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/runxdg $@ diff --git a/package/navi/config.xml b/package/navi/config.xml deleted file mode 100644 index 97c921b..0000000 --- a/package/navi/config.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - Navigation - - - Launcher for XDG application on AGL HomeScreen 2017 - Panasonic Corporation - MIT - - - - - - - - - diff --git a/package/navi/icon.svg b/package/navi/icon.svg deleted file mode 100644 index 97fcf31..0000000 --- a/package/navi/icon.svg +++ /dev/null @@ -1,183 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/package/navi/runxdg.toml b/package/navi/runxdg.toml deleted file mode 100644 index 1af18e8..0000000 --- a/package/navi/runxdg.toml +++ /dev/null @@ -1,22 +0,0 @@ -[application] -# role: identifier for WindowManager (used in layers.json) -# e.g. role = "WebBrowser" -role = "Navigation" - -# 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/package/simple-egl/config.xml b/package/simple-egl/config.xml index dbf701a..ee3ce66 100644 --- a/package/simple-egl/config.xml +++ b/package/simple-egl/config.xml @@ -1,5 +1,5 @@ - + SimpleEGL diff --git a/package/simple-egl/runxdg.toml b/package/simple-egl/runxdg.toml index 0bba232..3abd014 100644 --- a/package/simple-egl/runxdg.toml +++ b/package/simple-egl/runxdg.toml @@ -1,7 +1,7 @@ [application] # role: identifier for WindowManager (used in layers.json) # e.g. role = "WebBrowser" -role = "SimpleEGL" +role = "runxdg" # launch by "POSIX"(fork/exec), "AFM_DBUS"(afm via dbus), "AFM_WEBSOCKET"(afm via websockt) method = "POSIX" diff --git a/package/video/bin/runxdg b/package/video/bin/runxdg deleted file mode 100755 index dac903c..0000000 --- a/package/video/bin/runxdg +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/runxdg $@ diff --git a/package/video/config.xml b/package/video/config.xml deleted file mode 100644 index 3aa9332..0000000 --- a/package/video/config.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - Video - - - This is a demo application for video player - Tasuku Suzuki <tasuku.suzuki@qt.io> - APL 2.0 - - - - - - - - diff --git a/package/video/icon.svg b/package/video/icon.svg deleted file mode 100644 index 905d46f..0000000 --- a/package/video/icon.svg +++ /dev/null @@ -1,111 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/package/webbrowser/config.xml b/package/webbrowser/config.xml index 68cab15..976bebf 100644 --- a/package/webbrowser/config.xml +++ b/package/webbrowser/config.xml @@ -4,7 +4,7 @@ Web Browser (Chromium) - IoT.bzh + Panasonic MIT diff --git a/package/webbrowser/runxdg.toml b/package/webbrowser/runxdg.toml index ed275e4..3f167e4 100644 --- a/package/webbrowser/runxdg.toml +++ b/package/webbrowser/runxdg.toml @@ -1,7 +1,7 @@ [application] # role: identifier for WindowManager (used in layers.json) # e.g. role = "WebBrowser" -role = "WebBrowser" +role = "webbrowser" # launch by "POSIX"(fork/exec), "AFM_DBUS"(afm via dbus), "AFM_WEBSOCKET"(afm via websockt) method = "POSIX" @@ -9,7 +9,7 @@ method = "POSIX" # path: path to the executable # e.g. # path = "/usr/bin/chromium" -path = "/usr/bin/weston-simple-egl" +path = "/usr/bin/chromium" # params: arguments of the excecutable # e.g. @@ -20,3 +20,12 @@ path = "/usr/bin/weston-simple-egl" # "--ozone-platform=wayland", # "" # ] +params = [ + "--mus", + "--no-sandbox", + "--single-process", + "--window-size=1080,1488", + "--ozone-platform=wayland", + "--touch-events=enabled", + "https://maps.google.com/maps" +] -- 2.16.6