Add multi-user support

/opt/usr/voice/ purpose was to stock user's downloaded engines and
associated settings. It has been moved to ~/.voice/ to respect the
multi-user architecture.

Also set valid group and licence tags.

Change-Id: Id87fbf0e0a5baa4534cc65f8e7672991c717dfa8
Bug-Tizen: PTREL-297
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b6341834bc9fe2a9f661feff4916012bab78e6e..98baf4da979f5f958853b177c0c8021ea73be91e 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/common")
 ## Dependent packages ##
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs REQUIRED  
-       mm-player dlog ecore ecore-file dbus-1 mm-session capi-system-runtime-info vconf vconf-internal-keys
+       mm-player dlog ecore ecore-file dbus-1 mm-session capi-system-runtime-info vconf vconf-internal-keys libtzplatform-config
 )
 
 ## Client library ##

diff --git a/common/tts_defs.h b/common/tts_defs.h
index 6f65a1c58d2518891b79d88ba535cced82f737f5..3597b1c197822ffd57c1b1a9bab2069d6ca9a00e 100644 (file)
--- a/common/tts_defs.h
+++ b/common/tts_defs.h
@@ -15,6 +15,9 @@
 #ifndef _TTS_DEFS_H__
 #define _TTS_DEFS_H__
 
+/* For multi-user support */
+#include <tzplatform_config.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -63,8 +66,8 @@ extern "C" {
 #define TTSD_METHOD_ERROR              "ttsd_method_error"
 #define TTSD_METHOD_SET_STATE          "ttsd_method_set_state"
 #define TTSD_METHOD_GET_STATE          "ttsd_method_get_state"
-       
-#define MESSAGE_FILE_PATH              "/opt/home/app/.voice/tts"
+
+#define MESSAGE_FILE_PATH              tzplatform_mkpath(TZ_USER_HOME, ".voice/tts")
 
 /******************************************************************************************
 * Message Definition for Setting

diff --git a/packaging/tts.spec b/packaging/tts.spec
index 9433b28cb40fde996a9b99cbb8c8b85691878418..1fbfc33d99f7b7a5f2772c512c63e1fd9c986193 100644 (file)
--- a/packaging/tts.spec
+++ b/packaging/tts.spec
@@ -1,27 +1,27 @@
 Name:       tts
 Summary:    Text To Speech client library and daemon
 Version:    0.1.62
-Release:    1
-Group:      libs
+Release:    0
+Group:      Graphics & UI Framework/Libraries
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-Source1001:    %{name}.manifest
-Source1002:    %{name}-devel.manifest
-Requires(post): /sbin/ldconfig
+Source1001: %{name}.manifest
+Source1002: %{name}-devel.manifest
+Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(dbus-1)
-BuildRequires:  pkgconfig(mm-player)
-BuildRequires:  pkgconfig(mm-common)
-BuildRequires:  pkgconfig(mm-session)
-BuildRequires:  pkgconfig(dlog)
-BuildRequires:  pkgconfig(vconf)
-BuildRequires:  pkgconfig(vconf-internal-keys)
-BuildRequires:  pkgconfig(ecore)
-BuildRequires:  pkgconfig(ecore-file)
-BuildRequires:  pkgconfig(capi-system-runtime-info)
-
-BuildRequires:  cmake
+BuildRequires:    pkgconfig(glib-2.0)
+BuildRequires:    pkgconfig(dbus-1)
+BuildRequires:    pkgconfig(mm-player)
+BuildRequires:    pkgconfig(mm-common)
+BuildRequires:    pkgconfig(mm-session)
+BuildRequires:    pkgconfig(dlog)
+BuildRequires:    pkgconfig(vconf)
+BuildRequires:    pkgconfig(vconf-internal-keys)
+BuildRequires:    pkgconfig(ecore)
+BuildRequires:    pkgconfig(ecore-file)
+BuildRequires:    pkgconfig(capi-system-runtime-info)
+BuildRequires:    pkgconfig(libtzplatform-config)
+BuildRequires:    cmake
 
 %description
 Text To Speech client library and daemon.
@@ -56,7 +56,7 @@ mkdir -p %{buildroot}/usr/share/license
 
 %files
 %manifest %{name}.manifest
-/etc/config/sysinfo-tts.xml
+%config %{_sysconfdir}/config/sysinfo-tts.xml
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so
 %{_libdir}/voice/tts/1.0/ttsd.conf

diff --git a/server/ttsd_config.c b/server/ttsd_config.c
index fc55e3016b4e04525525dc11cdc7cdb514a9c2a0..623637db493a9b08138c21d83dfc704d016f3a25 100644 (file)
--- a/server/ttsd_config.c
+++ b/server/ttsd_config.c
@@ -15,6 +15,9 @@
 #include <runtime_info.h>
 #include <vconf.h>
 
+/* For multi-user support */
+#include <tzplatform_config.h>
+
 #include "ttsd_main.h"
 #include "ttsd_config.h"
 #include "ttsd_engine_agent.h"
@@ -22,7 +25,7 @@
 
 #define CONFIG_DEFAULT                 BASE_DIRECTORY_DEFAULT"/ttsd.conf"
 
-#define DEFAULT_ERROR_FILE_NAME                CONFIG_DIRECTORY"/ttsd_default.err"
+#define DEFAULT_ERROR_FILE_NAME                tzplatform_mkpath(TZ_USER_HOME, ".voice/ttsd_default.err")
 
 #define ENGINE_ID      "ENGINE_ID"
 #define VOICE          "VOICE"
@@ -303,4 +306,4 @@ int ttsd_config_save_error(int uid, int uttid, const char* lang, int vctype, con
        SLOG(LOG_ERROR, get_tag(), "==================================================");
 
        return 0;
-}
\ No newline at end of file
+}

diff --git a/server/ttsd_config_noti.c b/server/ttsd_config_noti.c
index 5b593bbd5aeadee0d662e2030ce5225c652f2d69..d5a7110101cd78d28e6e43e6180e696bc921d1b7 100644 (file)
--- a/server/ttsd_config_noti.c
+++ b/server/ttsd_config_noti.c
@@ -17,12 +17,15 @@
 #include <sys/inotify.h>
 #include <vconf.h>
 
+/* For multi-user support */
+#include <tzplatform_config.h>
+
 #include "ttsd_main.h"
 #include "ttsd_config.h"
 #include "ttsd_engine_agent.h"
 #include "ttsd_data.h"
 
-#define NOTI_ERROR_FILE_NAME           CONFIG_DIRECTORY"/ttsd_noti.err"
+#define NOTI_ERROR_FILE_NAME           tzplatform_mkpath(TZ_USER_HOME, ".voice/ttsd_noti.err")
 
 #define ENGINE_ID      "ENGINE_ID"
 #define VOICE          "VOICE"

diff --git a/server/ttsd_config_sr.c b/server/ttsd_config_sr.c
index 55e2f74a36513d626dd740351c2fa613fbad4fac..b5230b879e350ac0d5c12640604e0562aa3e21a0 100644 (file)
--- a/server/ttsd_config_sr.c
+++ b/server/ttsd_config_sr.c
@@ -15,12 +15,16 @@
 #include <vconf-internal-keys.h>
 #include <vconf.h>
 #include <runtime_info.h>
+
+/* For multi-user support */
+#include <tzplatform_config.h>
+
 #include "ttsd_main.h"
 #include "ttsd_config.h"
 #include "ttsd_engine_agent.h"
 #include "ttsd_data.h"
 
-#define SR_ERROR_FILE_NAME             CONFIG_DIRECTORY"/ttsd_sr.err"
+#define SR_ERROR_FILE_NAME             tzplatform_mkpath(TZ_USER_HOME, ".voice/ttsd_sr.err")
 
 #define ENGINE_ID      "ENGINE_ID"
 

diff --git a/server/ttsd_main.h b/server/ttsd_main.h
index 09786c0ea364f309b985abda888f8151c836f954..6ac5cffb0a0e82122c99bbec601a16c4210b4ede 100644 (file)
--- a/server/ttsd_main.h
+++ b/server/ttsd_main.h
@@ -24,6 +24,9 @@
 #include <dlog.h>
 #include <errno.h>
 
+/* For multi-user support */
+#include <tzplatform_config.h>
+
 #include "ttsp.h"
 #include "tts_defs.h"
 
@@ -36,13 +39,13 @@ extern "C" {
 #define ENGINE_DIRECTORY_DEFAULT               "/usr/lib/voice/tts/1.0/engine"
 #define ENGINE_DIRECTORY_DEFAULT_SETTING       "/usr/lib/voice/tts/1.0/setting"
 
-#define CONFIG_DIRECTORY                       "/opt/home/app/.voice"
-       
-#define ENGINE_DIRECTORY_DOWNLOAD              "/opt/usr/voice/tts/1.0/engine"
-#define ENGINE_DIRECTORY_DOWNLOAD_SETTING      "/opt/usr/voice/tts/1.0/setting"
+#define CONFIG_DIRECTORY               tzplatform_mkpath(TZ_USER_HOME, ".voice")
+
+#define ENGINE_DIRECTORY_DOWNLOAD              tzplatform_mkpath(TZ_USER_HOME, ".voice/tts/1.0/engine")
+#define ENGINE_DIRECTORY_DOWNLOAD_SETTING      tzplatform_mkpath(TZ_USER_HOME, ".voice/tts/1.0/setting")
 
 #define CONFIG_DEFAULT                         BASE_DIRECTORY_DEFAULT"/ttsd.conf"
-#define DEFAULT_CONFIG_FILE_NAME               CONFIG_DIRECTORY"/ttsd_default.conf"
+#define DEFAULT_CONFIG_FILE_NAME               tzplatform_mkpath(TZ_USER_HOME, ".voice/ttsd_default.conf")
 
 /* for debug message */
 #define DATA_DEBUG