Multiuser Support Added

Change-Id: Ieb587579da06f2b3f9d8466304ffb7b25d8f22f9
Signed-off-by: Chandan <ch.kumar@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 205f29f..c44103d 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,19 +16,17 @@ SET(MEDIADB-DIR ${SRC-DIR}/media-db)
 SET(MAININCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/inc)
 
 SET(PKG_NAME "${CMAKE_INSTALL_PKG_NAME}")
-SET(DESKTOP_DIR ${CMAKE_DESKTOP_DIR})
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
+SET(SHARE ${CMAKE_APP_SHARE_PACKAGES_DIR})
 SET(BINDIR "${PREFIX}/bin")
-SET(LIBDIR "/usr/lib")
 SET(RESDIR "${PREFIX}/res")
 SET(DATADIR "${CMAKE_INSTALL_DATA_DIR}")
 SET(LOCALEDIR "${RESDIR}/locale")
-SET(ICONDIR "${RESDIR}/icons/default/small")
 SET(IMAGEDIR "${RESDIR}/images")
 SET(EDJDIR "${RESDIR}/edje")
-SET(XMLDIR "/usr/share/packages")
-SET(MF_CHANGEABLEDIR "/usr/apps/${PKG_NAME}/shared/res/tables")
+SET(XMLDIR "${SHARE}")
+
 
 INCLUDE_DIRECTORIES(${MAININCLUDE})
 INCLUDE_DIRECTORIES(${SRC-DIR}/thumbnail)
@@ -125,6 +123,7 @@ INCLUDE(FindPkgConfig)
        capi-system-runtime-info
        capi-system-system-settings
        capi-media-thumbnail-util
+       libtzplatform-config
 )
 
 FOREACH(flag ${pkgs_CFLAGS})
@@ -140,7 +139,6 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DRESDIR=\"${RESDIR}\"")
 ADD_DEFINITIONS("-DDATADIR=\"${DATADIR}\"")
-ADD_DEFINITIONS("-DICONDIR=\"${ICONDIR}\"")
 ADD_DEFINITIONS("-DIMAGEDIR=\"${IMAGEDIR}\"")
 
 ADD_DEFINITIONS("-DFACTORYFS=\"$ENV{FACTORYFS}\"")
@@ -169,9 +167,7 @@ ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
 
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} -lm -lpthread)
 
-INSTALL(TARGETS ${PROJECT_NAME} ${LIBNAME}
-               RUNTIME DESTINATION ${BINDIR}
-               LIBRARY DESTINATION ${LIBDIR})
+INSTALL(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${BINDIR})
 #INSTALL(FILES ${CMAKE_SOURCE_DIR}/tools/dumpfiles.sh DESTINATION bin)
 #INSTALL(FILES ${MAININCLUDE}/myfile_filesystem_util.h DESTINATION /usr/include)
 INSTALL(DIRECTORY DESTINATION ${DATADIR})

diff --git a/data/po/CMakeLists.txt b/data/po/CMakeLists.txt
index 52fe06d..a4609b4 100755 (executable)
--- a/data/po/CMakeLists.txt
+++ b/data/po/CMakeLists.txt
@@ -21,8 +21,6 @@ FOREACH(pofile ${POFILES})
        )
        INSTALL(FILES ${moFile}
                        DESTINATION ${LOCALEDIR}/${lang}/LC_MESSAGES RENAME ${PROJECT_NAME}.mo)
-#Share mo files with Gallery UG. 
-       INSTALL(FILES ${moFile} DESTINATION /usr/apps/ug-myfile-efl/res/locale/${lang}/LC_MESSAGES RENAME ${MYFILE_UG_PROJECT_NAME}.mo)
        SET(moFiles ${moFiles} ${moFile})
 ENDFOREACH(pofile)
 

diff --git a/inc/mf-log.h b/inc/mf-log.h
index 65852e0..ab6c732 100755 (executable)
--- a/inc/mf-log.h
+++ b/inc/mf-log.h
@@ -18,7 +18,7 @@
 #ifndef __MF_LOG__
 #define __MF_LOG__
 
-#define MF_LOG_RESULT_FILE "/opt/usr/apps/org.tizen.myfile/data/log"
+#define MF_LOG_RESULT_FILE "/usr/apps/org.tizen.myfile/data/log"
 #define MF_LOG_FORMAT  "[%s] [%s] {%d} -- %s"
 
 int mf_log_init();

diff --git a/packaging/org.tizen.myfile.spec b/packaging/org.tizen.myfile.spec
index 3d16b9d..514ca33 100755 (executable)
--- a/packaging/org.tizen.myfile.spec
+++ b/packaging/org.tizen.myfile.spec
@@ -1,5 +1,3 @@
-%define _unpackaged_files_terminate_build 0
-%define _optdir /usr
 
 Name:       org.tizen.myfile
 Summary:    Myfile Application v1.0
@@ -35,14 +33,12 @@ BuildRequires:  pkgconfig(capi-system-device)
 BuildRequires:  pkgconfig(capi-system-runtime-info)
 BuildRequires:  pkgconfig(capi-system-system-settings)
 BuildRequires:  pkgconfig(capi-media-thumbnail-util)
-
-
+BuildRequires: pkgconfig(libtzplatform-config)
 
 BuildRequires:  cmake
 BuildRequires:  edje-bin
 BuildRequires:  embryo-bin
 BuildRequires:  gettext-devel
-
 BuildRequires:  boost-devel
 BuildRequires:  boost-thread
 BuildRequires:  boost-system
@@ -57,9 +53,10 @@ Group:      TO_BE/FILLED_IN
 %prep
 %setup -q
 
-%define PREFIX    /usr/apps/org.tizen.myfile
-%define RESDIR    "/usr/apps/org.tizen.myfile/res"
-%define DATADIR    "/opt/usr/apps/org.tizen.myfile/data"
+%define PREFIX    %{TZ_SYS_RO_APP}/org.tizen.myfile
+%define RESDIR    "%{TZ_SYS_RO_APP}/org.tizen.myfile/res"
+%define DATADIR    "%{TZ_SYS_RO_APP}/org.tizen.myfile/data"
+%define XMLDIR      %{TZ_SYS_RO_PACKAGES}
 
 %build
 %if 0%{?sec_build_binary_debug_enable}
@@ -68,43 +65,46 @@ export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
 export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 %endif
 
-cmake . -DCMAKE_INSTALL_PREFIX="%{PREFIX}" -DCMAKE_DESKTOP_ICON_DIR="/usr/share/icons/default/small" -DCMAKE_DESKTOP_DIR="/usr/share/applications" -DCMAKE_INSTALL_PKG_NAME="%{name}" -DCMAKE_INSTALL_DATA_DIR="%{DATADIR}"\
+cmake . -DCMAKE_INSTALL_PREFIX="%{PREFIX}" \
+       -DCMAKE_DESKTOP_ICON_DIR="%{TZ_SYS_RW_ICONS}/default/small" \
+       -DCMAKE_INSTALL_PKG_NAME="%{name}" \
+       -DCMAKE_INSTALL_DATA_DIR="%{DATADIR}" \
+       -DCMAKE_APP_SHARE_PACKAGES_DIR="%{XMLDIR}"
 
 make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}
 
-if [ ! -d %{buildroot}/opt/usr/apps/org.tizen.myfile/data ]
+if [ ! -d %{buildroot}%{TZ_SYS_RO_APP}/org.tizen.myfile/data ]
 then
-        mkdir -p %{buildroot}/opt/usr/apps/org.tizen.myfile/data
+        mkdir -p %{buildroot}%{TZ_SYS_RO_APP}/org.tizen.myfile/data
 fi
 
-if [ ! -f %{buildroot}/opt/usr/apps/org.tizen.myfile/data/.myfile_media.db ]
-        rm -rf %{buildroot}/opt/usr/apps/org.tizen.myfile/data/.myfile_media.db*
+if [ ! -f %{buildroot}/usr/apps/org.tizen.myfile/data/.myfile_media.db ]
+        rm -rf %{buildroot}%{TZ_SYS_RO_APP}/org.tizen.myfile/data/.myfile_media.db*
 then
-        sqlite3 %{buildroot}/opt/usr/apps/org.tizen.myfile/data/.myfile_media.db 'PRAGMA journal_mode = PERSIST;
+        sqlite3 %{buildroot}%{TZ_SYS_RO_APP}/org.tizen.myfile/data/.myfile_media.db 'PRAGMA journal_mode = PERSIST;
         CREATE TABLE recent_files(path TEXT, name VARCHAR(256), storage_type INT, thumbnail_path TEXT,primary key (path), unique(path) );'
 fi
 
-chmod 660 %{buildroot}/opt/usr/apps/org.tizen.myfile/data/.myfile_media.db
-chmod 660 %{buildroot}/opt/usr/apps/org.tizen.myfile/data/.myfile_media.db-journal
+chmod 660 %{buildroot}%{TZ_SYS_RO_APP}/org.tizen.myfile/data/.myfile_media.db
+chmod 660 %{buildroot}%{TZ_SYS_RO_APP}/org.tizen.myfile/data/.myfile_media.db-journal
 
 %make_install
 
 %post
-chown -R 5000:5000 /opt/usr/apps/org.tizen.myfile/data
-
+chown -R 5000:5000 %{TZ_SYS_RO_APP}/org.tizen.myfile/data
 
 %postun
 
 %files -n org.tizen.myfile
 %manifest org.tizen.myfile.manifest
 %defattr(-,root,root,-)
-/usr/apps/org.tizen.myfile/bin/myfile
-/usr/apps/org.tizen.myfile/res/locale/*
-/usr/apps/org.tizen.myfile/res/edje/*
-/opt/usr/apps/org.tizen.myfile/data
-/usr/share/packages/org.tizen.myfile.xml
-/usr/apps/org.tizen.myfile/shared/res/*
-/usr/share/icons/default/small/org.tizen.myfile.png
+%{TZ_SYS_RO_APP}/org.tizen.myfile/bin/myfile
+%{TZ_SYS_RO_APP}/org.tizen.myfile/res/locale/*
+%{TZ_SYS_RO_APP}/org.tizen.myfile/res/edje/*
+%{TZ_SYS_RO_APP}/org.tizen.myfile/data
+%{TZ_SYS_RW_PACKAGES}/org.tizen.myfile.xml
+%{TZ_SYS_RO_APP}/org.tizen.myfile/shared/res/*
+%{TZ_SYS_RW_ICONS}/default/small/org.tizen.myfile.png

diff --git a/src/media-db/mf-media-db.c b/src/media-db/mf-media-db.c
index adade1e..2576613 100755 (executable)
--- a/src/media-db/mf-media-db.c
+++ b/src/media-db/mf-media-db.c
@@ -28,7 +28,7 @@
 #include "mf-fs-util.h"
 #include "mf-dlog.h"
 
-#define MF_DB_NAME  "/opt/usr/apps/org.tizen.myfile/data/.myfile_media.db"
+#define MF_DB_NAME  "/usr/apps/org.tizen.myfile/data/.myfile_media.db"
 
 #define MF_PRAGMA_FOREIGN_KEYS_ON               "PRAGMA foreign_keys = ON;"
 #define MF_INSERT_INTO_RECENT_FILES_TABLE       "INSERT INTO %s (%s, %s, %s, %s) VALUES (?, ?, ?, ?);"