Fix for TIVI-3114. Refactor Modello to start at launch with Xwalk

Change-Id: Id556eaf235c0d16c968553cd3197ee672bf1f44f

diff --git a/packaging/modello-homescreen.changes b/packaging/modello-homescreen.changes
index e2e0bfd..6f3e813 100644 (file)
--- a/packaging/modello-homescreen.changes
+++ b/packaging/modello-homescreen.changes
@@ -1,3 +1,6 @@
+* Thu Jun 05 2014 brianjjones <brian.j.jones@intel.com> accepted/tizen/ivi/20140526.131006@dabff47
+- Fix for TIVI-3114.  Refactor Modello to start at launch with Xwalk
+
 * Thu May 22 2014 brianjjones <brian.j.jones@intel.com> submit/tizen_ivi/20140508.232610@8b497ad
 - Fixes for IVI-3190 - To get things to render normally
 

diff --git a/packaging/modello-homescreen.spec b/packaging/modello-homescreen.spec
index 6ca95b8..8e4f9a0 100644 (file)
--- a/packaging/modello-homescreen.spec
+++ b/packaging/modello-homescreen.spec
@@ -20,9 +20,19 @@ A proof of concept pure html5 UI
 make wgtPkg
 
 %install
-%make_install
+    %make_install
+    mkdir -p %{buildroot}%{_bindir}
+    mkdir -p %{buildroot}%{_libdir}/systemd/user/weston.target.wants/
+    install -m 755 systemd/modello_launcher.sh %{buildroot}%{_bindir}
+    install -m 0644 systemd/Modello_Homescreen-launchpad-ready.path %{buildroot}%{_libdir}/systemd/user
+    install -m 0644 systemd/Modello_Homescreen.service %{buildroot}%{_libdir}/systemd/user
+    ln -sf systemd/Modello_Homescreen-launchpad-ready.path %{buildroot}%{_libdir}/systemd/user/weston.target.wants/
 
 %files
 %defattr(-,root,root,-)
 /opt/usr/apps/.preinstallWidgets/Modello_Homescreen.wgt
 /opt/usr/apps/_common/icons/Homescreen_icon.png
+%{_libdir}/systemd/user/Modello_Homescreen.service
+%{_libdir}/systemd/user/Modello_Homescreen-launchpad-ready.path
+%{_bindir}/modello_launcher.sh
+%{_libdir}/systemd/user/weston.target.wants

diff --git a/systemd/Modello_Homescreen-launchpad-ready.path b/systemd/Modello_Homescreen-launchpad-ready.path
new file mode 100644 (file)
index 0000000..70d3a96
--- /dev/null
+++ b/systemd/Modello_Homescreen-launchpad-ready.path
@@ -0,0 +1,8 @@
+# Description=Path activation for Modello_Homescreen
+
+[Path]
+PathExists=/run/user/%U/wayland-0
+Unit=Modello_Homescreen.service
+
+[Install]
+WantedBy=weston.target

diff --git a/systemd/Modello_Homescreen.service b/systemd/Modello_Homescreen.service
new file mode 100644 (file)
index 0000000..7e5bc56
--- /dev/null
+++ b/systemd/Modello_Homescreen.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Modello Homescreen
+Requires=weston.service
+After=weston.service
+
+[Service]
+Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%U/dbus/user_bus_socket
+ExecStart=/usr/bin/modello_launcher.sh --user app

diff --git a/systemd/modello_launcher.sh b/systemd/modello_launcher.sh
new file mode 100644 (file)
index 0000000..5d1e02e
--- /dev/null
+++ b/systemd/modello_launcher.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+xwalk-launcher gomjednplfobbadlpflcmcglndlenbep -f