From b1b3ad421dffa840b59141c3fe167d16e606e28f Mon Sep 17 00:00:00 2001 From: "jh0522.choi" Date: Thu, 29 Aug 2013 09:11:33 +0900 Subject: [PATCH] Generate debuginfo package instead of debug package Change-Id: Ida5e9b527930e79f892c2b871c6f8c3eae7853f7 --- CMakeLists.txt | 15 +++++---------- packaging/osp-shell.spec | 20 ++------------------ src/CMakeLists.txt | 34 +++++++++++++--------------------- src/core/CMakeLists.txt | 10 +--------- 4 files changed, 21 insertions(+), 58 deletions(-) mode change 100644 => 100755 CMakeLists.txt mode change 100644 => 100755 src/CMakeLists.txt mode change 100644 => 100755 src/core/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt old mode 100644 new mode 100755 index 240a0e9..5e530a9 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/cmake_build_tmp/output/osp) -## Disable build rpath +## Disable build rpath SET(CMAKE_SKIP_BUILD_RPATH TRUE) IF(SBS OR OBS) @@ -20,10 +20,10 @@ ENDIF(SBS) ## Set Assembly Compiler #SET(CMAKE_ASM_COMPILER "${CMAKE_C_COMPILER}") - + SET(CMAKE_ASM_COMPILER_ARG1 "${CPPFLAGS} -c") ENABLE_LANGUAGE(ASM) - + ## LIBRARY PATH LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH}) @@ -35,15 +35,10 @@ CONFIGURE_FILE(osp-shell.pc.in ${CMAKE_SOURCE_DIR}/osp-shell.pc @ONLY) INSTALL(FILES ${CMAKE_SOURCE_DIR}/osp-shell.pc DESTINATION lib/pkgconfig) INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/ DESTINATION lib/osp - FILES_MATCHING PATTERN "*.so*" - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ + 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 "*" - 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") INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/inc/ DESTINATION include/osp/shell FILES_MATCHING PATTERN "*.h") diff --git a/packaging/osp-shell.spec b/packaging/osp-shell.spec index 266367a..16e5232 100755 --- a/packaging/osp-shell.spec +++ b/packaging/osp-shell.spec @@ -1,8 +1,5 @@ -%define debug_package %{nil} -%define __strip /bin/true - Name: osp-shell -Summary: The Shell library of OSP +Summary: The Shell library of OSP Version: 1.2.1.0 Release: 12 Group: TO_BE/FILLED_IN @@ -51,7 +48,7 @@ BuildRequires: pkgconfig(badge) # runtime requires Requires: chromium Requires: osp-appfw -Requires: osp-uifw +Requires: osp-uifw Provides: libosp-shell.so.1 @@ -78,14 +75,6 @@ Requires: %{name} = %{version}-%{release} %description internal-devel The Shell library of OSP (Internal-DEV) -%package debug -Summary: The Shell library of OSP (Development) -Group: TO_BE/FILLED_IN -Requires: %{name} = %{version}-%{release} - -%description debug -The Shell library of OSP (debug) - %prep %setup -q @@ -124,8 +113,3 @@ cp %{_builddir}/%{name}-%{version}/LICENSE.Flora %{buildroot}/usr/share/license %files internal-devel %{_includedir}/osp/shell/* - - -%files debug -%{_libdir}/osp/debug/*.so* - diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt old mode 100644 new mode 100755 index 26ef95e..12708ea --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -12,12 +12,12 @@ INCLUDE_DIRECTORIES( /usr/include/osp/graphics /usr/include/osp/ui /usr/include/osp/security - - /usr/include + + /usr/include /usr/include/appfw /usr/include/uifw - /usr/include/glib-2.0 - /usr/lib/glib-2.0/include + /usr/include/glib-2.0 + /usr/lib/glib-2.0/include /usr/include/cairo /usr/include/chromium /usr/include/dlog @@ -27,13 +27,13 @@ INCLUDE_DIRECTORIES( /usr/include/notification /usr/lib/dbus-1.0/include /usr/include/e_dbus-1 - /usr/include/elementary-1 - /usr/include/efreet-1 - /usr/include/ecore-1 - /usr/include/edje-1 - /usr/include/evas-1 - /usr/include/eet-1 - /usr/include/eina-1 + /usr/include/elementary-1 + /usr/include/efreet-1 + /usr/include/ecore-1 + /usr/include/edje-1 + /usr/include/evas-1 + /usr/include/eet-1 + /usr/include/eina-1 /usr/include/eina-1/eina /usr/include/ethumb-1 /usr/include/freetype2 @@ -139,17 +139,9 @@ TARGET_LINK_LIBRARIES(${this_target} "-ldri2" ) TARGET_LINK_LIBRARIES(${this_target} "-ldrm" ) TARGET_LINK_LIBRARIES(${this_target} "-ltbm" ) -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}" -) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt old mode 100644 new mode 100755 index a41de92..e471093 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -10,7 +10,7 @@ INCLUDE_DIRECTORIES( /usr/include/osp/base /usr/include/osp/io /usr/include/osp/security - + /usr/include/appfw /usr/include/notification /usr/include/shortcut @@ -65,11 +65,3 @@ SET_TARGET_PROPERTIES(${this_target} 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}" -) -- 2.7.4