spec and CMake changes for multi-user architecture for music-player

Change-Id: I46b2ef20599921d7ec274d944183dd2c053c1316
Signed-off-by: Shubham Kumar <shubham.srib@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c44f3529599369aa81deaeb7ff01bb4305b45f5..0e713dcdc04e84bef188e734a67b070116014423 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,30 +15,14 @@ SET(SHAREDDIR "${PREFIX}/shared")
 SET(LOCALEDIR "${RESDIR}/locale")
 SET(ICONDIR "${RESDIR}/icons/default/small")
 SET(EDJDIR "${RESDIR}/edje")
-#SET(RICH_INFO_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/rich_info")
 
 message("CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}")
 message("PREFIX ${PREFIX}")
 message("BINDIR ${BINDIR}")
 message("DATADIR ${DATADIR}")
 
-#START_PUBLIC_DISABLE_FEATURE
-#MP_FEATURE_ADD_TO_HOME
-#MP_FEATURE_LANDSCAPE
-#MP_FEATURE_CONTEXT_ENGINE
-#MP_FEATURE_APP_IN_APP
-#MP_3D_FEATURE
-#MP_FEATURE_INNER_SETTINGS
-#MP_FEATURE_DESKTOP_MODE
-#MP_FEATURE_SHORTCUT
-#MP_FEATURE_VOICE_CONTROL
-#MP_FEATURE_LOCKSCREEN
-#END_START_PUBLIC_DISABLE_FEATURE
-
 
 # Build features
-#ADD_DEFINITIONS("-DMP_FEATURE_APP_IN_APP")
-#ADD_DEFINITIONS("-DMP_FEATURE_ALBUM_COVER_BG")
 ADD_DEFINITIONS("-DMP_FEATURE_LOCKSCREEN")
 ADD_DEFINITIONS("-DMP_FEATURE_PERSONAL_PAGE")
 ADD_DEFINITIONS("-DMP_FEATURE_UNSUPPORT_DRM_CD_SD")
@@ -47,12 +31,6 @@ ADD_DEFINITIONS("-DMP_FEATURE_OPTIMIZATION_LAUNCH_TIME")
 ADD_DEFINITIONS("-DMP_FEATURE_NO_END")
 ADD_DEFINITIONS("-DGBSBUILD")
 
-# USE VARIABLE DEFINE SERVICE MACRO
-#SET(OPTION_MP_FEATURE_SUGGEST_FOR_YOU TRUE)
-#IF(OPTION_MP_FEATURE_SUGGEST_FOR_YOU)
-#      ADD_DEFINITIONS("-DMP_FEATURE_SUGGEST_FOR_YOU")
-#      MESSAGE("### Add service process ###")
-#ENDIF(OPTION_MP_FEATURE_SUGGEST_FOR_YOU)
 
 IF (CMAKE_DISABLE_FEATURE_MMS)
        message("##Disable mms##")
@@ -208,6 +186,7 @@ SET(REQUIRED_PKGS
        capi-system-system-settings
        capi-system-media-key
        storage
+       libtzplatform-config
 #START_PUBLIC_REMOVED_STRING
        capi-web-url-download
        notification
@@ -345,7 +324,7 @@ INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/shared/res/shared_images DESTINATION ${SHA
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/changeable_GUI DESTINATION ${SHAREDDIR}/res)
 
 #install xml file
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/${PKG_NAME}.xml DESTINATION ${DESKTOP_DIR}/packages)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/${PKG_NAME}.xml DESTINATION ${SHARE_DIR}/packages)
 
 # Share APP mo files with music chooser
 SET(MC_MUSIC_PROJECT_NAME org.tizen.music-chooser)
@@ -368,6 +347,3 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} -L${CMAKE_BINARY_DIR}/src/setting -lsettin
 # music-player widget
 ADD_SUBDIRECTORY(widget)
 
-# log dump script
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/dump_${PKG_NAME}.sh DESTINATION ${CMAKE_LOG_DUMP_SCRIPT_DIR})
-

diff --git a/dump_org.tizen.music-player.sh b/dump_org.tizen.music-player.sh
deleted file mode 100755 (executable)
index f3eb437..0000000
--- a/dump_org.tizen.music-player.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-#--------------------------------------
-#   com.samsung.music-player
-#--------------------------------------
-
-
-PKG_NAME=org.tizen.music-player
-
-DUMP_DIR=$1/$PKG_NAME
-/bin/mkdir -p $DUMP_DIR
-
-# app data
-APP_DATA_DIR=/opt/usr/apps/$PKG_NAME/data
-if [ -d "$APP_DATA_DIR" ]
-then
-       /bin/echo "copy ${APP_DATA_DIR}"
-       /bin/cp -a $APP_DATA_DIR $DUMP_DIR
-fi
-
-# media DB
-MEDIA_DB=/opt/usr/dbspace/.media.db
-if [ "$MEDIA_DB" ]
-then
-       /bin/echo "copy media DB ..."
-       /bin/cp ${MEDIA_DB}* $DUMP_DIR
-fi

diff --git a/music-chooser/CMakeLists.txt b/music-chooser/CMakeLists.txt
index 42fad3c8775d2dc7312021d89740f44132f9e56f..4923514d4833aa1770d6c242e854b8c2160bca48 100755 (executable)
--- a/music-chooser/CMakeLists.txt
+++ b/music-chooser/CMakeLists.txt
@@ -37,6 +37,7 @@ pkg_check_modules(pkgs REQUIRED
        capi-appfw-application
        capi-appfw-preference
        capi-appfw-app-manager
+       libtzplatform-config
 )
 
 FOREACH(flag ${pkgs_CFLAGS})
@@ -80,5 +81,6 @@ ADD_DEPENDENCIES(${PROJECT_NAME} music-chooser.edj)
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
 INSTALL(DIRECTORY DESTINATION ${DATADIR})
 INSTALL(FILES ${CMAKE_BINARY_DIR}/res/edje/layout/music-chooser.edj DESTINATION ${MC_PREFIX}/shared/trusted)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.tizen.music-chooser.xml DESTINATION ${DESKTOP_DIR}/packages)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/music-chooser.png DESTINATION /usr/share/icons/default/small)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.tizen.music-chooser.xml DESTINATION ${SHARE_DIR}/packages)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/music-chooser.png DESTINATION ${CMAKE_DESKTOP_ICON_DIR})
+

diff --git a/packaging/org.tizen.music-player.spec b/packaging/org.tizen.music-player.spec
index 38b38f228a50421f0ca8893f7361c2a8ee44938b..9ff015e7b17e51dbbe5d30b78944b3f29e1949ad 100755 (executable)
--- a/packaging/org.tizen.music-player.spec
+++ b/packaging/org.tizen.music-player.spec
@@ -23,6 +23,7 @@ BuildRequires:  pkgconfig(capi-telephony)
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(libxml-2.0)
 #BuildRequires:  pkgconfig(ecore-x)
+BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  pkgconfig(efl-extension)
 BuildRequires:  pkgconfig(edje)
 BuildRequires:  pkgconfig(capi-appfw-app-manager)
@@ -98,25 +99,23 @@ Description: music-chooser chooser
 %prep
 %setup -q
 
-%define DESKTOP_DIR /usr/share
-%define INSTALL_DIR    /usr/apps
-%define DATA_DIR       /opt/usr/apps
+%define SHARE_DIR %{TZ_SYS_SHARE}
+%define INSTALL_DIR     %{TZ_SYS_RO_APP}
 
 %define PKG_NAME %{name}
 %define PREFIX %{INSTALL_DIR}/%{PKG_NAME}
 
 %define MC_PKG_NAME %{PKG_PREFIX}.music-chooser
 %define MC_PREFIX %{INSTALL_DIR}/%{MC_PKG_NAME}
-%define DATA_PREFIX %{DATA_DIR}/%{PKG_NAME}
+%define DATA_PREFIX %{INSTALL_DIR}/%{PKG_NAME}
 
 %define SP_PKG_NAME %{PKG_PREFIX}.sound-player
 %define SP_PREFIX %{INSTALL_DIR}/%{SP_PKG_NAME}
-%define SP_DATA_PREFIX %{DATA_DIR}/%{SP_PKG_NAME}
+%define SP_DATA_PREFIX %{INSTALL_DIR}/%{SP_PKG_NAME}
 
-%define _storage_phone /opt/usr/media
-%define _storage_sdcard /opt/storage/sdcard
-
-%define _log_dump_script_dir /opt/etc/dump.d/module.d
+%define _app_icon_dir %{TZ_SYS_RO_ICONS}/default/small/
+%define _app_share_packages_dir %{TZ_SYS_RO_PACKAGES}
+%define _app_license_dir %{TZ_SYS_SHARE}/license
 
 %build
 %if 0%{?sec_build_binary_debug_enable}
@@ -127,13 +126,12 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 cmake . -DMC_PREFIX="%{MC_PREFIX}" \
        -DINSTALL_DIR="%{INSTALL_DIR}" \
        -DCMAKE_INSTALL_PREFIX="%{PREFIX}" \
-       -DCMAKE_DESKTOP_ICON_DIR="%{DESKTOP_DIR}/icons/default/small" \
-       -DDESKTOP_DIR="%{DESKTOP_DIR}" \
+       -DCMAKE_DESKTOP_ICON_DIR="%{_app_icon_dir}" \
+       -DSHARE_DIR="%{SHARE_DIR}" \
        -DPKG_NAME="%{PKG_NAME}" \
        -DSP_PKG_NAME="%{SP_PKG_NAME}" \
        -DDATA_PREFIX="%{DATA_PREFIX}" \
        -DSP_DATA_PREFIX="%{SP_DATA_PREFIX}" \
-       -DCMAKE_LOG_DUMP_SCRIPT_DIR="%{_log_dump_script_dir}" \
 %if 0%{?sec_product_feature_msg_disable_mms}
        -DCMAKE_DISABLE_FEATURE_MMS=YES \
 %endif
@@ -152,8 +150,9 @@ make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/usr/share/license
-cp LICENSE %{buildroot}/usr/share/license/%{name}
+mkdir -p %{buildroot}/%{_app_license_dir}
+cp LICENSE %{buildroot}/%{_app_license_dir}/%{name}
+
 %make_install
 %define tizen_sign 1
 %define tizen_sign_base %{PREFIX}
@@ -178,97 +177,33 @@ else
 fi
 
 %post
-#/usr/bin/vconftool set -t int memory/music/state 0 -i -f -g 5000 -s org.tizen.music-player
-
-#/usr/bin/vconftool set -t string memory/private/org.tizen.music-player/pos "00:00" -i -f -g 5000 -s org.tizen.music-player
-#/usr/bin/vconftool set -t double memory/private/org.tizen.music-player/progress_pos 0.0 -i -f -g 5000 -s org.tizen.music-player
-#/usr/bin/vconftool set -t double memory/private/org.tizen.music-player/position_changed 0.0 -i -f -g 5000 -s org.tizen.music-player
-#/usr/bin/vconftool set -t int memory/private/org.tizen.music-player/player_state 0 -i -f -g 5000 -s org.tizen.music-player
-#/usr/bin/vconftool set -t int memory/private/org.tizen.music-player/pd_genlist_clear 0 -i -f -g 5000 -s org.tizen.music-player
-
-#/usr/bin/vconftool set -t bool db/private/org.tizen.music-player/shuffle 0 -i -f -g 5000 -s org.tizen.music-player
-#/usr/bin/vconftool set -t int db/private/org.tizen.music-player/repeat 1 -i -f -g 5000 -s org.tizen.music-player
-#/usr/bin/vconftool set -t int db/private/org.tizen.music-player/square_axis_val 0 -i -f -g 5000 -s org.tizen.music-player
-#/usr/bin/vconftool set -t int db/private/org.tizen.music-player/playlist 15 -i -f -g 5000 -s org.tizen.music-player
-#/usr/bin/vconftool set -t bool db/private/org.tizen.music-player/motion_asked 0 -g 5000 -s org.tizen.music-player
-#/usr/bin/vconftool set -t bool db/private/org.tizen.music-player/square_asked 0 -f -g 5000 -s org.tizen.music-player
-#/usr/bin/vconftool set -t bool db/private/org.tizen.music-player/smart_volume 0 -f -g 5000 -s org.tizen.music-player
-#/usr/bin/vconftool set -t bool db/private/org.tizen.music-player/show_lyrics 1 -f -g 5000 -s org.tizen.music-player
-
-#/usr/bin/vconftool set -t string db/private/org.tizen.music-player/tabs_order "1234567" -i -f -g 5000 -s org.tizen.music-player
-#/usr/bin/vconftool set -t int db/private/org.tizen.music-player/tabs_select 63 -i -f -g 5000 -s org.tizen.music-player
-#/usr/bin/vconftool set -t string db/private/org.tizen.music-player/playlist_order "1234" -i -f -g 5000 -s org.tizen.music-player
-
-#/usr/bin/vconftool set -t int memory/private/org.tizen.music-player/playing_pid 0 -i -f -g 5000 -s org.tizen.music-player
-
-#vconftool set -t int db/private/org.tizen.music-player/se_change 1 -g 5000 -s org.tizen.music-player
-#vconftool set -t bool db/private/org.tizen.music-player/menu_change 1 -g 5000 -s org.tizen.music-player
-#vconftool set -t double db/private/org.tizen.music-player/eq_custom_1 0.5 -g 5000 -s org.tizen.music-player
-#vconftool set -t double db/private/org.tizen.music-player/eq_custom_2 0.5 -g 5000 -s org.tizen.music-player
-#vconftool set -t double db/private/org.tizen.music-player/eq_custom_3 0.5 -g 5000 -s org.tizen.music-player
-#vconftool set -t double db/private/org.tizen.music-player/eq_custom_4 0.5 -g 5000 -s org.tizen.music-player
-#vconftool set -t double db/private/org.tizen.music-player/eq_custom_5 0.5 -g 5000 -s org.tizen.music-player
-#vconftool set -t double db/private/org.tizen.music-player/eq_custom_6 0.5 -g 5000 -s org.tizen.music-player
-#vconftool set -t double db/private/org.tizen.music-player/eq_custom_7 0.5 -g 5000 -s org.tizen.music-player
-#vconftool set -t double db/private/org.tizen.music-player/eq_custom_8 0.5 -g 5000 -s org.tizen.music-player
-#vconftool set -t double db/private/org.tizen.music-player/user_audio_effect_3d 0.0 -g 5000 -s org.tizen.music-player
-#vconftool set -t double db/private/org.tizen.music-player/user_audio_effect_bass 0.0 -g 5000 -s org.tizen.music-player
-#vconftool set -t double db/private/org.tizen.music-player/user_audio_effect_room 0.0 -g 5000 -s org.tizen.music-player
-#vconftool set -t double db/private/org.tizen.music-player/user_audio_effect_reverb 0.0 -g 5000 -s org.tizen.music-player
-#vconftool set -t double db/private/org.tizen.music-player/user_audio_effect_clarity 0.0 -g 5000 -s org.tizen.music-player
-#vconftool set -t int memory/private/org.tizen.music-player/auto_off_time_val 0 -i -f -g 5000 -s org.tizen.music-player
-#vconftool set -t int memory/private/org.tizen.music-player/auto_off_custom_time 0 -i -f -g 5000 -s org.tizen.music-player
-#vconftool set -t int memory/private/org.tizen.music-player/auto_off_type_val 0 -i -f -g 5000 -s org.tizen.music-player
-#vconftool set -t int memory/private/org.tizen.music-player/sa_user_change 0 -i -f -g 5000 -s org.tizen.music-player
-#vconftool set -t double db/private/org.tizen.music-player/playspeed 1.0 -i -f -g 5000 -s org.tizen.music-player
-
-#vconftool set -t bool db/private/org.tizen.music-player/personal_no_ask_again 0  -i -f -g 5000 -s org.tizen.music-player
-
-#/usr/bin/signing-client/hash-signer-client.sh -a -d -p platform  %{PREFIX}
-
-touch /opt/usr/apps/org.tizen.music-player/shared/data/MusicPlayStatus.ini
-chown 5000:5000 /opt/usr/apps/org.tizen.music-player/shared/data/MusicPlayStatus.ini
-
-touch /opt/usr/apps/org.tizen.music-player/shared/data/NowPlayingId.ini
-chown 5000:5000 /opt/usr/apps/org.tizen.music-player/shared/data/NowPlayingId.ini
-
 %files
 %manifest %{name}.manifest
-%{DESKTOP_DIR}/packages/%{name}.xml
-%{DESKTOP_DIR}/icons/default/small/%{name}.png
-%{DESKTOP_DIR}/icons/default/small/preview_music_4x2.png
+%{_app_share_packages_dir}/%{name}.xml
+%{_app_icon_dir}/%{name}.png
+%{_app_icon_dir}/preview_music_4x2.png
 %{PREFIX}/bin/*
 %{PREFIX}/res/locale/*/LC_MESSAGES/*.mo
 %{PREFIX}/res/images/*
 %{PREFIX}/res/edje/*.edj
 %{PREFIX}/shared/res/*
-%attr(-,app,app) %dir %{DATA_PREFIX}/data
 %{PREFIX}/lib/*.so*
-#/opt/usr/share/sstream-plugins/*.so
-/usr/share/license/%{name}
-%attr(-,app,app) %dir %{DATA_PREFIX}/shared/data
-%attr(0744,root,root) %{_log_dump_script_dir}/dump_%{name}.sh
+%{_app_license_dir}/%{name}
 
-%{DESKTOP_DIR}/icons/default/small/%{SP_PKG_NAME}.png
+%{_app_icon_dir}%{SP_PKG_NAME}.png
 %{SP_PREFIX}/bin/sound-player
-%attr(-,app,app) %dir %{SP_DATA_PREFIX}/data
-%attr(-,app,app) %dir %{SP_DATA_PREFIX}/shared/data
-
-#%{PREFIX}/author-signature.xml
-#%{PREFIX}/signature1.xml
 
 #START_PUBLIC_REMOVED_STRING
 
 %files -n org.tizen.music-chooser
 %manifest org.tizen.music-chooser.manifest
-%{DESKTOP_DIR}/packages/org.tizen.music-chooser.xml
+%{SHARE_DIR}/packages/org.tizen.music-chooser.xml
 %{MC_PREFIX}/res/locale/*/LC_MESSAGES/*.mo
 %defattr(-,root,root,-)
-#%attr(-,app,app) %dir %{MC_PREFIX}/res/etc/music-chooser
 %{MC_PREFIX}/bin/*
 %{MC_PREFIX}/shared/trusted/music-chooser.edj
-/usr/share/icons/default/small/music-chooser.png
+%{TZ_SYS_RO_ICONS}/default/small/music-chooser.png
 
 #END_START_PUBLIC_REMOVED_STRING
 
-/usr/apps/org.tizen.music-player/shared/res/*
+%{TZ_SYS_RO_APP}/org.tizen.music-player/shared/res/*

diff --git a/shared/res/target_images/livebox/Music_1x1.png b/shared/res/target_images/livebox/Music_1x1.png
deleted file mode 100644 (file)
index d92e7fb..0000000
Binary files a/shared/res/target_images/livebox/Music_1x1.png and /dev/null differ

diff --git a/shared/res/target_images/livebox/Music_2x2.png b/shared/res/target_images/livebox/Music_2x2.png
deleted file mode 100644 (file)
index c8819d1..0000000
Binary files a/shared/res/target_images/livebox/Music_2x2.png and /dev/null differ

diff --git a/shared/res/target_images/livebox/Music_4x2.png b/shared/res/target_images/livebox/Music_4x2.png
deleted file mode 100644 (file)
index 492f860..0000000
Binary files a/shared/res/target_images/livebox/Music_4x2.png and /dev/null differ

diff --git a/shared/res/target_images/livebox/Music_4x4.png b/shared/res/target_images/livebox/Music_4x4.png
deleted file mode 100755 (executable)
index 3c369e3..0000000
Binary files a/shared/res/target_images/livebox/Music_4x4.png and /dev/null differ

diff --git a/shared/res/target_images/livebox/dummy_sel_livebox_04.png b/shared/res/target_images/livebox/dummy_sel_livebox_04.png
deleted file mode 100644 (file)
index 952ce88..0000000
Binary files a/shared/res/target_images/livebox/dummy_sel_livebox_04.png and /dev/null differ

diff --git a/shared/res/target_images/livebox/jpn-JP/Music_1x1.png b/shared/res/target_images/livebox/jpn-JP/Music_1x1.png
deleted file mode 100644 (file)
index 2c441e9..0000000
Binary files a/shared/res/target_images/livebox/jpn-JP/Music_1x1.png and /dev/null differ

diff --git a/shared/res/target_images/livebox/jpn-JP/Music_2x2.png b/shared/res/target_images/livebox/jpn-JP/Music_2x2.png
deleted file mode 100644 (file)
index 40d6e33..0000000
Binary files a/shared/res/target_images/livebox/jpn-JP/Music_2x2.png and /dev/null differ

diff --git a/shared/res/target_images/livebox/org.tizen.music-player_45.png b/shared/res/target_images/livebox/org.tizen.music-player_45.png
deleted file mode 100755 (executable)
index 737c5d4..0000000
Binary files a/shared/res/target_images/livebox/org.tizen.music-player_45.png and /dev/null differ

diff --git a/shared/res/target_images/livebox/org.tizen.music-player_54.png b/shared/res/target_images/livebox/org.tizen.music-player_54.png
deleted file mode 100755 (executable)
index 9fbf3c9..0000000
Binary files a/shared/res/target_images/livebox/org.tizen.music-player_54.png and /dev/null differ