From 9136c6003c436fab1df7ff1b95772a345a40953a Mon Sep 17 00:00:00 2001 From: sooyeon Date: Tue, 8 Mar 2022 01:55:55 +0900 Subject: [PATCH] Revert to Dbus service activation, not systemd service activation Change-Id: I701066ac290f1aa4969c1df14380e9fffc3e3c48 Signed-off-by: sooyeon --- CMakeLists.txt | 12 ++++-------- org.tizen.voice.ttsinterruptserver.service | 4 ++++ org.tizen.voice.ttsnotiserver.service | 4 ++++ org.tizen.voice.ttsserver.service | 4 ++++ org.tizen.voice.ttssrserver.service | 4 ++++ packaging/org.tizen.voice.ttsinterruptserver.service | 4 ---- packaging/org.tizen.voice.ttsnotiserver.service | 4 ---- packaging/org.tizen.voice.ttsserver.service | 4 ---- packaging/org.tizen.voice.ttssrserver.service | 4 ---- packaging/tts.spec | 4 ---- voice.ttsinterruptserver.service | 8 -------- voice.ttsnotiserver.service | 8 -------- voice.ttsserver.service | 8 -------- voice.ttssrserver.service | 8 -------- 14 files changed, 20 insertions(+), 60 deletions(-) create mode 100644 org.tizen.voice.ttsinterruptserver.service create mode 100644 org.tizen.voice.ttsnotiserver.service create mode 100644 org.tizen.voice.ttsserver.service create mode 100644 org.tizen.voice.ttssrserver.service delete mode 100644 packaging/org.tizen.voice.ttsinterruptserver.service delete mode 100644 packaging/org.tizen.voice.ttsnotiserver.service delete mode 100644 packaging/org.tizen.voice.ttsserver.service delete mode 100644 packaging/org.tizen.voice.ttssrserver.service delete mode 100644 voice.ttsinterruptserver.service delete mode 100644 voice.ttsnotiserver.service delete mode 100644 voice.ttsserver.service delete mode 100644 voice.ttssrserver.service diff --git a/CMakeLists.txt b/CMakeLists.txt index cc4bb81..aecf81a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,14 +64,10 @@ 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}/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) +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.ttssrserver.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.ttsinterruptserver.service DESTINATION ${TZ_SYS_RO_SHARE}/dbus-1/system-services) ## tts_getengine ## diff --git a/org.tizen.voice.ttsinterruptserver.service b/org.tizen.voice.ttsinterruptserver.service new file mode 100644 index 0000000..52c4894 --- /dev/null +++ b/org.tizen.voice.ttsinterruptserver.service @@ -0,0 +1,4 @@ +[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 app_launcher -s {}-interrupt mode interrupt" +User=ui_fw diff --git a/org.tizen.voice.ttsnotiserver.service b/org.tizen.voice.ttsnotiserver.service new file mode 100644 index 0000000..57556da --- /dev/null +++ b/org.tizen.voice.ttsnotiserver.service @@ -0,0 +1,4 @@ +[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 app_launcher -s {}-noti mode noti" +User=ui_fw diff --git a/org.tizen.voice.ttsserver.service b/org.tizen.voice.ttsserver.service new file mode 100644 index 0000000..c08d1fe --- /dev/null +++ b/org.tizen.voice.ttsserver.service @@ -0,0 +1,4 @@ +[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 app_launcher -s {}" +User=ui_fw diff --git a/org.tizen.voice.ttssrserver.service b/org.tizen.voice.ttssrserver.service new file mode 100644 index 0000000..fe82273 --- /dev/null +++ b/org.tizen.voice.ttssrserver.service @@ -0,0 +1,4 @@ +[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 app_launcher -s {}-sr mode sr" +User=ui_fw diff --git a/packaging/org.tizen.voice.ttsinterruptserver.service b/packaging/org.tizen.voice.ttsinterruptserver.service deleted file mode 100644 index d75c70a..0000000 --- a/packaging/org.tizen.voice.ttsinterruptserver.service +++ /dev/null @@ -1,4 +0,0 @@ -[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 deleted file mode 100644 index 2227117..0000000 --- a/packaging/org.tizen.voice.ttsnotiserver.service +++ /dev/null @@ -1,4 +0,0 @@ -[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 deleted file mode 100644 index b514858..0000000 --- a/packaging/org.tizen.voice.ttsserver.service +++ /dev/null @@ -1,4 +0,0 @@ -[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 deleted file mode 100644 index b4b261b..0000000 --- a/packaging/org.tizen.voice.ttssrserver.service +++ /dev/null @@ -1,4 +0,0 @@ -[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 fded6b0..3086f9f 100644 --- a/packaging/tts.spec +++ b/packaging/tts.spec @@ -173,10 +173,6 @@ 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 deleted file mode 100644 index 80d350e..0000000 --- a/voice.ttsinterruptserver.service +++ /dev/null @@ -1,8 +0,0 @@ -[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 deleted file mode 100644 index 98d5699..0000000 --- a/voice.ttsnotiserver.service +++ /dev/null @@ -1,8 +0,0 @@ -[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 deleted file mode 100644 index 861ce1c..0000000 --- a/voice.ttsserver.service +++ /dev/null @@ -1,8 +0,0 @@ -[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 deleted file mode 100644 index 64b0b81..0000000 --- a/voice.ttssrserver.service +++ /dev/null @@ -1,8 +0,0 @@ -[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" -- 2.7.4