update directory path for migration

Change-Id: I80e2cfd3120f8326a3872c525498fa584bbad328
Signed-off-by: Wonnam Jang <wn.jang@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8760065a62698e4644669b0eb123de16b00de5ed..dba84628d600ed9528b59df3fec7eaa67cb930df 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,9 +55,9 @@ ADD_SUBDIRECTORY(server)
 ADD_SUBDIRECTORY(test)
 
 ## config ##
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/stt-config.xml DESTINATION ${LIBDIR}/voice/stt/1.0)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/stt-config.xml DESTINATION ${TZ_SYS_RO_SHARE}/voice/stt/1.0)
 
 ## Dbus service ##
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.voice.sttserver.service DESTINATION /usr/share/dbus-1/services)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.voice.sttserver.service DESTINATION ${TZ_SYS_RO_SHARE}/dbus-1/services)
 
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/stt-server.conf DESTINATION /etc/dbus-1/session.d)

diff --git a/common/stt_defs.h b/common/stt_defs.h
index 35e521525af45b9443ff3d0b81ac1119759bada6..9e331b04905bbfb25fd25f9fd7733f14f1b7e3ee 100644 (file)
--- a/common/stt_defs.h
+++ b/common/stt_defs.h
@@ -70,17 +70,12 @@ extern "C" {
 
 #define STT_TIME_INFO_PATH             tzplatform_mkpath(TZ_USER_HOME, "share/.voice/stt-time.xml")
 
-#define STT_DEFAULT_CONFIG             STT_LIBDIR"/voice/stt/1.0/stt-config.xml"
 #define STT_CONFIG                     tzplatform_mkpath(TZ_USER_HOME, "share/.voice/stt-config.xml")
+#define STT_DEFAULT_CONFIG             tzplatform_mkpath(TZ_SYS_RO_SHARE, "/voice/stt/1.0/stt-config.xml")
 
-#define STT_DEFAULT_ENGINE             STT_LIBDIR"/voice/stt/1.0/engine"
-#define STT_DOWNLOAD_ENGINE            tzplatform_mkpath(TZ_USER_HOME, "share/.voice/stt/1.0/engine")
-
-#define STT_DEFAULT_ENGINE_INFO                STT_LIBDIR"/voice/stt/1.0/engine-info"
-#define STT_DOWNLOAD_ENGINE_INFO       tzplatform_mkpath(TZ_USER_HOME, "share/.voice/stt/1.0/engine-info")
-
-#define STT_DEFAULT_ENGINE_SETTING     STT_LIBDIR"/voice/stt/1.0/engine-setting"
-#define STT_DOWNLOAD_ENGINE_SETTING    tzplatform_mkpath(TZ_USER_HOME, "share/.voice/stt/1.0/engine-setting")
+#define STT_DEFAULT_ENGINE             tzplatform_mkpath(TZ_SYS_RO_SHARE, "/voice/stt/1.0/engine")
+#define STT_DEFAULT_ENGINE_INFO                tzplatform_mkpath(TZ_SYS_RO_SHARE, "/voice/stt/1.0/engine-info")
+#define STT_DEFAULT_ENGINE_SETTING     tzplatform_mkpath(TZ_SYS_RO_SHARE, "/voice/stt/1.0/engine-setting")
 
 #define STT_BASE_LANGUAGE              "en_US"
 

diff --git a/packaging/stt.spec b/packaging/stt.spec
index a18be171a331e2fa80f9f0c01068ffae3f1902c2..13d9a77a9a553ecda2d9b6782d2761f2af910c4b 100644 (file)
--- a/packaging/stt.spec
+++ b/packaging/stt.spec
@@ -75,13 +75,14 @@ export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
 export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 
 
-cmake . -DCMAKE_INSTALL_PREFIX=/usr -DLIBDIR=%{_libdir} -DINCLUDEDIR=%{_includedir}
+cmake . -DCMAKE_INSTALL_PREFIX=/usr -DLIBDIR=%{_libdir} -DINCLUDEDIR=%{_includedir} \
+        -DTZ_SYS_RO_SHARE=%TZ_SYS_RO_SHARE -DTZ_SYS_BIN=%TZ_SYS_BIN
 make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/usr/share/license
-install LICENSE.APLv2 %{buildroot}/usr/share/license/%{name}
+mkdir -p %{buildroot}%{TZ_SYS_RO_SHARE}/license
+install LICENSE.APLv2 %{buildroot}%{TZ_SYS_RO_SHARE}/license/%{name}
 
 %make_install
 
@@ -90,7 +91,7 @@ install LICENSE.APLv2 %{buildroot}/usr/share/license/%{name}
 
 mkdir -p %{_libdir}/voice/
 
-mkdir -p /usr/share/voice/test
+mkdir -p %{TZ_SYS_RO_SHARE}/voice/test
 
 
 %postun -p /sbin/ldconfig
@@ -100,12 +101,12 @@ mkdir -p /usr/share/voice/test
 %license LICENSE.APLv2
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so
-%{_libdir}/voice/stt/1.0/stt-config.xml
 %{_bindir}/stt-daemon
-/usr/share/dbus-1/services/org.tizen.voice*
 /etc/dbus-1/session.d/stt-server.conf
-/usr/share/voice/test/stt-test
-/usr/share/license/%{name}
+%{TZ_SYS_RO_SHARE}/voice/stt/1.0/stt-config.xml
+%{TZ_SYS_RO_SHARE}/dbus-1/services/org.tizen.voice*
+%{TZ_SYS_RO_SHARE}/voice/test/stt-test
+%{TZ_SYS_RO_SHARE}/license/%{name}
 
 %files devel
 %manifest %{name}-devel.manifest

diff --git a/server/sttd_engine_agent.c b/server/sttd_engine_agent.c
index 4376d7f1c042ac14813ace9522a2c0feac1e303b..9f3d4b8669796096abfc372024fb2c4e57f4e9ec 100644 (file)
--- a/server/sttd_engine_agent.c
+++ b/server/sttd_engine_agent.c
@@ -387,47 +387,6 @@ int sttd_engine_agent_initialize_engine_list()
                SLOG(LOG_WARN, TAG_STTD, "[Engine Agent WARNING] Fail to open default directory");
        }
 
-       /* Get file name from downloadable engine directory */
-       dp  = opendir(STT_DOWNLOAD_ENGINE);
-       if (NULL != dp) {
-               do {
-                       ret = readdir_r(dp, &entry, &dirp);
-                       if (0 != ret) {
-                               SLOG(LOG_ERROR, TAG_STTD, "[File ERROR] Fail to read directory");
-                               break;
-                       }
-
-                       if (NULL != dirp) {
-                               sttengine_info_s* info;
-                               char* filepath;
-                               int filesize;
-
-                               filesize = strlen(STT_DOWNLOAD_ENGINE) + strlen(dirp->d_name) + 5;
-                               filepath = (char*)calloc(filesize, sizeof(char));
-
-                               if (NULL != filepath) {
-                                       snprintf(filepath, filesize, "%s/%s", STT_DOWNLOAD_ENGINE, dirp->d_name);
-                               } else {
-                                       SLOG(LOG_ERROR, TAG_STTD, "[Engine Agent ERROR] Memory not enouth!!");
-                                       continue;
-                               }
-
-                               /* get its info and update engine list */
-                               if (0 == __internal_get_engine_info(filepath, &info)) {
-                                       /* add engine info to g_engine_list */
-                                       g_engine_list = g_slist_append(g_engine_list, info);
-                               }
-
-                               if (NULL != filepath)
-                                       free(filepath);
-                       }
-               } while (NULL != dirp);
-
-               closedir(dp);
-       } else {
-               SLOG(LOG_WARN, TAG_STTD, "[Engine Agent WARNING] Fail to open downloadable directory");
-       }
-
        if (0 >= g_slist_length(g_engine_list)) {
                SLOG(LOG_ERROR, TAG_STTD, "[Engine Agent ERROR] No Engine");
                return STTD_ERROR_ENGINE_NOT_FOUND;

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 1556ae6e5d45fe05a54d49656264fe648ada06fd..79680d0864352ed8f4bc2dab10532e2cc8ad796b 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -25,4 +25,4 @@ ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
 
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_test_LDFLAGS} stt stt_file)
 
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/share/voice/test)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${TZ_SYS_RO_SHARE}/voice/test)