change the install path for common resources

Change-Id: I033a985181c0b2386b3894b34ac1cb59056dcef4

diff --git a/packaging/org.tizen.setting.spec b/packaging/org.tizen.setting.spec
index 74aa630535aa46af12b0caa5e03be0826154f5f0..89b852bf91f46666c689c486d7830d7b40acd44a 100755 (executable)
--- a/packaging/org.tizen.setting.spec
+++ b/packaging/org.tizen.setting.spec
@@ -74,6 +74,7 @@ BuildRequires:  pkgconfig(capi-system-system-settings)
 BuildRequires:  pkgconfig(capi-network-wifi)
 BuildRequires:  pkgconfig(capi-network-bluetooth)
 BuildRequires:  pkgconfig(capi-media-metadata-extractor)
+BuildRequires:  pkgconfig(capi-appfw-app-common)
 BuildRequires:  pkgconfig(shortcut)
 BuildRequires:  pkgconfig(ecore-evas)
 BuildRequires:  pkgconfig(pkgmgr)
@@ -144,8 +145,9 @@ Group: Application Framework/Settings
 
 %define PREFIX    %{_prefix}/apps/org.tizen.setting
 %define OPTPREFIX /opt/usr/apps/org.tizen.setting
-%define OPTSHAREREFIX    /opt/usr/share/settings
 %define RESDIR    %{PREFIX}/res
+%define OPTSHAREREFIX    /usr/apps/org.tizen.setting/shared/res/settings
+
 %define DATADIR    %{PREFIX}/data
 %define IMAGEDIR    %{RESDIR}/images
 CFLAGS+=" -fPIC -fvisibility=hidden ";export CFLAGS
@@ -214,14 +216,14 @@ mkdir -p %{buildroot}%{_libdir}/systemd/system/default.target.wants
 %clean
 
 %post
-if [ ! -d %{OPTPREFIX} ]
-then
-       echo "CREATE %{OPTPREFIX} DIR"
-    mkdir -p %{OPTPREFIX}
-       echo "CREATE %{OPTPREFIX}/data DIR"
-    mkdir -p %{OPTPREFIX}/data
-fi
-chmod a+w %{OPTPREFIX}/data
+#if [ ! -d %{OPTPREFIX} ]
+#then
+#      echo "CREATE %{OPTPREFIX} DIR"
+#    mkdir -p %{OPTPREFIX}
+#      echo "CREATE %{OPTPREFIX}/data DIR"
+#    mkdir -p %{OPTPREFIX}/data
+#fi
+#chmod a+w %{OPTPREFIX}/data
 
 
 
@@ -248,7 +250,8 @@ GOPTION="-g 6514"
 # for support shared menu icons
 ln -s %{RESDIR}/icons %{PREFIX}/shared/res/icons
 
-#%{PREFIX}/bin/setting_conf_util timezone_init
+#APP_PATH_INFO=`%{PREFIX}/bin/setting_conf_util get_data_path`
+#echo "-------------------------------------------------------------> "$APP_PATH_INFO
 sync
 
 mkdir -p %{_prefix}/ug/bin/

diff --git a/setting-common/CMakeLists.txt b/setting-common/CMakeLists.txt
index b52bc9fefa181a8c442a4a425e8cce02289c18e6..410d3fa49aa77bc7b1678ca6357b705e0ed6b6b6 100755 (executable)
--- a/setting-common/CMakeLists.txt
+++ b/setting-common/CMakeLists.txt
@@ -10,6 +10,7 @@ INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_common_data REQUIRED appcore-efl elementary vconf openssl evas
 ecore ecore-imf json-glib-1.0 edje glib-2.0 libxml-2.0 ui-gadget-1 alarm-service cairo
 capi-appfw-application capi-system-info capi-system-system-settings pkgmgr-info
+capi-appfw-app-common
 efl-extension efl-assist notification feedback capi-media-player capi-media-sound-manager dbus-1 icu-i18n icu-io icu-le icu-lx icu-uc eventsystem)
 
 

diff --git a/setting-common/src/setting-cfg.c b/setting-common/src/setting-cfg.c
index b6b8fb702f607d5e1e8310b48cf63e2d6bfa60d6..f27c8d61cbe3ca295d4fadf0cf98c2d54bec681d 100755 (executable)
--- a/setting-common/src/setting-cfg.c
+++ b/setting-common/src/setting-cfg.c
@@ -28,17 +28,29 @@
 #include <setting-common-data-slp-setting.h>
 #include <unistd.h>
 #include <vconf.h>
+#include <app_common.h>
 
-#define CFG_FILE_DIR_PATH      "/opt/usr/apps/org.tizen.setting/data/"
-#define CFG_FILE_PATH          CFG_FILE_DIR_PATH"setting.cfg"
+#define CFG_FILE_DIR_PATH      setting_cfg_get_dir_path()
+#define CFG_FILE_PATH          setting_cfg_get_path()
 
 JsonParser *parser;
 JsonNode   *root; /* category_list */
 
+EXPORT_PUBLIC
+char *setting_cfg_get_dir_path()
+{
+       return app_get_data_path();
+}
+
+
+// /home/owner/apps_rw/org.tizen.setting/data/setting.cfg!
 EXPORT_PUBLIC
 char *setting_cfg_get_path()
 {
-       return CFG_FILE_PATH;
+       char* path = app_get_data_path();
+       char string[1024];
+       sprintf(string, "%s%s", path, "setting.cfg");
+       return strdup(string);
 }
 
 int setting_cfg_file_write(JsonNode *node);

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 22c56f7ea44658ddd97251ce21bdcdda022163f0..ed50178facd7d35c8178deca66521c8c94bfa3dd 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -254,12 +254,11 @@ INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/images DESTINATION /usr/apps/${SE
 
 # install media-data ; should be at /opt/usr/share
 IF("${BUILD_ARCH}" STREQUAL "arm")
-       INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/media-data-sdk/settings DESTINATION /opt/usr/share PATTERN "*")
+       INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/media-data-sdk/settings DESTINATION /usr/apps/org.tizen.setting/shared/res PATTERN "*")
 ELSE("${BUILD_ARCH}" STREQUAL "arm")
-       INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/media-data-sdk/settings DESTINATION /opt/usr/share PATTERN "*")
+       INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/media-data-sdk/settings DESTINATION /usr/apps/org.tizen.setting/shared/res PATTERN "*")
 ENDIF("${BUILD_ARCH}" STREQUAL "arm")
 
-
 # install the SEARCH db
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/resource/test.db DESTINATION ${APP_DATA_DIR_PATH})