Generate debuginfo package instead of debug package

Change-Id: If2cd13d07b4d210d67cb48fb4102d39337afbd70

diff --git a/CMakeLists.txt b/CMakeLists.txt
old mode 100644 (file)
new mode 100755 (executable)
index 3c0440c..0d1c32d
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,29 +18,12 @@ SET(COMMON_INCLUDE_DIRS
 SET(EXTRA_CFLAGS  "${EXTRA_CFLAGS} -L/usr/lib/osp" )     
 SET(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/cmake_build_tmp/output)
 
-MACRO(OSP_STRIP _target)
-    SET_TARGET_PROPERTIES(${_target}
-       PROPERTIES
-       VERSION ${FULLVER}
-       SOVERSION ${MAJORVER}
-       CLEAN_DIRECT_OUTPUT 1
+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}"
-               )   
-ENDMACRO(OSP_STRIP)
-
-MACRO(EXE_STRIP _target)
-       ADD_CUSTOM_COMMAND(TARGET ${this_target}
-    POST_BUILD
-               COMMAND ${CMAKE_STRIP} --strip-unneeded ${EXECUTABLE_OUTPUT_PATH}/${this_target}${CMAKE_EXECUTABLE_SUFFIX}
-       COMMENT "strip ${this_target}"
-       )   
-ENDMACRO(EXE_STRIP)
 
 ADD_SUBDIRECTORY(src/bluetooth-app-control osp-ac-bluetooth)
 ADD_SUBDIRECTORY(src/browser-app-control osp-ac-browser)
@@ -60,8 +43,3 @@ INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/ DESTINATION lib/osp
                                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                                          
-                                                                               GROUP_EXECUTE GROUP_READ
-                                                                               WORLD_EXECUTE WORLD_READ)

diff --git a/packaging/osp-app-controls.spec b/packaging/osp-app-controls.spec
index ca2af2f..0a5956c 100755 (executable)
--- a/packaging/osp-app-controls.spec
+++ b/packaging/osp-app-controls.spec
@@ -1,6 +1,3 @@
-%define debug_package %{nil}
-%define __strip /bin/true
-
 Name:          osp-app-controls
 Summary:       osp application controls library
 Version:       1.2.2.0
@@ -44,14 +41,6 @@ Requires(post): coreutils
 %description
 osp application controls library
 
-%package debug
-Summary:    osp appcontrol library (Development)
-Group:      System/Libraries
-Requires:   %{name} = %{version}-%{release}
-
-%description debug
-osp appcontrol library (DEV)
-
 %prep
 %setup -q
 
@@ -94,6 +83,3 @@ cp %{_builddir}/%{name}-%{version}/LICENSE.APLv2  %{buildroot}/usr/share/license
 %attr(0644,root,root) /usr/share/license/%{name}
 /usr/apps/*
 %{_libdir}/osp/*.so*
-
-%files debug
-%{_libdir}/osp/debug/*.so*

diff --git a/src/bluetooth-app-control/CMakeLists.txt b/src/bluetooth-app-control/CMakeLists.txt
old mode 100644 (file)
new mode 100755 (executable)
index 7c2ef89..2a029fe
--- a/src/bluetooth-app-control/CMakeLists.txt
+++ b/src/bluetooth-app-control/CMakeLists.txt
@@ -23,5 +23,3 @@ ADD_LIBRARY (${this_target} SHARED ${${this_target}_SOURCE_FILES})
 
 TARGET_LINK_LIBRARIES(${this_target} osp-appfw)
 TARGET_LINK_LIBRARIES(${this_target} osp-bluetooth)
-
-OSP_STRIP(${this_target})

diff --git a/src/browser-app-control/CMakeLists.txt b/src/browser-app-control/CMakeLists.txt
old mode 100644 (file)
new mode 100755 (executable)
index a82b901..7afe371
--- a/src/browser-app-control/CMakeLists.txt
+++ b/src/browser-app-control/CMakeLists.txt
@@ -22,5 +22,3 @@ SET(CMAKE_CXX_FLAGS "${OSP_DEBUG_FLAGS} ${OSP_OPT_FLAGS} ${CMAKE_CXX_FLAGS} ${EX
 ADD_LIBRARY (${this_target} SHARED ${${this_target}_SOURCE_FILES})
 
 TARGET_LINK_LIBRARIES(${this_target} osp-appfw)
-
-OSP_STRIP(${this_target})

diff --git a/src/calendar-app-control/CMakeLists.txt b/src/calendar-app-control/CMakeLists.txt
old mode 100644 (file)
new mode 100755 (executable)
index 50157e6..8051bb0
--- a/src/calendar-app-control/CMakeLists.txt
+++ b/src/calendar-app-control/CMakeLists.txt
@@ -22,5 +22,3 @@ SET(CMAKE_CXX_FLAGS "${OSP_DEBUG_FLAGS} ${OSP_OPT_FLAGS} ${CMAKE_CXX_FLAGS} ${EX
 ADD_LIBRARY (${this_target} SHARED ${${this_target}_SOURCE_FILES})
 
 TARGET_LINK_LIBRARIES(${this_target} osp-appfw)
-
-OSP_STRIP(${this_target})

diff --git a/src/call-app-control/CMakeLists.txt b/src/call-app-control/CMakeLists.txt
old mode 100644 (file)
new mode 100755 (executable)
index 1269835..6f99bcc
--- a/src/call-app-control/CMakeLists.txt
+++ b/src/call-app-control/CMakeLists.txt
@@ -22,5 +22,3 @@ SET(CMAKE_CXX_FLAGS "${OSP_DEBUG_FLAGS} ${OSP_OPT_FLAGS} ${CMAKE_CXX_FLAGS} ${EX
 ADD_LIBRARY (${this_target} SHARED ${${this_target}_SOURCE_FILES})
 
 TARGET_LINK_LIBRARIES(${this_target} osp-appfw)
-
-OSP_STRIP(${this_target})

diff --git a/src/camera-app-control/CMakeLists.txt b/src/camera-app-control/CMakeLists.txt
old mode 100644 (file)
new mode 100755 (executable)
index be75c6e..8e6012b
--- a/src/camera-app-control/CMakeLists.txt
+++ b/src/camera-app-control/CMakeLists.txt
@@ -22,5 +22,3 @@ SET(CMAKE_CXX_FLAGS "${OSP_DEBUG_FLAGS} ${OSP_OPT_FLAGS} ${CMAKE_CXX_FLAGS} ${EX
 ADD_LIBRARY (${this_target} SHARED ${${this_target}_SOURCE_FILES})
 
 TARGET_LINK_LIBRARIES(${this_target} osp-appfw)
-
-OSP_STRIP(${this_target})

diff --git a/src/contact-app-control/CMakeLists.txt b/src/contact-app-control/CMakeLists.txt
old mode 100644 (file)
new mode 100755 (executable)
index b02076f..659362d
--- a/src/contact-app-control/CMakeLists.txt
+++ b/src/contact-app-control/CMakeLists.txt
@@ -24,5 +24,3 @@ ADD_LIBRARY (${this_target} SHARED ${${this_target}_SOURCE_FILES})
 
 TARGET_LINK_LIBRARIES(${this_target} osp-appfw)
 TARGET_LINK_LIBRARIES(${this_target} "-lcontacts-service2")
-
-OSP_STRIP(${this_target})

diff --git a/src/filemanager-app-control/CMakeLists.txt b/src/filemanager-app-control/CMakeLists.txt
old mode 100644 (file)
new mode 100755 (executable)
index 4f60885..8eea133
--- a/src/filemanager-app-control/CMakeLists.txt
+++ b/src/filemanager-app-control/CMakeLists.txt
@@ -22,5 +22,3 @@ SET(CMAKE_CXX_FLAGS "${OSP_DEBUG_FLAGS} ${OSP_OPT_FLAGS} ${CMAKE_CXX_FLAGS} ${EX
 ADD_LIBRARY (${this_target} SHARED ${${this_target}_SOURCE_FILES})
 
 TARGET_LINK_LIBRARIES(${this_target} osp-appfw)
-
-OSP_STRIP(${this_target})

diff --git a/src/image-app-control/CMakeLists.txt b/src/image-app-control/CMakeLists.txt
old mode 100644 (file)
new mode 100755 (executable)
index e65fec6..650217e
--- a/src/image-app-control/CMakeLists.txt
+++ b/src/image-app-control/CMakeLists.txt
@@ -22,5 +22,3 @@ SET(CMAKE_CXX_FLAGS "${OSP_DEBUG_FLAGS} ${OSP_OPT_FLAGS} ${CMAKE_CXX_FLAGS} ${EX
 ADD_LIBRARY (${this_target} SHARED ${${this_target}_SOURCE_FILES})
 
 TARGET_LINK_LIBRARIES(${this_target} osp-appfw)
-
-OSP_STRIP(${this_target})

diff --git a/src/media-app-control/CMakeLists.txt b/src/media-app-control/CMakeLists.txt
old mode 100644 (file)
new mode 100755 (executable)
index 0292d62..71db4bb
--- a/src/media-app-control/CMakeLists.txt
+++ b/src/media-app-control/CMakeLists.txt
@@ -22,5 +22,3 @@ SET(CMAKE_CXX_FLAGS "${OSP_DEBUG_FLAGS} ${OSP_OPT_FLAGS} ${CMAKE_CXX_FLAGS} ${EX
 ADD_LIBRARY (${this_target} SHARED ${${this_target}_SOURCE_FILES})
 
 TARGET_LINK_LIBRARIES(${this_target} osp-appfw)
-
-OSP_STRIP(${this_target})

diff --git a/src/message-app-control/CMakeLists.txt b/src/message-app-control/CMakeLists.txt
old mode 100644 (file)
new mode 100755 (executable)
index 9a7c6de..60dc27a
--- a/src/message-app-control/CMakeLists.txt
+++ b/src/message-app-control/CMakeLists.txt
@@ -22,5 +22,3 @@ SET(CMAKE_CXX_FLAGS "${OSP_DEBUG_FLAGS} ${OSP_OPT_FLAGS} ${CMAKE_CXX_FLAGS} ${EX
 ADD_LIBRARY (${this_target} SHARED ${${this_target}_SOURCE_FILES})
 
 TARGET_LINK_LIBRARIES(${this_target} osp-appfw)
-
-OSP_STRIP(${this_target})

diff --git a/src/nfc-push-ui-app-control/CMakeLists.txt b/src/nfc-push-ui-app-control/CMakeLists.txt
index 6d84489..b26aff8 100755 (executable)
--- a/src/nfc-push-ui-app-control/CMakeLists.txt
+++ b/src/nfc-push-ui-app-control/CMakeLists.txt
@@ -35,9 +35,6 @@ TARGET_LINK_LIBRARIES(${this_target} -Xlinker --no-undefined -Xlinker --as-neede
 TARGET_LINK_LIBRARIES(${this_target} -Xlinker --version-script=${CMAKE_CURRENT_SOURCE_DIR}/system-service-export.ver)
 TARGET_LINK_LIBRARIES(${this_target} -L/usr/lib/osp -losp-appfw -losp-nfc -losp-uifw -losp-image -losp-image-core -lchromium)
 
-## strip
-EXE_STRIP(${this_target})
-
 ## Copy additional info
 INSTALL(TARGETS ${this_target} DESTINATION ../usr/apps/${APPID}/bin)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/manifest.xml DESTINATION ../usr/apps/${APPID}/info)

diff --git a/src/setting-app-control/CMakeLists.txt b/src/setting-app-control/CMakeLists.txt
old mode 100644 (file)
new mode 100755 (executable)
index 3bbd5df..34778b7
--- a/src/setting-app-control/CMakeLists.txt
+++ b/src/setting-app-control/CMakeLists.txt
@@ -22,5 +22,3 @@ SET(CMAKE_CXX_FLAGS "${OSP_DEBUG_FLAGS} ${OSP_OPT_FLAGS} ${CMAKE_CXX_FLAGS} ${EX
 ADD_LIBRARY (${this_target} SHARED ${${this_target}_SOURCE_FILES})
 
 TARGET_LINK_LIBRARIES(${this_target} osp-appfw)
-
-OSP_STRIP(${this_target})