diff options
| author | jh0522.choi <jh0522.choi@samsung.com> | 2013-08-29 09:59:35 +0900 |
|---|---|---|
| committer | jh0522.choi <jh0522.choi@samsung.com> | 2013-08-29 09:59:35 +0900 |
| commit | 695c1244399b6c8b1983b411ab29ff9122dab56e (patch) | |
| tree | 10e9cdf41f7fc865d7836d5599230be296b6ecc1 | |
| parent | d81c876f42a6a62d5137f41b9f066993136efc92 (diff) | |
| download | social-695c1244399b6c8b1983b411ab29ff9122dab56e.tar.gz social-695c1244399b6c8b1983b411ab29ff9122dab56e.tar.bz2 social-695c1244399b6c8b1983b411ab29ff9122dab56e.zip | |
Generate debuginfo package instead of debug packagesubmit/tizen/20130912.090709accepted/tizen/20130913.030730accepted/tizen/20130912.194021accepted/tizen/20130912.185832
Change-Id: Ia511836c2b493de71767bcd405ecefcf5004733a
| -rwxr-xr-x | CMakeLists.txt | 25 | ||||
| -rwxr-xr-x | packaging/osp-social.spec | 18 | ||||
| -rwxr-xr-x | pkgmgr_account/CMakeLists.txt | 9 |
3 files changed, 9 insertions, 43 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a8593f6..fa1948d 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ INCLUDE_DIRECTORIES( src src/inc /usr/include - /usr/include/glib-2.0 + /usr/include/glib-2.0 /usr/lib/glib-2.0/include /usr/include/db-util /usr/include/social @@ -147,29 +147,16 @@ TARGET_LINK_LIBRARIES(${this_target} "-lcontacts-service2" ) TARGET_LINK_LIBRARIES(${this_target} "-laccounts-svc" ) TARGET_LINK_LIBRARIES(${this_target} "-lpthread" ) -SET_TARGET_PROPERTIES(${this_target} - PROPERTIES +SET_TARGET_PROPERTIES(${this_target} + PROPERTIES VERSION ${FULLVER} SOVERSION ${MAJORVER} CLEAN_DIRECT_OUTPUT 1 ) -ADD_CUSTOM_COMMAND(TARGET ${this_target} - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${LIBRARY_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX} ${LIBRARY_OUTPUT_PATH}/debug/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX}.${FULLVER} - COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX}.${FULLVER} ${LIBRARY_OUTPUT_PATH}/debug/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX}.${MAJORVER} - COMMAND ${CMAKE_STRIP} --strip-unneeded ${LIBRARY_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX} - COMMENT "strip ${this_target}" - ) - -INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/ DESTINATION lib/osp - FILES_MATCHING PATTERN "*.so*" - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ - GROUP_EXECUTE GROUP_READ - WORLD_EXECUTE WORLD_READ) -INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/debug/ DESTINATION lib/osp/debug - FILES_MATCHING PATTERN "*.so*" - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ +INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/ DESTINATION lib/osp + FILES_MATCHING PATTERN "*.so*" + PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) diff --git a/packaging/osp-social.spec b/packaging/osp-social.spec index 4c4fa73..1e3c07e 100755 --- a/packaging/osp-social.spec +++ b/packaging/osp-social.spec @@ -1,6 +1,3 @@ -%define debug_package %{nil} -%define __strip /bin/true - Name: osp-social Summary: osp social library Version: 1.2.2.0 @@ -25,7 +22,7 @@ BuildRequires: pkgconfig(osp-image-core) BuildRequires: osp-image-core-internal-devel # runtime requires -Requires: osp-appfw +Requires: osp-appfw Requires: osp-image %description @@ -47,18 +44,10 @@ Requires: %{name} = %{version}-%{release} %description internal-devel osp social library (Internal-DEV) -%package debug -Summary: osp social library (Development) -Group: TO_BE/FILLED_IN -Requires: %{name} = %{version}-%{release} - -%description debug -osp social library (DEV) - %prep %setup -q -%build +%build MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` %ifarch %{ix86} %if 0%{?simulator} @@ -96,6 +85,3 @@ cp %{_builddir}/%{name}-%{version}/LICENSE.APLv2 %{buildroot}/usr/share/license %files internal-devel %{_includedir}/osp/social/*.h - -%files debug -%{_libdir}/osp/debug/*.so* diff --git a/pkgmgr_account/CMakeLists.txt b/pkgmgr_account/CMakeLists.txt index ab7457b..909b4d4 100755 --- a/pkgmgr_account/CMakeLists.txt +++ b/pkgmgr_account/CMakeLists.txt @@ -9,7 +9,7 @@ pkg_check_modules(bin_pkgs REQUIRED libxml-2.0) INCLUDE_DIRECTORIES( /usr/include - /usr/include/glib-2.0 + /usr/include/glib-2.0 /usr/lib/glib-2.0/include /usr/include/libxml2 /usr/include/osp @@ -41,12 +41,5 @@ TARGET_LINK_LIBRARIES(${this_target} "-lxml2" ) TARGET_LINK_LIBRARIES(${this_target} "-lglib-2.0" ) TARGET_LINK_LIBRARIES(${this_target} "-laccounts-svc" ) -ADD_CUSTOM_COMMAND(TARGET ${this_target} - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${LIBRARY_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX} ${LIBRARY_OUTPUT_PATH}/debug/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX} - COMMAND ${CMAKE_STRIP} --strip-unneeded ${LIBRARY_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX} - COMMENT "strip ${this_target}" - ) - INSTALL(TARGETS ${this_target} DESTINATION "etc/package-manager/parserlib") |