From: sooyeon <sooyeon.kim@samsung.com>
Date: Wed, 23 Feb 2022 14:41:56 +0000 (+0900)
Subject: Change dbus-based to systemd-based and Change a directory to install service files... 
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=52188cb59b58447177e5eb347586234975f40dfa;p=platform%2Fcore%2Fuifw%2Ftts.git

Change dbus-based to systemd-based and Change a directory to install service files in accordance with architecture

Change-Id: I6b86b13e0c40f85e787f9576f7e3377061a62401
Signed-off-by: sooyeon <sooyeon.kim@samsung.com>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 19e3bb53..903920e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,10 +64,15 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/tts-config.xml DESTINATION ${TZ_SYS_RO_SHARE}/
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/tts-server.conf DESTINATION /etc/dbus-1/system.d)
 
 ## Dbus service ##
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.voice.ttsserver.service DESTINATION ${TZ_SYS_RO_SHARE}/dbus-1/system-services)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.voice.ttsnotiserver.service DESTINATION ${TZ_SYS_RO_SHARE}/dbus-1/system-services)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.voice.ttssrserver.service DESTINATION ${TZ_SYS_RO_SHARE}/dbus-1/system-services)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.voice.ttsinterruptserver.service DESTINATION ${TZ_SYS_RO_SHARE}/dbus-1/system-services)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/voice.ttsserver.service DESTINATION ${LIBDIR}/systemd/system)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/voice.ttssrserver.service DESTINATION ${LIBDIR}/systemd/system)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/voice.ttsnotiserver.service DESTINATION ${LIBDIR}/systemd/system)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/voice.ttsinterruptserver.service DESTINATION ${LIBDIR}/systemd/system)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/packaging/org.tizen.voice.ttsserver.service DESTINATION ${TZ_SYS_RO_SHARE}/dbus-1/system-services)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/packaging/org.tizen.voice.ttssrserver.service DESTINATION ${TZ_SYS_RO_SHARE}/dbus-1/system-services)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/packaging/org.tizen.voice.ttsnotiserver.service DESTINATION ${TZ_SYS_RO_SHARE}/dbus-1/system-services)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/packaging/org.tizen.voice.ttsinterruptserver.service DESTINATION ${TZ_SYS_RO_SHARE}/dbus-1/system-services)
+
 
 ## tts_getengine ##
 IF("${ARCH}" MATCHES "^arm.*")
diff --git a/org.tizen.voice.ttsinterruptserver.service b/org.tizen.voice.ttsinterruptserver.service
deleted file mode 100644
index efba0462..00000000
--- a/org.tizen.voice.ttsinterruptserver.service
+++ /dev/null
@@ -1,5 +0,0 @@
-[D-BUS Service]
-Name=org.tizen.voice.ttsinterruptserver
-Exec=/bin/sh -c "tts_getengine get system db/voice/tts/engine/default | awk '{print$5}' | xargs -t -i launch_app {}-interrupt mode interrupt"
-#Exec=/bin/sh -c "launch_app org.tizen.tts-engine-default-noti mode noti"
-User=ui_fw
diff --git a/org.tizen.voice.ttsnotiserver.service b/org.tizen.voice.ttsnotiserver.service
deleted file mode 100644
index 338bdbe0..00000000
--- a/org.tizen.voice.ttsnotiserver.service
+++ /dev/null
@@ -1,5 +0,0 @@
-[D-BUS Service]
-Name=org.tizen.voice.ttsnotiserver
-Exec=/bin/sh -c "tts_getengine get system db/voice/tts/engine/default | awk '{print$5}' | xargs -t -i launch_app {}-noti mode noti"
-#Exec=/bin/sh -c "launch_app org.tizen.tts-engine-default-noti mode noti"
-User=ui_fw
diff --git a/org.tizen.voice.ttsserver.service b/org.tizen.voice.ttsserver.service
deleted file mode 100644
index 08621402..00000000
--- a/org.tizen.voice.ttsserver.service
+++ /dev/null
@@ -1,5 +0,0 @@
-[D-BUS Service]
-Name=org.tizen.voice.ttsserver
-Exec=/bin/sh -c "tts_getengine get system db/voice/tts/engine/default | awk '{print$5}' | xargs -t -i launch_app {}"
-#Exec=/bin/sh -c "launch_app org.tizen.tts-engine-default"
-User=ui_fw
diff --git a/org.tizen.voice.ttssrserver.service b/org.tizen.voice.ttssrserver.service
deleted file mode 100644
index 7f4b962c..00000000
--- a/org.tizen.voice.ttssrserver.service
+++ /dev/null
@@ -1,5 +0,0 @@
-[D-BUS Service]
-Name=org.tizen.voice.ttssrserver
-Exec=/bin/sh -c "tts_getengine get system db/voice/tts/engine/default | awk '{print$5}' | xargs -t -i launch_app {}-sr mode sr"
-#Exec=/bin/sh -c "launch_app org.tizen.tts-engine-default-sr mode sr"
-User=ui_fw
diff --git a/packaging/org.tizen.voice.ttsinterruptserver.service b/packaging/org.tizen.voice.ttsinterruptserver.service
new file mode 100644
index 00000000..d75c70a2
--- /dev/null
+++ b/packaging/org.tizen.voice.ttsinterruptserver.service
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.tizen.voice.ttsinterruptserver
+Exec=/bin/false
+SystemdService=voice.ttsinterruptserver.service
diff --git a/packaging/org.tizen.voice.ttsnotiserver.service b/packaging/org.tizen.voice.ttsnotiserver.service
new file mode 100644
index 00000000..22271173
--- /dev/null
+++ b/packaging/org.tizen.voice.ttsnotiserver.service
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.tizen.voice.ttsnotiserver
+Exec=/bin/false
+SystemdService=voice.ttsnotiserver.service
diff --git a/packaging/org.tizen.voice.ttsserver.service b/packaging/org.tizen.voice.ttsserver.service
new file mode 100644
index 00000000..b5148584
--- /dev/null
+++ b/packaging/org.tizen.voice.ttsserver.service
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.tizen.voice.ttsserver
+Exec=/bin/false
+SystemdService=voice.ttsserver.service
diff --git a/packaging/org.tizen.voice.ttssrserver.service b/packaging/org.tizen.voice.ttssrserver.service
new file mode 100644
index 00000000..b4b261b6
--- /dev/null
+++ b/packaging/org.tizen.voice.ttssrserver.service
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.tizen.voice.ttssrserver
+Exec=/bin/false
+SystemdService=voice.ttssrserver.service
diff --git a/packaging/tts.spec b/packaging/tts.spec
index 208661ec..f6455d2b 100644
--- a/packaging/tts.spec
+++ b/packaging/tts.spec
@@ -173,6 +173,10 @@ mkdir -p %{TZ_SYS_RO_SHARE}/voice/test
 %license LICENSE
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so
+%{_libdir}/systemd/system/voice.ttsserver.service
+%{_libdir}/systemd/system/voice.ttssrserver.service
+%{_libdir}/systemd/system/voice.ttsnotiserver.service
+%{_libdir}/systemd/system/voice.ttsinterruptserver.service
 %{TZ_SYS_RO_SHARE}/voice/tts/1.0/tts-config.xml
 %{TZ_SYS_RO_SHARE}/dbus-1/system-services/org.tizen.voice.ttsserver.service
 %{TZ_SYS_RO_SHARE}/dbus-1/system-services/org.tizen.voice.ttsnotiserver.service
diff --git a/voice.ttsinterruptserver.service b/voice.ttsinterruptserver.service
new file mode 100644
index 00000000..80d350e0
--- /dev/null
+++ b/voice.ttsinterruptserver.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=TTS engine interrupt mode
+
+[Service]
+Type=simple
+User=ui_fw
+BusName=org.tizen.voice.ttsinterruptserver
+ExecStart=/bin/sh -c "tts_getengine get system db/voice/tts/engine/default | awk '{print$5}' | xargs -t -i app_launcher -s {}-interrupt mode interrupt"
diff --git a/voice.ttsnotiserver.service b/voice.ttsnotiserver.service
new file mode 100644
index 00000000..98d56991
--- /dev/null
+++ b/voice.ttsnotiserver.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=TTS engine notification mode
+
+[Service]
+Type=simple
+User=ui_fw
+BusName=org.tizen.voice.ttsnotiserver
+ExecStart=/bin/sh -c "tts_getengine get system db/voice/tts/engine/default | awk '{print$5}' | xargs -t -i app_launcher -s {}-noti mode noti"
diff --git a/voice.ttsserver.service b/voice.ttsserver.service
new file mode 100644
index 00000000..861ce1cf
--- /dev/null
+++ b/voice.ttsserver.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=TTS engine default mode
+
+[Service]
+Type=simple
+User=ui_fw
+BusName=org.tizen.voice.ttsserver
+ExecStart=/bin/sh -c "tts_getengine get system db/voice/tts/engine/default | awk '{print$5}' | xargs -t -i app_launcher -s {}"
diff --git a/voice.ttssrserver.service b/voice.ttssrserver.service
new file mode 100644
index 00000000..64b0b812
--- /dev/null
+++ b/voice.ttssrserver.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=TTS engine screen-reader mode
+
+[Service]
+Type=simple
+User=ui_fw
+BusName=org.tizen.voice.ttssrserver
+ExecStart=/bin/sh -c "tts_getengine get system db/voice/tts/engine/default | awk '{print$5}' | xargs -t -i app_launcher -s {}-sr mode sr"