change the resource file locations to /opt/usr/share form /opt/share

Signed-off-by: jy910.yun <jy910.yun@samsung.com>
Change-Id: I84842b0628fbe77ddb272f81445afc5d3deb6591

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79cd01a..5a29c07 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,8 +7,8 @@ SET(LIBDIR ${LIB_INSTALL_DIR})
 SET(INCLUDEDIR "\${prefix}/include/${PROJECT_NAME}")
 SET(VERSION 0.1.4)
 
-SET(SVI_DATA_PATH ${CMAKE_CURRENT_SOURCE_DIR}/svidata)
-SET(SVI_DATA_DIRS ${SVI_DATA_PATH}/svi)
+SET(FEEDBACK_DATA_PATH ${CMAKE_CURRENT_SOURCE_DIR}/data)
+SET(FEEDBACK_DATA_DIRS ${FEEDBACK_DATA_PATH}/feedback)
 
 SET(SRCS
        src/feedback.c
@@ -72,9 +72,9 @@ FOREACH(hfile ${SVI_HEADERS})
        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${hfile} DESTINATION include/${SVI_NAME})
 ENDFOREACH(hfile)
 
-FOREACH(svidatadir ${SVI_DATA_DIRS})
-    INSTALL(DIRECTORY ${svidatadir} DESTINATION share)
-ENDFOREACH(svidatadir)
+FOREACH(datadir ${FEEDBACK_DATA_DIRS})
+    INSTALL(DIRECTORY ${datadir} DESTINATION share)
+ENDFOREACH(datadir)
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
 INSTALL(TARGETS ${SVI_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)

diff --git a/svidata/svi/haptic/default/Basic_call.tht b/data/feedback/haptic/default/Basic_call.tht
similarity index 100%
rename from svidata/svi/haptic/default/Basic_call.tht
rename to data/feedback/haptic/default/Basic_call.tht

diff --git a/svidata/svi/haptic/touch/touch.tht b/data/feedback/haptic/touch/touch.tht
similarity index 100%
rename from svidata/svi/haptic/touch/touch.tht
rename to data/feedback/haptic/touch/touch.tht

diff --git a/svidata/svi/sound/operation/call_connect.wav b/data/feedback/sound/operation/call_connect.wav
similarity index 100%
rename from svidata/svi/sound/operation/call_connect.wav
rename to data/feedback/sound/operation/call_connect.wav

diff --git a/svidata/svi/sound/operation/call_disconnect.wav b/data/feedback/sound/operation/call_disconnect.wav
similarity index 100%
rename from svidata/svi/sound/operation/call_disconnect.wav
rename to data/feedback/sound/operation/call_disconnect.wav

diff --git a/svidata/svi/sound/operation/charger_connection.wav b/data/feedback/sound/operation/charger_connection.wav
similarity index 100%
rename from svidata/svi/sound/operation/charger_connection.wav
rename to data/feedback/sound/operation/charger_connection.wav

diff --git a/svidata/svi/sound/operation/fully_charged.wav b/data/feedback/sound/operation/fully_charged.wav
similarity index 100%
rename from svidata/svi/sound/operation/fully_charged.wav
rename to data/feedback/sound/operation/fully_charged.wav

diff --git a/svidata/svi/sound/operation/list_reorder.wav b/data/feedback/sound/operation/list_reorder.wav
similarity index 100%
rename from svidata/svi/sound/operation/list_reorder.wav
rename to data/feedback/sound/operation/list_reorder.wav

diff --git a/svidata/svi/sound/operation/lock.wav b/data/feedback/sound/operation/lock.wav
similarity index 100%
rename from svidata/svi/sound/operation/lock.wav
rename to data/feedback/sound/operation/lock.wav

diff --git a/svidata/svi/sound/operation/low_battery.wav b/data/feedback/sound/operation/low_battery.wav
similarity index 100%
rename from svidata/svi/sound/operation/low_battery.wav
rename to data/feedback/sound/operation/low_battery.wav

diff --git a/svidata/svi/sound/operation/minute_minder.wav b/data/feedback/sound/operation/minute_minder.wav
similarity index 100%
rename from svidata/svi/sound/operation/minute_minder.wav
rename to data/feedback/sound/operation/minute_minder.wav

diff --git a/svidata/svi/sound/operation/power_on.wav b/data/feedback/sound/operation/power_on.wav
similarity index 100%
rename from svidata/svi/sound/operation/power_on.wav
rename to data/feedback/sound/operation/power_on.wav

diff --git a/svidata/svi/sound/operation/shutter.wav b/data/feedback/sound/operation/shutter.wav
similarity index 100%
rename from svidata/svi/sound/operation/shutter.wav
rename to data/feedback/sound/operation/shutter.wav

diff --git a/svidata/svi/sound/operation/slider_sweep.wav b/data/feedback/sound/operation/slider_sweep.wav
similarity index 100%
rename from svidata/svi/sound/operation/slider_sweep.wav
rename to data/feedback/sound/operation/slider_sweep.wav

diff --git a/svidata/svi/sound/operation/unlock.wav b/data/feedback/sound/operation/unlock.wav
similarity index 100%
rename from svidata/svi/sound/operation/unlock.wav
rename to data/feedback/sound/operation/unlock.wav

diff --git a/svidata/svi/sound/operation/volume_control.wav b/data/feedback/sound/operation/volume_control.wav
similarity index 100%
rename from svidata/svi/sound/operation/volume_control.wav
rename to data/feedback/sound/operation/volume_control.wav

diff --git a/svidata/svi/sound/touch/key0.wav b/data/feedback/sound/touch/key0.wav
similarity index 100%
rename from svidata/svi/sound/touch/key0.wav
rename to data/feedback/sound/touch/key0.wav

diff --git a/svidata/svi/sound/touch/key1.wav b/data/feedback/sound/touch/key1.wav
similarity index 100%
rename from svidata/svi/sound/touch/key1.wav
rename to data/feedback/sound/touch/key1.wav

diff --git a/svidata/svi/sound/touch/key2.wav b/data/feedback/sound/touch/key2.wav
similarity index 100%
rename from svidata/svi/sound/touch/key2.wav
rename to data/feedback/sound/touch/key2.wav

diff --git a/svidata/svi/sound/touch/key3.wav b/data/feedback/sound/touch/key3.wav
similarity index 100%
rename from svidata/svi/sound/touch/key3.wav
rename to data/feedback/sound/touch/key3.wav

diff --git a/svidata/svi/sound/touch/key4.wav b/data/feedback/sound/touch/key4.wav
similarity index 100%
rename from svidata/svi/sound/touch/key4.wav
rename to data/feedback/sound/touch/key4.wav

diff --git a/svidata/svi/sound/touch/key5.wav b/data/feedback/sound/touch/key5.wav
similarity index 100%
rename from svidata/svi/sound/touch/key5.wav
rename to data/feedback/sound/touch/key5.wav

diff --git a/svidata/svi/sound/touch/key6.wav b/data/feedback/sound/touch/key6.wav
similarity index 100%
rename from svidata/svi/sound/touch/key6.wav
rename to data/feedback/sound/touch/key6.wav

diff --git a/svidata/svi/sound/touch/key7.wav b/data/feedback/sound/touch/key7.wav
similarity index 100%
rename from svidata/svi/sound/touch/key7.wav
rename to data/feedback/sound/touch/key7.wav

diff --git a/svidata/svi/sound/touch/key8.wav b/data/feedback/sound/touch/key8.wav
similarity index 100%
rename from svidata/svi/sound/touch/key8.wav
rename to data/feedback/sound/touch/key8.wav

diff --git a/svidata/svi/sound/touch/key9.wav b/data/feedback/sound/touch/key9.wav
similarity index 100%
rename from svidata/svi/sound/touch/key9.wav
rename to data/feedback/sound/touch/key9.wav

diff --git a/svidata/svi/sound/touch/keyasterisk.wav b/data/feedback/sound/touch/keyasterisk.wav
similarity index 100%
rename from svidata/svi/sound/touch/keyasterisk.wav
rename to data/feedback/sound/touch/keyasterisk.wav

diff --git a/svidata/svi/sound/touch/keysharp.wav b/data/feedback/sound/touch/keysharp.wav
similarity index 100%
rename from svidata/svi/sound/touch/keysharp.wav
rename to data/feedback/sound/touch/keysharp.wav

diff --git a/svidata/svi/sound/touch/sip.wav b/data/feedback/sound/touch/sip.wav
similarity index 100%
rename from svidata/svi/sound/touch/sip.wav
rename to data/feedback/sound/touch/sip.wav

diff --git a/svidata/svi/sound/touch/sip_backspace.wav b/data/feedback/sound/touch/sip_backspace.wav
similarity index 100%
rename from svidata/svi/sound/touch/sip_backspace.wav
rename to data/feedback/sound/touch/sip_backspace.wav

diff --git a/svidata/svi/sound/touch/touch.wav b/data/feedback/sound/touch/touch.wav
similarity index 100%
rename from svidata/svi/sound/touch/touch.wav
rename to data/feedback/sound/touch/touch.wav

diff --git a/svidata/svi/vibration.xml b/data/feedback/vibration.xml
similarity index 100%
rename from svidata/svi/vibration.xml
rename to data/feedback/vibration.xml

diff --git a/include/feedback-file.h b/include/feedback-file.h
index 70be298..435be83 100644 (file)
--- a/include/feedback-file.h
+++ b/include/feedback-file.h
@@ -19,8 +19,8 @@
 #ifndef __FEEDBACK_FILE_H__
 #define __FEEDBACK_FILE_H__
 
-#define FEEDBACK_DATA_DIR                      "/opt/share/svi"
-#define FEEDBACK_ORIGIN_DATA_DIR       "/usr/share/svi"
+#define FEEDBACK_DATA_DIR                      "/opt/usr/share/feedback"
+#define FEEDBACK_ORIGIN_DATA_DIR       "/usr/share/feedback"
 
 #define FEEDBACK_SOUND_DIR                     FEEDBACK_DATA_DIR"/sound"
 #define FEEDBACK_SOUND_TOUCH_DIR       FEEDBACK_SOUND_DIR"/touch"

diff --git a/packaging/libfeedback.spec b/packaging/libfeedback.spec
index cb5ea93..5348d4c 100644 (file)
--- a/packaging/libfeedback.spec
+++ b/packaging/libfeedback.spec
@@ -69,10 +69,10 @@ make
 rm -rf %{buildroot}
 %make_install
 
-mkdir -p %{buildroot}/opt/share/svi/sound/touch
-mkdir -p %{buildroot}/opt/share/svi/sound/operation
-mkdir -p %{buildroot}/opt/share/svi/haptic/default
-mkdir -p %{buildroot}/opt/share/svi/haptic/touch
+mkdir -p %{buildroot}/opt/usr/share/feedback/sound/touch
+mkdir -p %{buildroot}/opt/usr/share/feedback/sound/operation
+mkdir -p %{buildroot}/opt/usr/share/feedback/haptic/default
+mkdir -p %{buildroot}/opt/usr/share/feedback/haptic/touch
 
 mkdir -p %{buildroot}%{_datadir}/license
 cp LICENSE.APLv2 %{buildroot}%{_datadir}/license/%{name}
@@ -84,42 +84,42 @@ cp LICENSE.APLv2 %{buildroot}%{_datadir}/license/%{name}
 %postun -n libsvi -p /sbin/ldconfig
 
 %post -n svi-data
-ln -s %{_datadir}/svi/sound/touch/key0.wav            /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/touch/key1.wav            /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/touch/key2.wav            /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/touch/key3.wav            /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/touch/key4.wav            /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/touch/key5.wav            /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/touch/key6.wav            /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/touch/key7.wav            /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/touch/key8.wav            /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/touch/key9.wav            /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/touch/keyasterisk.wav     /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/touch/keysharp.wav        /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/touch/sip.wav             /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/touch/sip_backspace.wav   /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/touch/touch.wav           /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/operation/call_connect.wav         /opt/share/svi/sound/operation
-ln -s %{_datadir}/svi/sound/operation/call_disconnect.wav      /opt/share/svi/sound/operation
-ln -s %{_datadir}/svi/sound/operation/charger_connection.wav   /opt/share/svi/sound/operation
-ln -s %{_datadir}/svi/sound/operation/fully_charged.wav        /opt/share/svi/sound/operation
-ln -s %{_datadir}/svi/sound/operation/list_reorder.wav         /opt/share/svi/sound/operation
-ln -s %{_datadir}/svi/sound/operation/lock.wav                 /opt/share/svi/sound/operation
-ln -s %{_datadir}/svi/sound/operation/low_battery.wav          /opt/share/svi/sound/operation
-ln -s %{_datadir}/svi/sound/operation/minute_minder.wav        /opt/share/svi/sound/operation
-ln -s %{_datadir}/svi/sound/operation/power_on.wav             /opt/share/svi/sound/operation
-ln -s %{_datadir}/svi/sound/operation/shutter.wav              /opt/share/svi/sound/operation
-ln -s %{_datadir}/svi/sound/operation/slider_sweep.wav         /opt/share/svi/sound/operation
-ln -s %{_datadir}/svi/sound/operation/unlock.wav               /opt/share/svi/sound/operation
-ln -s %{_datadir}/svi/sound/operation/volume_control.wav       /opt/share/svi/sound/operation
-ln -s %{_datadir}/svi/haptic/default/Basic_call.tht             /opt/share/svi/haptic/default
-ln -s %{_datadir}/svi/haptic/touch/touch.tht                    /opt/share/svi/haptic/touch
+ln -s %{_datadir}/feedback/sound/touch/key0.wav            /opt/usr/share/feedback/sound/touch
+ln -s %{_datadir}/feedback/sound/touch/key1.wav            /opt/usr/share/feedback/sound/touch
+ln -s %{_datadir}/feedback/sound/touch/key2.wav            /opt/usr/share/feedback/sound/touch
+ln -s %{_datadir}/feedback/sound/touch/key3.wav            /opt/usr/share/feedback/sound/touch
+ln -s %{_datadir}/feedback/sound/touch/key4.wav            /opt/usr/share/feedback/sound/touch
+ln -s %{_datadir}/feedback/sound/touch/key5.wav            /opt/usr/share/feedback/sound/touch
+ln -s %{_datadir}/feedback/sound/touch/key6.wav            /opt/usr/share/feedback/sound/touch
+ln -s %{_datadir}/feedback/sound/touch/key7.wav            /opt/usr/share/feedback/sound/touch
+ln -s %{_datadir}/feedback/sound/touch/key8.wav            /opt/usr/share/feedback/sound/touch
+ln -s %{_datadir}/feedback/sound/touch/key9.wav            /opt/usr/share/feedback/sound/touch
+ln -s %{_datadir}/feedback/sound/touch/keyasterisk.wav     /opt/usr/share/feedback/sound/touch
+ln -s %{_datadir}/feedback/sound/touch/keysharp.wav        /opt/usr/share/feedback/sound/touch
+ln -s %{_datadir}/feedback/sound/touch/sip.wav             /opt/usr/share/feedback/sound/touch
+ln -s %{_datadir}/feedback/sound/touch/sip_backspace.wav   /opt/usr/share/feedback/sound/touch
+ln -s %{_datadir}/feedback/sound/touch/touch.wav           /opt/usr/share/feedback/sound/touch
+ln -s %{_datadir}/feedback/sound/operation/call_connect.wav         /opt/usr/share/feedback/sound/operation
+ln -s %{_datadir}/feedback/sound/operation/call_disconnect.wav      /opt/usr/share/feedback/sound/operation
+ln -s %{_datadir}/feedback/sound/operation/charger_connection.wav   /opt/usr/share/feedback/sound/operation
+ln -s %{_datadir}/feedback/sound/operation/fully_charged.wav        /opt/usr/share/feedback/sound/operation
+ln -s %{_datadir}/feedback/sound/operation/list_reorder.wav         /opt/usr/share/feedback/sound/operation
+ln -s %{_datadir}/feedback/sound/operation/lock.wav                 /opt/usr/share/feedback/sound/operation
+ln -s %{_datadir}/feedback/sound/operation/low_battery.wav          /opt/usr/share/feedback/sound/operation
+ln -s %{_datadir}/feedback/sound/operation/minute_minder.wav        /opt/usr/share/feedback/sound/operation
+ln -s %{_datadir}/feedback/sound/operation/power_on.wav             /opt/usr/share/feedback/sound/operation
+ln -s %{_datadir}/feedback/sound/operation/shutter.wav              /opt/usr/share/feedback/sound/operation
+ln -s %{_datadir}/feedback/sound/operation/slider_sweep.wav         /opt/usr/share/feedback/sound/operation
+ln -s %{_datadir}/feedback/sound/operation/unlock.wav               /opt/usr/share/feedback/sound/operation
+ln -s %{_datadir}/feedback/sound/operation/volume_control.wav       /opt/usr/share/feedback/sound/operation
+ln -s %{_datadir}/feedback/haptic/default/Basic_call.tht             /opt/usr/share/feedback/haptic/default
+ln -s %{_datadir}/feedback/haptic/touch/touch.tht                    /opt/usr/share/feedback/haptic/touch
 
 %postun -p /sbin/ldconfig
 
 %postun -n svi-data
-rm -rf %{_datadir}/svi/
-rm -rf /opt/share/svi/
+rm -rf %{_datadir}/feedback/
+rm -rf /opt/usr/share/feedback/
 
 %files
 %manifest %{name}.manifest
@@ -149,9 +149,9 @@ rm -rf /opt/share/svi/
 %files -n svi-data
 %manifest %{name}.manifest
 %defattr(644,root,root,-)
-%{_datadir}/svi/*
+%{_datadir}/feedback/*
 %defattr(666,app,app,-)
-%dir /opt/share/svi/sound/touch
-%dir /opt/share/svi/sound/operation
-%dir /opt/share/svi/haptic/default
-%dir /opt/share/svi/haptic/touch
+%dir /opt/usr/share/feedback/sound/touch
+%dir /opt/usr/share/feedback/sound/operation
+%dir /opt/usr/share/feedback/haptic/default
+%dir /opt/usr/share/feedback/haptic/touch

diff --git a/src/feedback-internal.c b/src/feedback-internal.c
index 99329dd..5d99504 100644 (file)
--- a/src/feedback-internal.c
+++ b/src/feedback-internal.c
@@ -42,7 +42,7 @@
 
 #define DEFAULT_FEEDBACK_HANDLE                0x0F
 
-#define VIBRATION_XML                          "/usr/share/svi/vibration.xml"
+#define VIBRATION_XML                          "/usr/share/feedback/vibration.xml"
 
 typedef struct {
        haptic_device_h v_handle;