Move CBOR file from apps_rw to app's res dir

Change-Id: Ic6f5738c4f0d1995ff0f4ef22ede149cc204a8ef

diff --git a/CMakeLists.txt b/CMakeLists.txt
index afb2c10..aa33029 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ pkg_check_modules(APP_PKGS REQUIRED
        ecore
 )
 
-ADD_DEFINITIONS(-DCBOR_FILE_IN_RES="${INSTALL_OWNER_RESDIR}/${CBOR_FILE}")
+ADD_DEFINITIONS(-DCBOR_FILE_IN_RES="${INSTALL_RESDIR}/${CBOR_FILE}")
 ADD_DEFINITIONS(-DCBOR_FILE_IN_DATA="${INSTALL_OWNER_DATADIR}/${CBOR_FILE}")
 
 FOREACH (flag ${APP_PKGS_CFLAGS})
@@ -48,6 +48,6 @@ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${INSTALL_EXEC_PREFIX})
 INSTALL(DIRECTORY DESTINATION ${INSTALL_OWNER_DATADIR})
 INSTALL(FILES ${ORG_PREFIX}.${PROJECT_NAME}.xml DESTINATION ${SYS_PACKAGES_DIR})
 INSTALL(FILES ${PROJECT_ROOT_DIR}/shared/res/default_icon.png DESTINATION ${SYS_ICONS_DIR} RENAME ${PROJECT_NAME}.png)
-INSTALL(FILES ${PROJECT_ROOT_DIR}/res/${CBOR_FILE} DESTINATION ${INSTALL_OWNER_RESDIR})
+INSTALL(FILES ${PROJECT_ROOT_DIR}/res/${CBOR_FILE} DESTINATION ${INSTALL_RESDIR})
 
 # End of a file

diff --git a/packaging/org.tizen.position-finder-client.spec b/packaging/org.tizen.position-finder-client.spec
index 772d094..237ebe3 100644 (file)
--- a/packaging/org.tizen.position-finder-client.spec
+++ b/packaging/org.tizen.position-finder-client.spec
@@ -35,7 +35,7 @@ Client for Position Finder
 %define _pkg_shared_dir %{_pkg_dir}/shared
 %define _pkg_data_dir %{_pkg_dir}/data
 %define _pkg_rw_data_dir /home/owner/apps_rw/%{alias}/data
-%define _pkg_res_dir /home/owner/apps_rw/%{alias}/res
+%define _pkg_res_dir %{_pkg_dir}/%{alias}/res
 %define _sys_icons_dir %{_pkg_shared_dir}/res
 %define _sys_packages_dir %{TZ_SYS_RO_PACKAGES}
 %define _sys_license_dir %{TZ_SYS_SHARE}/license
@@ -56,7 +56,7 @@ cmake . -DP_NAME=%{P_NAME} \
        -DAPP_LABEL=%{APP_LABEL} \
        -DINSTALL_PREFIX=%{_pkg_dir} \
        -DINSTALL_OWNER_DATADIR=%{_pkg_rw_data_dir} \
-       -DINSTALL_OWNER_RESDIR=%{_pkg_res_dir} \
+       -DINSTALL_RESDIR=%{_pkg_res_dir} \
        -DSYS_ICONS_DIR=%{_sys_icons_dir} \
        -DSYS_PACKAGES_DIR=%{_sys_packages_dir} \
        -DCBOR_FILE=%{_cbor_file}

diff --git a/src/connectivity.c b/src/connectivity.c
index 3b40b1d..576ff3d 100644 (file)
--- a/src/connectivity.c
+++ b/src/connectivity.c
@@ -35,8 +35,6 @@
 #define DOOR_RESOURCE_URI_PREFIX "/door"
 #define MAXIMUM_LIVE_INTERVAL 10l
 #define BUFSIZE 1024
-#define CBOR_FILE_IN_RES       "/home/owner/apps_rw/org.tizen.position-finder-client/res/iotcon-test-svr-db-client.dat"
-#define CBOR_FILE_IN_DATA      "/home/owner/apps_rw/org.tizen.position-finder-client/data/iotcon-test-svr-db-client.dat"
 #define ULTRASONIC_RESOURCE_TYPE "org.tizen.door"
 
 struct _connectivity_observe_resource_cb_s {