From 9bbd2df0b32d786022a2846b696b88f7c04088df Mon Sep 17 00:00:00 2001 From: "sooyeon.kim" Date: Wed, 5 Dec 2018 22:18:36 +0900 Subject: [PATCH] Change executable file for getting engine info Change-Id: Icab17b69f38a78a4be6114144b2bb127cf7dcfba Signed-off-by: sooyeon.kim (cherry picked from commit dc6a19ee309da825e14834f363414235191fdf34) --- CMakeLists.txt | 12 ++++++------ bin/aarch64/{voice_getengine => tts_getengine} | Bin bin/armv7l/{voice_getengine => tts_getengine} | Bin bin/i586/{voice_getengine => tts_getengine} | Bin bin/x86_64/{voice_getengine => tts_getengine} | Bin 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/tts.spec | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) rename bin/aarch64/{voice_getengine => tts_getengine} (100%) rename bin/armv7l/{voice_getengine => tts_getengine} (100%) rename bin/i586/{voice_getengine => tts_getengine} (100%) rename bin/x86_64/{voice_getengine => tts_getengine} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index b462e71..8bad55d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,17 +69,17 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.voice.ttsnotiserver.service DESTINAT 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) -## voice_getengine ## +## tts_getengine ## IF("${ARCH}" MATCHES "^arm.*") -INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/armv7l/voice_getengine DESTINATION ${TZ_SYS_BIN}) +INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/armv7l/tts_getengine DESTINATION ${TZ_SYS_BIN}) ELSEIF("${ARCH}" MATCHES "^i586.*") -INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/i586/voice_getengine DESTINATION ${TZ_SYS_BIN}) +INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/i586/tts_getengine DESTINATION ${TZ_SYS_BIN}) ELSEIF("${ARCH}" MATCHES "^i686.*") -INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/i586/voice_getengine DESTINATION ${TZ_SYS_BIN}) +INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/i586/tts_getengine DESTINATION ${TZ_SYS_BIN}) ELSEIF("${ARCH}" MATCHES "^aarch64.*") -INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/aarch64/voice_getengine DESTINATION ${TZ_SYS_BIN}) +INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/aarch64/tts_getengine DESTINATION ${TZ_SYS_BIN}) ELSEIF("${ARCH}" MATCHES "^x86_64.*") -INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/x86_64/voice_getengine DESTINATION ${TZ_SYS_BIN}) +INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/x86_64/tts_getengine DESTINATION ${TZ_SYS_BIN}) ENDIF() diff --git a/bin/aarch64/voice_getengine b/bin/aarch64/tts_getengine similarity index 100% rename from bin/aarch64/voice_getengine rename to bin/aarch64/tts_getengine diff --git a/bin/armv7l/voice_getengine b/bin/armv7l/tts_getengine similarity index 100% rename from bin/armv7l/voice_getengine rename to bin/armv7l/tts_getengine diff --git a/bin/i586/voice_getengine b/bin/i586/tts_getengine similarity index 100% rename from bin/i586/voice_getengine rename to bin/i586/tts_getengine diff --git a/bin/x86_64/voice_getengine b/bin/x86_64/tts_getengine similarity index 100% rename from bin/x86_64/voice_getengine rename to bin/x86_64/tts_getengine diff --git a/org.tizen.voice.ttsinterruptserver.service b/org.tizen.voice.ttsinterruptserver.service index 492bd6d..28135d1 100644 --- a/org.tizen.voice.ttsinterruptserver.service +++ b/org.tizen.voice.ttsinterruptserver.service @@ -1,6 +1,6 @@ [D-BUS Service] Name=org.tizen.voice.ttsinterruptserver -Exec=/bin/sh -c "voice_getengine get system db/voice/tts/engine/default | awk '{print$5}' | xargs -t -i launch_app {}-interrupt mode interrupt" +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=system -Group=system \ No newline at end of file +Group=system diff --git a/org.tizen.voice.ttsnotiserver.service b/org.tizen.voice.ttsnotiserver.service index 111b70f..abed697 100644 --- a/org.tizen.voice.ttsnotiserver.service +++ b/org.tizen.voice.ttsnotiserver.service @@ -1,6 +1,6 @@ [D-BUS Service] Name=org.tizen.voice.ttsnotiserver -Exec=/bin/sh -c "voice_getengine get system db/voice/tts/engine/default | awk '{print$5}' | xargs -t -i launch_app {}-noti mode noti" +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=system -Group=system \ No newline at end of file +Group=system diff --git a/org.tizen.voice.ttsserver.service b/org.tizen.voice.ttsserver.service index 14527fe..1d9d543 100644 --- a/org.tizen.voice.ttsserver.service +++ b/org.tizen.voice.ttsserver.service @@ -1,6 +1,6 @@ [D-BUS Service] Name=org.tizen.voice.ttsserver -Exec=/bin/sh -c "voice_getengine get system db/voice/tts/engine/default | awk '{print$5}' | xargs -t -i launch_app {}" +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=system -Group=system \ No newline at end of file +Group=system diff --git a/org.tizen.voice.ttssrserver.service b/org.tizen.voice.ttssrserver.service index adc2f0e..a432b95 100644 --- a/org.tizen.voice.ttssrserver.service +++ b/org.tizen.voice.ttssrserver.service @@ -1,6 +1,6 @@ [D-BUS Service] Name=org.tizen.voice.ttssrserver -Exec=/bin/sh -c "voice_getengine get system db/voice/tts/engine/default | awk '{print$5}' | xargs -t -i launch_app {}-sr mode sr" +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=system -Group=system \ No newline at end of file +Group=system diff --git a/packaging/tts.spec b/packaging/tts.spec index 96b8b7c..794dea9 100644 --- a/packaging/tts.spec +++ b/packaging/tts.spec @@ -115,7 +115,7 @@ mkdir -p %{TZ_SYS_RO_SHARE}/voice/test %{TZ_SYS_RO_SHARE}/dbus-1/system-services/org.tizen.voice.ttssrserver.service %{TZ_SYS_RO_SHARE}/dbus-1/system-services/org.tizen.voice.ttsinterruptserver.service #%{TZ_SYS_RO_SHARE}/voice/test/tts-test -%{_bindir}/voice_getengine +%{_bindir}/tts_getengine %{TZ_SYS_RO_ETC}/package-manager/parserlib/metadata/libtts-engine-parser.so* #%{TZ_SYS_RO_ETC}/package-manager/parserlib/metadata/libtts-engine-language-pack-parser.so* /etc/dbus-1/system.d/tts-server.conf -- 2.7.4