diff options
| author |   Stephane Desneux <stephane.desneux@iot.bzh> | 2016-07-10 14:58:19 +0200 |
|---|---|---|
| committer | Stephane Desneux <stephane.desneux@iot.bzh> | 2016-07-10 18:20:06 +0200 |
| commit | 0257e4d58a25d328a971423d5fe5289d9985d046 (patch) | |
| tree | 4ef9fb63e47d39a266e14a8b7ec71d7c9bc57be8 | |
| parent | dd9a802209b6d7a41f16b0123090b93a428c9404 (diff) | |
afm-launch.conf: handle services through application/vnd.agl.service mimetype
Change-Id: Icb19b5d5036168b3e74f8e684ec4a2909d0feeb7
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
| -rw-r--r-- | conf/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | conf/afm-launch.conf.in (renamed from conf/afm-launch.conf) | 3 |
2 files changed, 10 insertions, 5 deletions
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.in index a012904..c5d4461 100644 --- a/conf/afm-launch.conf +++ b/conf/afm-launch.conf.in @@ -24,6 +24,9 @@ text/html 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 |