From: Sabera Djelti (sdi2) Date: Thu, 13 Mar 2014 16:10:15 +0000 (+0100) Subject: Remove hardcoded path for multiuser support X-Git-Tag: accepted/tizen/ivi/panda/20140403.014856^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=00b95e8c65856f8da34e0a60b5b537ca1213eb5d;p=platform%2Fcore%2Fsystem%2Fsystem-popup.git Remove hardcoded path for multiuser support Bug-Tizen: PTREL-281 Change-Id: I4059c5f224324c994298f27a8af248ee4c49d28f Signed-off-by: Sabera Djelti (sdi2) --- diff --git a/data/org.tizen.lowbat-syspopup.xml b/data/org.tizen.lowbat-syspopup.xml.in similarity index 69% rename from data/org.tizen.lowbat-syspopup.xml rename to data/org.tizen.lowbat-syspopup.xml.in index 513142c..fe3e0ed 100755 --- a/data/org.tizen.lowbat-syspopup.xml +++ b/data/org.tizen.lowbat-syspopup.xml.in @@ -3,7 +3,7 @@ Giyeol Ok system-popup application (lowbatt popup) - + diff --git a/data/org.tizen.lowmem-syspopup.xml b/data/org.tizen.lowmem-syspopup.xml.in similarity index 69% rename from data/org.tizen.lowmem-syspopup.xml rename to data/org.tizen.lowmem-syspopup.xml.in index 899339a..d1139e3 100755 --- a/data/org.tizen.lowmem-syspopup.xml +++ b/data/org.tizen.lowmem-syspopup.xml.in @@ -3,7 +3,7 @@ Giyeol Ok system-popup application (lowmem popup) - + diff --git a/data/org.tizen.mmc-syspopup.xml b/data/org.tizen.mmc-syspopup.xml.in similarity index 70% rename from data/org.tizen.mmc-syspopup.xml rename to data/org.tizen.mmc-syspopup.xml.in index 7b1809e..f2eda86 100755 --- a/data/org.tizen.mmc-syspopup.xml +++ b/data/org.tizen.mmc-syspopup.xml.in @@ -3,7 +3,7 @@ Giyeol Ok system-popup application (mmc popup) - + diff --git a/data/org.tizen.poweroff-syspopup.xml b/data/org.tizen.poweroff-syspopup.xml.in similarity index 69% rename from data/org.tizen.poweroff-syspopup.xml rename to data/org.tizen.poweroff-syspopup.xml.in index f541f88..178361c 100755 --- a/data/org.tizen.poweroff-syspopup.xml +++ b/data/org.tizen.poweroff-syspopup.xml.in @@ -3,7 +3,7 @@ Giyeol Ok system-popup application (poweroff popup) - + diff --git a/data/org.tizen.usb-syspopup.xml b/data/org.tizen.usb-syspopup.xml.in similarity index 87% rename from data/org.tizen.usb-syspopup.xml rename to data/org.tizen.usb-syspopup.xml.in index 81ad2e8..dfb18d7 100755 --- a/data/org.tizen.usb-syspopup.xml +++ b/data/org.tizen.usb-syspopup.xml.in @@ -3,7 +3,7 @@ Taeyoung Kim USB System Popup Application - + diff --git a/data/org.tizen.usbotg-syspopup.xml b/data/org.tizen.usbotg-syspopup.xml.in similarity index 87% rename from data/org.tizen.usbotg-syspopup.xml rename to data/org.tizen.usbotg-syspopup.xml.in index ee920a7..2246361 100755 --- a/data/org.tizen.usbotg-syspopup.xml +++ b/data/org.tizen.usbotg-syspopup.xml.in @@ -3,7 +3,7 @@ Taeyoung Kim USB otg system Popup Application - + diff --git a/lowbatt-popup/src/CMakeLists.txt b/lowbatt-popup/src/CMakeLists.txt index 99984e2..46fc94d 100755 --- a/lowbatt-popup/src/CMakeLists.txt +++ b/lowbatt-popup/src/CMakeLists.txt @@ -35,9 +35,9 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed") ADD_EXECUTABLE(${PACKAGE} ${SRCS}) TARGET_LINK_LIBRARIES(${PACKAGE} ${pkgs_LDFLAGS} "-lsvi") - -INSTALL(TARGETS ${PACKAGE} DESTINATION /usr/apps/org.tizen.lowbat-syspopup/bin) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/org.tizen.lowbat-syspopup.xml DESTINATION /usr/share/packages/) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.lowbat-syspopup.rule DESTINATION /opt/etc/smack/accesses.d) +CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/data/org.tizen.lowbat-syspopup.xml.in ${CMAKE_SOURCE_DIR}/data/org.tizen.lowbat-syspopup.xml) +INSTALL(TARGETS ${PACKAGE} DESTINATION ${TZ_SYS_RO_APP}/org.tizen.lowbat-syspopup/bin) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/org.tizen.lowbat-syspopup.xml DESTINATION ${TZ_SYS_RO_PACKAGES}) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.lowbat-syspopup.rule DESTINATION ${TZ_SYS_SMACK}/accesses.d) diff --git a/lowmem-popup/src/CMakeLists.txt b/lowmem-popup/src/CMakeLists.txt index 2ed8f08..26af122 100755 --- a/lowmem-popup/src/CMakeLists.txt +++ b/lowmem-popup/src/CMakeLists.txt @@ -36,7 +36,7 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed") ADD_EXECUTABLE(${PACKAGE} ${SRCS}) TARGET_LINK_LIBRARIES(${PACKAGE} ${pkgs_LDFLAGS}) - -INSTALL(TARGETS ${PACKAGE} DESTINATION /usr/apps/org.tizen.lowmem-syspopup/bin) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/org.tizen.lowmem-syspopup.xml DESTINATION /usr/share/packages/) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.lowmem-syspopup.rule DESTINATION /opt/etc/smack/accesses.d) +CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/data/org.tizen.lowmem-syspopup.xml.in ${CMAKE_SOURCE_DIR}/data/org.tizen.lowmem-syspopup.xml) +INSTALL(TARGETS ${PACKAGE} DESTINATION ${TZ_SYS_RO_APP}/org.tizen.lowmem-syspopup/bin) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/org.tizen.lowmem-syspopup.xml DESTINATION ${TZ_SYS_RO_PACKAGES}) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.lowmem-syspopup.rule DESTINATION ${TZ_SYS_SMACK}/accesses.d) diff --git a/mmc-popup/CMakeLists.txt b/mmc-popup/CMakeLists.txt index dbc5e29..de05792 100755 --- a/mmc-popup/CMakeLists.txt +++ b/mmc-popup/CMakeLists.txt @@ -19,7 +19,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/share/src) INCLUDE_DIRECTORIES(/usr/include/svi) INCLUDE(FindPkgConfig) -pkg_check_modules(pkgs REQUIRED appcore-efl elementary devman devman_haptic mm-sound notification sysman) +pkg_check_modules(pkgs REQUIRED appcore-efl elementary devman devman_haptic mm-sound notification sysman libtzplatform-config) FOREACH(flag ${pkgs_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag} -g") @@ -45,16 +45,17 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed") ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS}) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} "-lsvi") -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/apps/org.tizen.mmc-syspopup/bin) +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${TZ_SYS_RO_APP}/org.tizen.mmc-syspopup/bin) # install desktop file & icon SET(PREFIX ${CMAKE_INSTALL_PREFIX}) # install manifest xml file -INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/org.tizen.mmc-syspopup.xml DESTINATION /usr/share/packages/) +CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/data/org.tizen.mmc-syspopup.xml.in ${CMAKE_SOURCE_DIR}/data/org.tizen.mmc-syspopup.xml) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/org.tizen.mmc-syspopup.xml DESTINATION ${TZ_SYS_RO_PACKAGES}/) # instatll rule file -INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.mmc-syspopup.rule DESTINATION /opt/etc/smack/accesses.d) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.mmc-syspopup.rule DESTINATION ${TZ_SYS_SMACK}/accesses.d) ############################################################### diff --git a/packaging/system-popup.spec b/packaging/system-popup.spec index 066aa50..682bd6a 100755 --- a/packaging/system-popup.spec +++ b/packaging/system-popup.spec @@ -43,6 +43,7 @@ BuildRequires: cmake BuildRequires: edje-bin BuildRequires: embryo-bin BuildRequires: gettext-devel +BuildRequires: pkgconfig(libtzplatform-config) Requires(post): /usr/bin/vconftool %description @@ -110,7 +111,10 @@ cp %{SOURCE1011} . cp %{SOURCE1012} . cp %{SOURCE1013} . -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} +cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \ +-DTZ_SYS_RO_APP=%{TZ_SYS_RO_APP} \ +-DTZ_SYS_RO_PACKAGES=%{TZ_SYS_RO_PACKAGES} \ +-DTZ_SYS_SMACK=%TZ_SYS_SMACK make %{?jobs:-j%jobs} %install @@ -148,47 +152,47 @@ cp LICENSE.Apache_v2 %{buildroot}/usr/share/license/org.tizen.usbotg-syspopup %files -n org.tizen.poweroff-syspopup %manifest %{name}.manifest %defattr(-,root,root,-) -/usr/apps/org.tizen.poweroff-syspopup/bin/poweroff-popup -/usr/share/packages/org.tizen.poweroff-syspopup.xml -/opt/etc/smack/accesses.d/org.tizen.poweroff-syspopup.rule +%{TZ_SYS_RO_APP}/org.tizen.poweroff-syspopup/bin/poweroff-popup +%{TZ_SYS_RO_PACKAGES}/org.tizen.poweroff-syspopup.xml +%{TZ_SYS_SMACK}/accesses.d/org.tizen.poweroff-syspopup.rule /usr/share/license/org.tizen.poweroff-syspopup %files -n org.tizen.lowmem-syspopup %manifest %{name}.manifest %defattr(-,root,root,-) -/usr/apps/org.tizen.lowmem-syspopup/bin/lowmem-popup -/usr/share/packages/org.tizen.lowmem-syspopup.xml -/opt/etc/smack/accesses.d/org.tizen.lowmem-syspopup.rule +%{TZ_SYS_RO_APP}/org.tizen.lowmem-syspopup/bin/lowmem-popup +%{TZ_SYS_RO_PACKAGES}/org.tizen.lowmem-syspopup.xml +%{TZ_SYS_SMACK}/accesses.d/org.tizen.lowmem-syspopup.rule /usr/share/license/org.tizen.lowmem-syspopup %files -n org.tizen.lowbat-syspopup %manifest %{name}.manifest %defattr(-,root,root,-) -/usr/apps/org.tizen.lowbat-syspopup/bin/lowbatt-popup -/usr/share/packages/org.tizen.lowbat-syspopup.xml -/opt/etc/smack/accesses.d/org.tizen.lowbat-syspopup.rule +%{TZ_SYS_RO_APP}/org.tizen.lowbat-syspopup/bin/lowbatt-popup +%{TZ_SYS_RO_PACKAGES}/org.tizen.lowbat-syspopup.xml +%{TZ_SYS_SMACK}/accesses.d/org.tizen.lowbat-syspopup.rule /usr/share/license/org.tizen.lowbat-syspopup %files -n org.tizen.mmc-syspopup %manifest %{name}.manifest %defattr(-,root,root,-) -/usr/apps/org.tizen.mmc-syspopup/bin/mmc-popup -/usr/share/packages/org.tizen.mmc-syspopup.xml -/opt/etc/smack/accesses.d/org.tizen.mmc-syspopup.rule +%{TZ_SYS_RO_APP}/org.tizen.mmc-syspopup/bin/mmc-popup +%{TZ_SYS_RO_PACKAGES}/org.tizen.mmc-syspopup.xml +%{TZ_SYS_SMACK}/accesses.d/org.tizen.mmc-syspopup.rule /usr/share/license/org.tizen.mmc-syspopup %files -n org.tizen.usb-syspopup %manifest %{name}.manifest %defattr(-,root,root,-) -/usr/apps/org.tizen.usb-syspopup/bin/usb-syspopup -/usr/share/packages/org.tizen.usb-syspopup.xml -/opt/etc/smack/accesses.d/org.tizen.usb-syspopup.rule +%{TZ_SYS_RO_APP}/org.tizen.usb-syspopup/bin/usb-syspopup +%{TZ_SYS_RO_PACKAGES}/org.tizen.usb-syspopup.xml +%{TZ_SYS_SMACK}/accesses.d/org.tizen.usb-syspopup.rule /usr/share/license/org.tizen.usb-syspopup %files -n org.tizen.usbotg-syspopup %manifest %{name}.manifest %defattr(-,root,root,-) -/usr/apps/org.tizen.usbotg-syspopup/bin/usbotg-syspopup -/usr/share/packages/org.tizen.usbotg-syspopup.xml -/opt/etc/smack/accesses.d/org.tizen.usbotg-syspopup.rule +%{TZ_SYS_RO_APP}/org.tizen.usbotg-syspopup/bin/usbotg-syspopup +%{TZ_SYS_RO_PACKAGES}/org.tizen.usbotg-syspopup.xml +%{TZ_SYS_SMACK}/accesses.d/org.tizen.usbotg-syspopup.rule /usr/share/license/org.tizen.usbotg-syspopup diff --git a/popup-launcher/src/CMakeLists.txt b/popup-launcher/src/CMakeLists.txt index e227cf0..1263058 100755 --- a/popup-launcher/src/CMakeLists.txt +++ b/popup-launcher/src/CMakeLists.txt @@ -31,6 +31,7 @@ SET(PKG_MODULES ${PKG_MODULES} evas vconf svi + libtzplatform-config ) INCLUDE(FindPkgConfig) diff --git a/poweroff-popup/src/CMakeLists.txt b/poweroff-popup/src/CMakeLists.txt index 6aa2d96..d14c93f 100755 --- a/poweroff-popup/src/CMakeLists.txt +++ b/poweroff-popup/src/CMakeLists.txt @@ -40,7 +40,7 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed") ADD_EXECUTABLE(${PACKAGE} ${SRCS}) TARGET_LINK_LIBRARIES(${PACKAGE} ${pkgs_LDFLAGS}) - -INSTALL(TARGETS ${PACKAGE} DESTINATION /usr/apps/org.tizen.poweroff-syspopup/bin) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/org.tizen.poweroff-syspopup.xml DESTINATION /usr/share/packages/) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.poweroff-syspopup.rule DESTINATION /opt/etc/smack/accesses.d) +CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/data/org.tizen.poweroff-syspopup.xml.in ${CMAKE_SOURCE_DIR}/data/org.tizen.poweroff-syspopup.xml) +INSTALL(TARGETS ${PACKAGE} DESTINATION ${TZ_SYS_RO_APP}/org.tizen.poweroff-syspopup/bin) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/org.tizen.poweroff-syspopup.xml DESTINATION ${TZ_SYS_RO_PACKAGES}/) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.poweroff-syspopup.rule DESTINATION ${TZ_SYS_SMACK}/accesses.d) diff --git a/usb-popup/CMakeLists.txt b/usb-popup/CMakeLists.txt index 53cbce4..167e8d8 100644 --- a/usb-popup/CMakeLists.txt +++ b/usb-popup/CMakeLists.txt @@ -5,11 +5,11 @@ SET(SRCS src/usb-syspopup.c) SET(VENDOR "tizen") SET(PACKAGE "usb-syspopup") SET(PKGNAME "org.${VENDOR}.${PACKAGE}") -SET(PREFIX "${CMAKE_INSTALL_PREFIX}/apps/${PKGNAME}") +SET(PREFIX "${TZ_SYS_RO_APP}/${PKGNAME}") SET(BINDIR "${PREFIX}/bin") SET(RESDIR "${PREFIX}/res") SET(LOCALEDIR "${RESDIR}/locale") -SET(MANIFESTDIR "${CMAKE_INSTALL_PREFIX}/share/packages") +SET(MANIFESTDIR "${TZ_SYS_RO_PACKAGES}") INCLUDE(FindPkgConfig) pkg_check_modules(pkgs REQUIRED @@ -23,7 +23,8 @@ pkg_check_modules(pkgs REQUIRED devman appsvc pmapi - vconf) + vconf + libtzplatform-config) FOREACH(flag ${pkgs_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") @@ -42,7 +43,8 @@ TARGET_LINK_LIBRARIES(${PACKAGE} syspopup ${pkgs_LDFLAGS}) INSTALL(TARGETS ${PACKAGE} DESTINATION ${BINDIR}) # install manifest file +CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/data/org.tizen.usb-syspopup.xml.in ${CMAKE_SOURCE_DIR}/data/org.tizen.usb-syspopup.xml) INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${PKGNAME}.xml DESTINATION ${MANIFESTDIR}) # instatll rule file -INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.usb-syspopup.rule DESTINATION /opt/etc/smack/accesses.d) \ No newline at end of file +INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.usb-syspopup.rule DESTINATION ${TZ_SYS_SMACK}/accesses.d) diff --git a/usbotg-popup/CMakeLists.txt b/usbotg-popup/CMakeLists.txt index 49ce34c..36b616d 100755 --- a/usbotg-popup/CMakeLists.txt +++ b/usbotg-popup/CMakeLists.txt @@ -5,11 +5,11 @@ SET(SRCS src/usbotg-syspopup.c) SET(VENDOR "tizen") SET(PACKAGE "usbotg-syspopup") SET(PKGNAME "org.${VENDOR}.${PACKAGE}") -SET(PREFIX "${CMAKE_INSTALL_PREFIX}/apps/${PKGNAME}") +SET(PREFIX "${TZ_SYS_RO_APP}/${PKGNAME}") SET(BINDIR "${PREFIX}/bin") SET(RESDIR "${PREFIX}/res") SET(LOCALEDIR "${RESDIR}/locale") -SET(MANIFESTDIR "${CMAKE_INSTALL_PREFIX}/share/packages") +SET(MANIFESTDIR "${TZ_SYS_RO_PACKAGES}") INCLUDE(FindPkgConfig) pkg_check_modules(pkgs REQUIRED @@ -21,7 +21,8 @@ pkg_check_modules(pkgs REQUIRED ecore-evas vconf appsvc - dlog) + dlog + libtzplatform-config) FOREACH(flag ${pkgs_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") @@ -40,7 +41,8 @@ TARGET_LINK_LIBRARIES(${PACKAGE} syspopup ${pkgs_LDFLAGS}) INSTALL(TARGETS ${PACKAGE} DESTINATION ${BINDIR}) # install manifest xml file +CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/data/org.tizen.usbotg-syspopup.xml.in ${CMAKE_SOURCE_DIR}/data/org.tizen.usbotg-syspopup.xml) INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${PKGNAME}.xml DESTINATION ${MANIFESTDIR}) # instatll rule file -INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.usbotg-syspopup.rule DESTINATION /opt/etc/smack/accesses.d) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.usbotg-syspopup.rule DESTINATION ${TZ_SYS_SMACK}/accesses.d) diff --git a/usbotg-popup/src/usbotg-syspopup.c b/usbotg-popup/src/usbotg-syspopup.c index 09732f0..f293e97 100755 --- a/usbotg-popup/src/usbotg-syspopup.c +++ b/usbotg-popup/src/usbotg-syspopup.c @@ -15,6 +15,7 @@ * limitations under the License. */ +#include #include #include #include @@ -33,7 +34,7 @@ #define SOCK_STR_LEN 1542 #define UNMOUNT_USB_STORAGE 60 -#define USB_MOUNT_PATH "/opt/storage/usb" +#define USB_MOUNT_PATH tzplatform_mkpath(TZ_SYS_STORAGE, "usb") #define MYFILE_APP_NAME "org.tizen.myfile" #define GALLERY_APP_NAME "org.tizen.gallery"