From 99402b6ba57ee6cdd9012df8602e173bf025aece Mon Sep 17 00:00:00 2001 From: "jh0522.choi" Date: Thu, 29 Aug 2013 14:57:02 +0900 Subject: [PATCH] Generate debuginfo package instead of debug package Change-Id: I323695ed5e851ad291383813969f3f9125bd3748 --- CMakeLists.txt | 38 +++++----------------- packaging/osp-web.spec | 19 ++--------- .../js-bridge-plugin-deprecated/CMakeLists.txt | 8 ----- src/controls/js-bridge-plugin-tizen/CMakeLists.txt | 8 ----- 4 files changed, 11 insertions(+), 62 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b747d2..2f353d4 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ INCLUDE_DIRECTORIES( src src/controls /usr/include/appfw - /usr/include/glib-2.0 + /usr/include/glib-2.0 /usr/lib/glib-2.0/include /usr/include/curl /usr/include/dbus-1.0 @@ -112,7 +112,7 @@ TARGET_LINK_LIBRARIES(${this_target} "-losp-image" ) TARGET_LINK_LIBRARIES(${this_target} "-losp-media" ) TARGET_LINK_LIBRARIES(${this_target} "-losp-net" ) TARGET_LINK_LIBRARIES(${this_target} "-lecore" ) -TARGET_LINK_LIBRARIES(${this_target} "-lecore_imf" ) +TARGET_LINK_LIBRARIES(${this_target} "-lecore_imf" ) TARGET_LINK_LIBRARIES(${this_target} "-lecore_imf_evas" ) TARGET_LINK_LIBRARIES(${this_target} "-lelementary" ) TARGET_LINK_LIBRARIES(${this_target} "-levas" ) @@ -123,44 +123,24 @@ TARGET_LINK_LIBRARIES(${this_target} "-lcapi-network-connection" ) TARGET_LINK_LIBRARIES(${this_target} "-lpthread" ) TARGET_LINK_LIBRARIES(${this_target} "-lvconf" ) -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 "libosp-*" - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ - GROUP_EXECUTE GROUP_READ - WORLD_EXECUTE WORLD_READ) -INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/ DESTINATION lib/osp/browser-plugin - FILES_MATCHING PATTERN "libweb-*" - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ +INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/ DESTINATION lib/osp + FILES_MATCHING PATTERN "libosp-*" + 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 "libosp-*" - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ - GROUP_EXECUTE GROUP_READ - WORLD_EXECUTE WORLD_READ) -INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/debug/ DESTINATION lib/osp/browser-plugin/debug +INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/ DESTINATION lib/osp/browser-plugin FILES_MATCHING PATTERN "libweb-*" - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ + PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) - INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/inc/ DESTINATION include/osp FILES_MATCHING PATTERN "*.h") # pkgconfig file diff --git a/packaging/osp-web.spec b/packaging/osp-web.spec index 056c343..f323242 100755 --- a/packaging/osp-web.spec +++ b/packaging/osp-web.spec @@ -1,6 +1,3 @@ -%define debug_package %{nil} -%define __strip /bin/true - Name: osp-web Summary: osp web library Version: 1.2.1.0 @@ -42,7 +39,7 @@ BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(haptic) # runtime requires -Requires: osp-appfw +Requires: osp-appfw Requires: osp-media Requires: osp-net Requires: osp-json @@ -59,18 +56,10 @@ Requires: %{name} = %{version}-%{release} %description devel osp web library (DEV) -%package debug -Summary: osp web library (Development) -Group: TO_BE/FILLED_IN -Requires: %{name} = %{version}-%{release} - -%description debug -osp web library (DEV) - %prep %setup -q -%build +%build MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` %ifarch %{ix86} CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_X86_ -D_OSP_EMUL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER} @@ -101,7 +90,3 @@ cat %{_builddir}/%{name}-%{version}/LICENSE.APLv2.0 >> %{buildroot}/usr/share/li %files devel %{_includedir}/osp/*.h %{_libdir}/pkgconfig/osp-web.pc - -%files debug -%{_libdir}/osp/debug/*.so.* -%{_libdir}/osp/browser-plugin/debug/*.so diff --git a/src/controls/js-bridge-plugin-deprecated/CMakeLists.txt b/src/controls/js-bridge-plugin-deprecated/CMakeLists.txt index bc45b66..33c1f8b 100755 --- a/src/controls/js-bridge-plugin-deprecated/CMakeLists.txt +++ b/src/controls/js-bridge-plugin-deprecated/CMakeLists.txt @@ -31,11 +31,3 @@ ADD_LIBRARY (${this_target} SHARED ${${this_target}_SOURCE_FILES}) # SET LINKER FLAGS TARGET_LINK_LIBRARIES(${this_target} "" ) TARGET_LINK_LIBRARIES(${this_target} ${pkgs_LDFLAGS} ${OSP_LD_PATH_FLAGS} ${OSP_LD_FLAGS} ${OSP_LINKER_FLAGS}) - -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 --remove-section .comment ${LIBRARY_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX} - COMMENT "strip ${this_target}" - ) - diff --git a/src/controls/js-bridge-plugin-tizen/CMakeLists.txt b/src/controls/js-bridge-plugin-tizen/CMakeLists.txt index ea2f8e5..985e46b 100755 --- a/src/controls/js-bridge-plugin-tizen/CMakeLists.txt +++ b/src/controls/js-bridge-plugin-tizen/CMakeLists.txt @@ -31,11 +31,3 @@ ADD_LIBRARY (${this_target} SHARED ${${this_target}_SOURCE_FILES}) # SET LINKER FLAGS TARGET_LINK_LIBRARIES(${this_target} "" ) TARGET_LINK_LIBRARIES(${this_target} ${pkgs_LDFLAGS} ${OSP_LD_PATH_FLAGS} ${OSP_LD_FLAGS} ${OSP_LINKER_FLAGS}) - -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 --remove-section .comment ${LIBRARY_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX} - COMMENT "strip ${this_target}" - ) - -- 2.7.4