From: Seongjun Yim Date: Thu, 24 Oct 2013 05:10:35 +0000 (+0000) Subject: Merge "Apply string localization for web" into tizen_2.2 X-Git-Tag: submit/tizen/20131210.080830^2^2~36 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9a6fdbbcd9ddb13e1b9b5ffd2cd8793464304e9a;hp=8a3959870387ecd850b8277262b63acb2551b989;p=platform%2Fframework%2Fnative%2Fappfw.git Merge "Apply string localization for web" into tizen_2.2 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index f6f8a74..99bad42 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,6 +62,7 @@ INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/debug/ DESTINATION lib/osp/debug WORLD_EXECUTE WORLD_READ) INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/common/opt/usr/etc DESTINATION ../opt/usr) +INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/common/usr/bin DESTINATION ../usr) IF("${ARCH}" MATCHES "arm") INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/arm/usr/etc DESTINATION ../usr) ELSEIF("${ARCH}" MATCHES "x86") @@ -77,4 +78,4 @@ INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/security/inc/ DESTINATION include/osp/ INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/system/inc/ DESTINATION include/osp/system FILES_MATCHING PATTERN "*.h") INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/text/inc/ DESTINATION include/osp/text FILES_MATCHING PATTERN "*.h") INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/server/appfw/inc/ DESTINATION include/osp/server/appfw/ FILES_MATCHING PATTERN "*.h") -INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/system-server/inc/ DESTINATION include/osp/server/ FILES_MATCHING PATTERN "*.h") +INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/server/system/inc/ DESTINATION include/osp/server/system/ FILES_MATCHING PATTERN "*.h") diff --git a/osp-appfw.manifest b/osp-appfw.manifest index ec50cdf..6659498 100644 --- a/osp-appfw.manifest +++ b/osp-appfw.manifest @@ -14,5 +14,6 @@ + diff --git a/packaging/osp-appfw.spec b/packaging/osp-appfw.spec index 519c8e6..3a6ee82 100644 --- a/packaging/osp-appfw.spec +++ b/packaging/osp-appfw.spec @@ -190,6 +190,7 @@ chmod 444 /opt/usr/etc/clocale.list %config /opt/usr/etc/* /usr/share/locale/* %config /usr/etc/* +%attr(755,root,app_logging) /usr/bin/nativeinfologctrl %{_libdir}/osp/libosp-appfw.so* %{_libdir}/osp-server/libosp-appfw-server.so* %{_libdir}/osp-server/libosp-system-server.so* diff --git a/res/common/usr/bin/nativeinfologctrl b/res/common/usr/bin/nativeinfologctrl new file mode 100755 index 0000000..13c5b15 --- /dev/null +++ b/res/common/usr/bin/nativeinfologctrl @@ -0,0 +1,57 @@ +#!/bin/sh +MODE=none +OBJ=none +VAL=none +#echo "tizen_platform_dlog_logging_ctrl" +case "$1" in +get) + MODE=get +;; +set) + MODE=set +;; + +*) +echo "Usage: dlogctrl {get|set} {platformlog} {1|0}" +exit 1 +esac + +case "$2" in +platformlog) + OBJ=platformlog +;; +*) + echo "Usage: dlogctrl {get|set} {platformlog} {1|0}" +exit 1 +esac + +if [ "$MODE" = "set" ]; then + case "$3" in + 1) + VAL=1 + ;; + 0) + VAL=0 + ;; + *) + echo "Usage: dlogctrl {get|set} {platformlog} {1|0}" + exit 1 + esac +fi + +if [ "$MODE" = "set" ]; then + if [ "$OBJ" = "platformlog" ] && [ "$VAL" = "1" ] ; then + echo 1 > /opt/etc/platformlog.conf 2>/dev/null + touch /home/developer/.platforminfologgingmode 2>/dev/null + elif [ "$OBJ" = "platformlog" ] && [ "$VAL" = "0" ] ; then + echo 0 > /opt/etc/platformlog.conf 2>/dev/null + rm /home/developer/.platforminfologgingmode 2>/dev/null + fi + echo "You must reboot this target to apply the change!" +else + if [ "$OBJ" = "platformlog" ]; then + cat /opt/etc/platformlog.conf 2>/dev/null + fi +fi + +exit 0 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5ae838e..2013365 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -60,4 +60,4 @@ ADD_SUBDIRECTORY(text) ADD_SUBDIRECTORY(appfw) ADD_SUBDIRECTORY(osp-string) ADD_SUBDIRECTORY(server) -ADD_SUBDIRECTORY(system-server osp-system-server) +ADD_SUBDIRECTORY(server/system osp-system-server) diff --git a/src/system-server/CMakeLists.txt b/src/server/system/CMakeLists.txt similarity index 98% rename from src/system-server/CMakeLists.txt rename to src/server/system/CMakeLists.txt index feadf23..59f1039 100644 --- a/src/system-server/CMakeLists.txt +++ b/src/server/system/CMakeLists.txt @@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES ( ${CMAKE_SOURCE_DIR}/inc ${CMAKE_SOURCE_DIR}/src/app/inc ${CMAKE_SOURCE_DIR}/src/base/inc - ${CMAKE_SOURCE_DIR}/src/system-server/inc + ${CMAKE_SOURCE_DIR}/src/server/system/inc ${CMAKE_SOURCE_DIR}/src/io/inc ${CMAKE_SOURCE_DIR}/src/server/inc ${CMAKE_SOURCE_DIR}/src/system/inc diff --git a/src/system-server/device/FSys_DeviceManager.cpp b/src/server/system/device/FSys_DeviceManager.cpp similarity index 100% rename from src/system-server/device/FSys_DeviceManager.cpp rename to src/server/system/device/FSys_DeviceManager.cpp diff --git a/src/system-server/inc/FSys_DeviceManager.h b/src/server/system/inc/FSys_DeviceManager.h similarity index 100% rename from src/system-server/inc/FSys_DeviceManager.h rename to src/server/system/inc/FSys_DeviceManager.h diff --git a/src/system-server/inc/FSys_PowerManager.h b/src/server/system/inc/FSys_PowerManager.h similarity index 100% rename from src/system-server/inc/FSys_PowerManager.h rename to src/server/system/inc/FSys_PowerManager.h diff --git a/src/system-server/inc/FSys_RuntimeInfo.h b/src/server/system/inc/FSys_RuntimeInfo.h similarity index 100% rename from src/system-server/inc/FSys_RuntimeInfo.h rename to src/server/system/inc/FSys_RuntimeInfo.h diff --git a/src/system-server/inc/FSys_SettingInfo.h b/src/server/system/inc/FSys_SettingInfo.h similarity index 100% rename from src/system-server/inc/FSys_SettingInfo.h rename to src/server/system/inc/FSys_SettingInfo.h diff --git a/src/system-server/inc/FSys_SystemInfo.h b/src/server/system/inc/FSys_SystemInfo.h similarity index 100% rename from src/system-server/inc/FSys_SystemInfo.h rename to src/server/system/inc/FSys_SystemInfo.h diff --git a/src/system-server/power/FSys_PowerManager.cpp b/src/server/system/power/FSys_PowerManager.cpp similarity index 100% rename from src/system-server/power/FSys_PowerManager.cpp rename to src/server/system/power/FSys_PowerManager.cpp diff --git a/src/system-server/runtime/FSys_RuntimeInfo.cpp b/src/server/system/runtime/FSys_RuntimeInfo.cpp similarity index 100% rename from src/system-server/runtime/FSys_RuntimeInfo.cpp rename to src/server/system/runtime/FSys_RuntimeInfo.cpp diff --git a/src/system-server/setting/FSys_SettingInfo.cpp b/src/server/system/setting/FSys_SettingInfo.cpp similarity index 100% rename from src/system-server/setting/FSys_SettingInfo.cpp rename to src/server/system/setting/FSys_SettingInfo.cpp diff --git a/src/system-server/setting/providers/FSys_ISettingProvider.h b/src/server/system/setting/providers/FSys_ISettingProvider.h similarity index 100% rename from src/system-server/setting/providers/FSys_ISettingProvider.h rename to src/server/system/setting/providers/FSys_ISettingProvider.h diff --git a/src/system-server/setting/providers/FSys_Icu.cpp b/src/server/system/setting/providers/FSys_Icu.cpp similarity index 100% rename from src/system-server/setting/providers/FSys_Icu.cpp rename to src/server/system/setting/providers/FSys_Icu.cpp diff --git a/src/system-server/setting/providers/FSys_Icu.h b/src/server/system/setting/providers/FSys_Icu.h similarity index 100% rename from src/system-server/setting/providers/FSys_Icu.h rename to src/server/system/setting/providers/FSys_Icu.h diff --git a/src/system-server/setting/providers/FSys_SettingApplicationProvider.cpp b/src/server/system/setting/providers/FSys_SettingApplicationProvider.cpp similarity index 100% rename from src/system-server/setting/providers/FSys_SettingApplicationProvider.cpp rename to src/server/system/setting/providers/FSys_SettingApplicationProvider.cpp diff --git a/src/system-server/setting/providers/FSys_SettingApplicationProvider.h b/src/server/system/setting/providers/FSys_SettingApplicationProvider.h similarity index 100% rename from src/system-server/setting/providers/FSys_SettingApplicationProvider.h rename to src/server/system/setting/providers/FSys_SettingApplicationProvider.h diff --git a/src/system-server/setting/providers/FSys_SettingFontProvider.cpp b/src/server/system/setting/providers/FSys_SettingFontProvider.cpp similarity index 100% rename from src/system-server/setting/providers/FSys_SettingFontProvider.cpp rename to src/server/system/setting/providers/FSys_SettingFontProvider.cpp diff --git a/src/system-server/setting/providers/FSys_SettingFontProvider.h b/src/server/system/setting/providers/FSys_SettingFontProvider.h similarity index 100% rename from src/system-server/setting/providers/FSys_SettingFontProvider.h rename to src/server/system/setting/providers/FSys_SettingFontProvider.h diff --git a/src/system-server/setting/providers/FSys_SettingGeneralProvider.cpp b/src/server/system/setting/providers/FSys_SettingGeneralProvider.cpp similarity index 100% rename from src/system-server/setting/providers/FSys_SettingGeneralProvider.cpp rename to src/server/system/setting/providers/FSys_SettingGeneralProvider.cpp diff --git a/src/system-server/setting/providers/FSys_SettingGeneralProvider.h b/src/server/system/setting/providers/FSys_SettingGeneralProvider.h similarity index 100% rename from src/system-server/setting/providers/FSys_SettingGeneralProvider.h rename to src/server/system/setting/providers/FSys_SettingGeneralProvider.h diff --git a/src/system-server/setting/providers/FSys_SettingLocaleProvider.cpp b/src/server/system/setting/providers/FSys_SettingLocaleProvider.cpp similarity index 100% rename from src/system-server/setting/providers/FSys_SettingLocaleProvider.cpp rename to src/server/system/setting/providers/FSys_SettingLocaleProvider.cpp diff --git a/src/system-server/setting/providers/FSys_SettingLocaleProvider.h b/src/server/system/setting/providers/FSys_SettingLocaleProvider.h similarity index 100% rename from src/system-server/setting/providers/FSys_SettingLocaleProvider.h rename to src/server/system/setting/providers/FSys_SettingLocaleProvider.h diff --git a/src/system-server/setting/providers/FSys_SettingLocationProvider.cpp b/src/server/system/setting/providers/FSys_SettingLocationProvider.cpp similarity index 100% rename from src/system-server/setting/providers/FSys_SettingLocationProvider.cpp rename to src/server/system/setting/providers/FSys_SettingLocationProvider.cpp diff --git a/src/system-server/setting/providers/FSys_SettingLocationProvider.h b/src/server/system/setting/providers/FSys_SettingLocationProvider.h similarity index 100% rename from src/system-server/setting/providers/FSys_SettingLocationProvider.h rename to src/server/system/setting/providers/FSys_SettingLocationProvider.h diff --git a/src/system-server/setting/providers/FSys_SettingNetworkProvider.cpp b/src/server/system/setting/providers/FSys_SettingNetworkProvider.cpp similarity index 100% rename from src/system-server/setting/providers/FSys_SettingNetworkProvider.cpp rename to src/server/system/setting/providers/FSys_SettingNetworkProvider.cpp diff --git a/src/system-server/setting/providers/FSys_SettingNetworkProvider.h b/src/server/system/setting/providers/FSys_SettingNetworkProvider.h similarity index 100% rename from src/system-server/setting/providers/FSys_SettingNetworkProvider.h rename to src/server/system/setting/providers/FSys_SettingNetworkProvider.h diff --git a/src/system-server/setting/providers/FSys_SettingScreenProvider.cpp b/src/server/system/setting/providers/FSys_SettingScreenProvider.cpp similarity index 100% rename from src/system-server/setting/providers/FSys_SettingScreenProvider.cpp rename to src/server/system/setting/providers/FSys_SettingScreenProvider.cpp diff --git a/src/system-server/setting/providers/FSys_SettingScreenProvider.h b/src/server/system/setting/providers/FSys_SettingScreenProvider.h similarity index 100% rename from src/system-server/setting/providers/FSys_SettingScreenProvider.h rename to src/server/system/setting/providers/FSys_SettingScreenProvider.h diff --git a/src/system-server/setting/providers/FSys_SettingSoundProvider.cpp b/src/server/system/setting/providers/FSys_SettingSoundProvider.cpp similarity index 100% rename from src/system-server/setting/providers/FSys_SettingSoundProvider.cpp rename to src/server/system/setting/providers/FSys_SettingSoundProvider.cpp diff --git a/src/system-server/setting/providers/FSys_SettingSoundProvider.h b/src/server/system/setting/providers/FSys_SettingSoundProvider.h similarity index 100% rename from src/system-server/setting/providers/FSys_SettingSoundProvider.h rename to src/server/system/setting/providers/FSys_SettingSoundProvider.h diff --git a/src/system-server/setting/providers/FSys_SettingSpeechProvider.cpp b/src/server/system/setting/providers/FSys_SettingSpeechProvider.cpp similarity index 100% rename from src/system-server/setting/providers/FSys_SettingSpeechProvider.cpp rename to src/server/system/setting/providers/FSys_SettingSpeechProvider.cpp diff --git a/src/system-server/setting/providers/FSys_SettingSpeechProvider.h b/src/server/system/setting/providers/FSys_SettingSpeechProvider.h similarity index 100% rename from src/system-server/setting/providers/FSys_SettingSpeechProvider.h rename to src/server/system/setting/providers/FSys_SettingSpeechProvider.h diff --git a/src/system-server/setting/providers/FSys_SettingStorageProvider.cpp b/src/server/system/setting/providers/FSys_SettingStorageProvider.cpp similarity index 100% rename from src/system-server/setting/providers/FSys_SettingStorageProvider.cpp rename to src/server/system/setting/providers/FSys_SettingStorageProvider.cpp diff --git a/src/system-server/setting/providers/FSys_SettingStorageProvider.h b/src/server/system/setting/providers/FSys_SettingStorageProvider.h similarity index 100% rename from src/system-server/setting/providers/FSys_SettingStorageProvider.h rename to src/server/system/setting/providers/FSys_SettingStorageProvider.h diff --git a/src/system-server/setting/providers/FSys_SettingVibrationProvider.cpp b/src/server/system/setting/providers/FSys_SettingVibrationProvider.cpp similarity index 100% rename from src/system-server/setting/providers/FSys_SettingVibrationProvider.cpp rename to src/server/system/setting/providers/FSys_SettingVibrationProvider.cpp diff --git a/src/system-server/setting/providers/FSys_SettingVibrationProvider.h b/src/server/system/setting/providers/FSys_SettingVibrationProvider.h similarity index 100% rename from src/system-server/setting/providers/FSys_SettingVibrationProvider.h rename to src/server/system/setting/providers/FSys_SettingVibrationProvider.h diff --git a/src/system-server/system/FSys_SystemInfo.cpp b/src/server/system/system/FSys_SystemInfo.cpp similarity index 100% rename from src/system-server/system/FSys_SystemInfo.cpp rename to src/server/system/system/FSys_SystemInfo.cpp