From 9a8bb4eb216aefaf9046cee4041075950eda654f Mon Sep 17 00:00:00 2001 From: Dongjin Choi Date: Thu, 21 Mar 2013 20:30:20 +0900 Subject: [PATCH] Update change log and spec for wrt-plugins-tizen_0.4.10 [Issue#] N/A [Problem] Some plugins did not install [Cause] Some plugins weren't set RPATH [Solution] Set RPATH [Issue#] N/A [Problem] N/A [Cause] N/A [Solution] [ReferenceImplement] Update argument test(argtest) [Issue#] N/A [Problem] Platform api changed, thus build break happens. [Cause] Platform sync-agent api changes. [Solution] Adapt to the changes anf fix bugs. [SCMRequest] N/A Conflicts: packaging/wrt-plugins-tizen.spec --- packaging/wrt-plugins-tizen.spec | 4 ++-- pkgconfigs/wrt-plugins-tizen-timeutil.pc.in | 2 +- src/Alarm/CMakeLists.txt | 1 + src/Application/CMakeLists.txt | 3 ++- src/Calendar/CMakeLists.txt | 2 +- src/DataControl/CMakeLists.txt | 1 + src/Messaging/CMakeLists.txt | 2 +- src/Notification/CMakeLists.txt | 2 +- src/Package/CMakeLists.txt | 1 + src/Push/CMakeLists.txt | 1 + src/SystemSetting/CMakeLists.txt | 2 ++ 11 files changed, 14 insertions(+), 7 deletions(-) mode change 100755 => 100644 pkgconfigs/wrt-plugins-tizen-timeutil.pc.in diff --git a/packaging/wrt-plugins-tizen.spec b/packaging/wrt-plugins-tizen.spec index 5695c4b..25a0eb2 100755 --- a/packaging/wrt-plugins-tizen.spec +++ b/packaging/wrt-plugins-tizen.spec @@ -1,7 +1,7 @@ Name: wrt-plugins-tizen Summary: JavaScript plugins for WebRuntime -Version: 0.4.9 -Release: 1 +Version: 0.4.10 +Release: 0 Group: Development/Libraries License: Apache License, Version 2.0 Source0: %{name}-%{version}.tar.gz diff --git a/pkgconfigs/wrt-plugins-tizen-timeutil.pc.in b/pkgconfigs/wrt-plugins-tizen-timeutil.pc.in old mode 100755 new mode 100644 index 11dbf4d..dcf9806 --- a/pkgconfigs/wrt-plugins-tizen-timeutil.pc.in +++ b/pkgconfigs/wrt-plugins-tizen-timeutil.pc.in @@ -9,5 +9,5 @@ Name: wrt-plugins-tizen-${module_name} Description: wrt-plugins-tizen-${module_name} Version: @CMAKE_PROJECT_VERSION@ Requires: icu-i18n icu-io icu-le icu-lx icu-uc -Libs: -L${libdir} -lwrt-plugins-tizen-${module_name} -lwrt-plugins-tizen-${module_name}-impl -lwrt-plugins-tizen-${module_name}-config +Libs: -L${libdir} -lwrt-plugins-tizen-${module_name} -lwrt-plugins-tizen-${module_name}-impl Cflags: -I${includedir}/${module_name} \ No newline at end of file diff --git a/src/Alarm/CMakeLists.txt b/src/Alarm/CMakeLists.txt index 0e933f6..fd30c2e 100755 --- a/src/Alarm/CMakeLists.txt +++ b/src/Alarm/CMakeLists.txt @@ -14,6 +14,7 @@ INCLUDE_DIRECTORIES( SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${tizen_dest} + ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${timeutil_dest} ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${application_dest} ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${DESTINATION_NAME} ) diff --git a/src/Application/CMakeLists.txt b/src/Application/CMakeLists.txt index 2c463d8..1a46ce2 100755 --- a/src/Application/CMakeLists.txt +++ b/src/Application/CMakeLists.txt @@ -20,6 +20,7 @@ INCLUDE_DIRECTORIES( SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${tizen_dest} + ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${timeutil_dest} ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${DESTINATION_NAME} ) @@ -55,6 +56,7 @@ ADD_LIBRARY(${TARGET_IMPL_NAME} SHARED ${SRCS_IMPL}) TARGET_LINK_LIBRARIES(${TARGET_IMPL_NAME} ${LIBS_COMMON} + ${tizen_impl} ${platform_pkgs_application_LIBRARIES} ) @@ -77,7 +79,6 @@ ADD_LIBRARY(${TARGET_NAME} SHARED ${SRCS}) TARGET_LINK_LIBRARIES(${TARGET_NAME} ${TARGET_IMPL_NAME} ${TARGET_CONFIG_NAME} - ${tizen_impl} ) INSTALL(TARGETS ${TARGET_NAME} ${TARGET_CONFIG_NAME} ${TARGET_IMPL_NAME} LIBRARY DESTINATION ${DESTINATION_LIB_PREFIX}/${DESTINATION_NAME}) diff --git a/src/Calendar/CMakeLists.txt b/src/Calendar/CMakeLists.txt index 26b3581..f661033 100755 --- a/src/Calendar/CMakeLists.txt +++ b/src/Calendar/CMakeLists.txt @@ -15,8 +15,8 @@ INCLUDE_DIRECTORIES( SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${tizen_dest} - ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${contact_dest} ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${timeutil_dest} + ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${contact_dest} ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${DESTINATION_NAME} ) diff --git a/src/DataControl/CMakeLists.txt b/src/DataControl/CMakeLists.txt index eb4786d..b5dd618 100755 --- a/src/DataControl/CMakeLists.txt +++ b/src/DataControl/CMakeLists.txt @@ -12,6 +12,7 @@ INCLUDE_DIRECTORIES( SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${tizen_dest} + ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${timeutil_dest} ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${DESTINATION_NAME} ) diff --git a/src/Messaging/CMakeLists.txt b/src/Messaging/CMakeLists.txt index 8d15aeb..179fc5f 100755 --- a/src/Messaging/CMakeLists.txt +++ b/src/Messaging/CMakeLists.txt @@ -14,8 +14,8 @@ INCLUDE_DIRECTORIES( SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${tizen_dest} - ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${filesystem_dest} ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${timeutil_dest} + ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${filesystem_dest} ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${DESTINATION_NAME} ) diff --git a/src/Notification/CMakeLists.txt b/src/Notification/CMakeLists.txt index 4299e17..a50fd48 100755 --- a/src/Notification/CMakeLists.txt +++ b/src/Notification/CMakeLists.txt @@ -14,9 +14,9 @@ INCLUDE_DIRECTORIES( SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${tizen_dest} + ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${timeutil_dest} ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${application_dest} ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${filesystem_dest} - ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${timeutil_dest} ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${DESTINATION_NAME} ) diff --git a/src/Package/CMakeLists.txt b/src/Package/CMakeLists.txt index e7e94a2..1f2a103 100644 --- a/src/Package/CMakeLists.txt +++ b/src/Package/CMakeLists.txt @@ -18,6 +18,7 @@ INCLUDE_DIRECTORIES( SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${tizen_dest} + ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${timeutil_dest} ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${DESTINATION_NAME} ) diff --git a/src/Push/CMakeLists.txt b/src/Push/CMakeLists.txt index cb94e9d..396f018 100755 --- a/src/Push/CMakeLists.txt +++ b/src/Push/CMakeLists.txt @@ -12,6 +12,7 @@ INCLUDE_DIRECTORIES( SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${tizen_dest} + ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${timeutil_dest} ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${application_dest} ) diff --git a/src/SystemSetting/CMakeLists.txt b/src/SystemSetting/CMakeLists.txt index 34b5c54..1a6219a 100644 --- a/src/SystemSetting/CMakeLists.txt +++ b/src/SystemSetting/CMakeLists.txt @@ -11,6 +11,8 @@ INCLUDE_DIRECTORIES( SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} + ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${tizen_dest} + ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${timeutil_dest} ${CMAKE_INSTALL_PREFIX}/${DESTINATION_LIB_PREFIX}/${filesystem_dest} ) -- 2.7.4