From 0257e4d58a25d328a971423d5fe5289d9985d046 Mon Sep 17 00:00:00 2001
From: Stephane Desneux <stephane.desneux@iot.bzh>
Date: Sun, 10 Jul 2016 14:58:19 +0200
Subject: afm-launch.conf: handle services through application/vnd.agl.service
 mimetype

Change-Id: Icb19b5d5036168b3e74f8e684ec4a2909d0feeb7
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
---
 conf/CMakeLists.txt     | 12 +++++++-----
 conf/afm-launch.conf    | 37 -------------------------------------
 conf/afm-launch.conf.in | 40 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 42 deletions(-)
 delete mode 100644 conf/afm-launch.conf
 create mode 100644 conf/afm-launch.conf.in

(limited to 'conf')

diff --git a/conf/CMakeLists.txt b/conf/CMakeLists.txt
index 078253c..31a5963 100644
--- a/conf/CMakeLists.txt
+++ b/conf/CMakeLists.txt
@@ -18,16 +18,18 @@
 
 cmake_minimum_required(VERSION 2.8)
 
+configure_file(afm-launch.conf.in afm-launch.conf)
+
 if(NOT USE_SDK)
 	setc(SYSCONFDIR_DBUS_SYSTEM ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d)
 	setc(SYSCONFDIR_DBUS_USER   ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/session.d)
 	setc(UNITDIR_SYSTEM         ${CMAKE_INSTALL_LIBDIR}/systemd/system)
 	setc(UNITDIR_USER           ${CMAKE_INSTALL_LIBDIR}/systemd/user)
 
-	install(FILES afm-system-daemon.conf    DESTINATION ${SYSCONFDIR_DBUS_SYSTEM})
-	install(FILES afm-system-daemon.service DESTINATION ${UNITDIR_SYSTEM})
-	install(FILES afm-user-daemon.conf      DESTINATION ${SYSCONFDIR_DBUS_USER})
-	install(FILES afm-user-daemon.service   DESTINATION ${UNITDIR_USER})
-	install(FILES afm-launch.conf           DESTINATION ${afm_confdir})
+	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/afm-system-daemon.conf    DESTINATION ${SYSCONFDIR_DBUS_SYSTEM})
+	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/afm-system-daemon.service DESTINATION ${UNITDIR_SYSTEM})
+	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/afm-user-daemon.conf      DESTINATION ${SYSCONFDIR_DBUS_USER})
+	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/afm-user-daemon.service   DESTINATION ${UNITDIR_USER})
+	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/afm-launch.conf			DESTINATION ${afm_confdir})
 endif()
 
diff --git a/conf/afm-launch.conf b/conf/afm-launch.conf
deleted file mode 100644
index a012904..0000000
--- a/conf/afm-launch.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-# %% %
-# %a appid
-# %b bindings
-# %c content
-# %D datadir
-# %H height
-# %h homedir
-# %I icondir
-# %m mime-type
-# %n name
-# %P port
-# %R readyfd
-# %r rootdir
-# %S secret
-# %W width
-
-#-----------------
-mode local
-#-----------------
-text/html
-	/usr/bin/afb-daemon --mode=local --readyfd=%R --alias=/icons:%I --port=%P --rootdir=%r --token=%S --sessiondir=%D/.afb-daemon
-	/usr/bin/web-runtime http://localhost:%P/%c?token=%S
-
-application/x-executable
-	%r/%c
-
-text/vnd.qt.qml
-	/usr/bin/qt5/qmlscene -fullscreen -I %r -I %r/imports %r/%c
-
-#-----------------
-mode remote
-#-----------------
-
-text/html
-	/usr/bin/afb-daemon --mode=remote --readyfd=%R --alias=/icons:%I --port=%P --rootdir=%r --token=%S --sessiondir=%D/.afb-daemon
-	http://%%h:%P/%c?token=%S
-
diff --git a/conf/afm-launch.conf.in b/conf/afm-launch.conf.in
new file mode 100644
index 0000000..c5d4461
--- /dev/null
+++ b/conf/afm-launch.conf.in
@@ -0,0 +1,40 @@
+# %% %
+# %a appid
+# %b bindings
+# %c content
+# %D datadir
+# %H height
+# %h homedir
+# %I icondir
+# %m mime-type
+# %n name
+# %P port
+# %R readyfd
+# %r rootdir
+# %S secret
+# %W width
+
+#-----------------
+mode local
+#-----------------
+text/html
+	/usr/bin/afb-daemon --mode=local --readyfd=%R --alias=/icons:%I --port=%P --rootdir=%r --token=%S --sessiondir=%D/.afb-daemon
+	/usr/bin/web-runtime http://localhost:%P/%c?token=%S
+
+application/x-executable
+	%r/%c
+
+application/vnd.agl.service
+	/usr/bin/afb-daemon --ldpaths=@CMAKE_INSTALL_FULL_LIBDIR@/afb:%r/%c --mode=local --readyfd=%R --alias=/icons:%I --port=%P --rootdir=%r/htdocs --token=%S --sessiondir=%D/.afb-daemon
+
+text/vnd.qt.qml
+	/usr/bin/qt5/qmlscene -fullscreen -I %r -I %r/imports %r/%c
+
+#-----------------
+mode remote
+#-----------------
+
+text/html
+	/usr/bin/afb-daemon --mode=remote --readyfd=%R --alias=/icons:%I --port=%P --rootdir=%r --token=%S --sessiondir=%D/.afb-daemon
+	http://%%h:%P/%c?token=%S
+
-- 
cgit 1.2.3-korg