Change the DB PATH for 3.0 temporarly.

Using hard-coded path for temporarly.

Change-Id: I0e7b65476f4d3933344754e36c387e9978fb352b

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f34e95..d041200 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,7 +79,7 @@ SET(BINDIR "${PREFIX}/bin")
 SET(RESDIR "${PREFIX}/res")
 SET(EDJEDIR "${RESDIR}/edje")
 SET(ICONDIR "${RESDIR}/icons")
-SET(DATADIR "/opt${PREFIX}/data")
+SET(DATADIR "/home/owner/apps_rw/${PKGNAME}/data")
 SET(LOCALEDIR "${RESDIR}/locale")
 SET(IMAGEDIR "${RESDIR}/images")
 

diff --git a/cluster/cluster-data-list.h b/cluster/cluster-data-list.h
index 893b525..2dd8722 100755 (executable)
--- a/cluster/cluster-data-list.h
+++ b/cluster/cluster-data-list.h
@@ -34,10 +34,10 @@
 #define DATADIR "/opt"PREFIX"/data"
 #endif
 #ifndef TIZEN_3_0
-#define DBPATH tzplatform_mkpath(TZ_USER_DB, ".cluster-data.db")
-#define ROOTDBPATH DATADIR"/dbspace/.cluster-data.db"
+#define DBPATH "/home/owner/apps_rw/org.tizen.homescreen/data/dbspace/.cluster-data.db"
+#define ROOTDBPATH "/home/owner/apps_rw/org.tizen.homescreen/data/dbspace/.cluster-data.db"
 #else
-#define DBPATH DATADIR"/dbspace/.cluster-data.db"
+#define DBPATH "/home/owner/apps_rw/org.tizen.homescreen/data/dbspace/.cluster-data.db"
 #endif
 #define QUERY_MAX 4096
 

diff --git a/cluster/cluster-initdb.cpp b/cluster/cluster-initdb.cpp
index 469bdfb..cc72074 100755 (executable)
--- a/cluster/cluster-initdb.cpp
+++ b/cluster/cluster-initdb.cpp
@@ -38,10 +38,10 @@
 #endif
 
 #ifndef TIZEN_3_0
-#define DBPATH tzplatform_mkpath(TZ_USER_DB, ".cluster-data.db")
-#define ROOTDBPATH DATADIR"/dbspace/.cluster-data.db"
+#define DBPATH "/home/owner/apps_rw/org.tizen.homescreen/data/dbspace/.cluster-data.db"
+#define ROOTDBPATH "/home/owner/apps_rw/org.tizen.homescreen/data/dbspace/.cluster-data.db"
 #else
-#define DBPATH DATADIR"/dbspace/.cluster-data.db"
+#define DBPATH "/home/owner/apps_rw/org.tizen.homescreen/data/dbspace/.cluster-data.db"
 #endif
 #define XMLPATH DATADIR"/xmls/homescreen_items.xml"
 #define TEMPLATEXMLPATH DATADIR"/xmls/cluster_home_templates.xml"

diff --git a/main/homescreen.cpp b/main/homescreen.cpp
index 25eacf6..e75d622 100755 (executable)
--- a/main/homescreen.cpp
+++ b/main/homescreen.cpp
@@ -27,9 +27,8 @@ using namespace Dali;
 using namespace ClusterHome3D;
 using namespace std;
 
-#define CLUSTER_DBPATH tzplatform_mkpath(TZ_USER_DB, ".cluster-data.db")
-#define MAIN_DBPATH tzplatform_mkpath(TZ_USER_DB, ".mainmenu-data.db")
-
+#define CLUSTER_DBPATH "/home/owner/apps_rw/org.tizen.homescreen/data/dbspace/.cluster-data.db"
+#define MAIN_DBPATH "/home/owner/apps_rw/org.tizen.homescreen/data/dbspace/.mainmenu-data.db"
 
 CHomeScreen::CHomeScreen(Dali::Application& application)
 :  mApplication(application),

diff --git a/mainmenu/mainmenu-data-manager.cpp b/mainmenu/mainmenu-data-manager.cpp
index 56e66f7..74879f2 100755 (executable)
--- a/mainmenu/mainmenu-data-manager.cpp
+++ b/mainmenu/mainmenu-data-manager.cpp
@@ -52,10 +52,10 @@
 #endif
 
 #ifndef TIZEN_3_0
-#define DBPATH tzplatform_mkpath(TZ_USER_DB, ".mainmenu-data.db")
-#define ROOTDBPATH DATADIR"/dbspace/.mainmenu-data.db"
+#define DBPATH "/home/owner/apps_rw/org.tizen.homescreen/data/dbspace/.mainmenu-data.db"
+#define ROOTDBPATH "/home/owner/apps_rw/org.tizen.homescreen/data/dbspace/.mainmenu-data.db"
 #else
-#define DBPATH DATADIR"/dbspace/.mainmenu-data.db"
+#define DBPATH "/home/owner/apps_rw/org.tizen.homescreen/data/dbspace/.mainmenu-data.db"
 #endif
 
 

diff --git a/packaging/org.tizen.homescreen.spec b/packaging/org.tizen.homescreen.spec
index 959e207..1129746 100755 (executable)
--- a/packaging/org.tizen.homescreen.spec
+++ b/packaging/org.tizen.homescreen.spec
@@ -1,5 +1,5 @@
 %define APP_PREFIX /usr/apps/org.tizen.homescreen
-%define APP_DATADIR /opt/usr/apps/org.tizen.homescreen/data
+%define APP_DATADIR /home/owner/apps_rw/org.tizen.homescreen/data
 %define APP_NAME org.tizen.homescreen
 
 Name:       org.tizen.homescreen
@@ -114,14 +114,16 @@ cp LICENSE %{buildroot}/usr/share/license/%{APP_NAME}
 GOPTION="-g 6514"
 
 echo "Remove prevous data"
-rm -rf /home/owner/.applications/dbspace/.cluster-data.db*;
-rm -rf /home/owner/.applications/dbspace/.mainmenu-data.db*;
+rm -rf %{APP_DATADIR}/dbspace/.cluster-data.db*;
+rm -rf %{APP_DATADIR}/dbspace/.mainmenu-data.db*;
 
-if [ ! -d /home/owner/.applications/dbspace ]
+rm -rf %{APP_DATADIR}/dbspace/
+if [ ! -d %{APP_DATADIR}/dbspace/ ]
 then
-       mkdir /home/owner/.applications/dbspace
+       mkdir %{APP_DATADIR}/dbspace/
 fi
 
+rm -rf %{APP_DATADIR}/shortcut
 if [ ! -d %{APP_DATADIR}/shortcut ]
 then
        mkdir %{APP_DATADIR}/shortcut
@@ -129,6 +131,7 @@ else
        rm -rf %{APP_DATADIR}/shortcut/*
 fi
 
+rm -rf %{APP_DATADIR}/wallpaper 
 if [ ! -d %{APP_DATADIR}/wallpaper ]
 then
        mkdir %{APP_DATADIR}/wallpaper