Generate debuginfo package instead of debug package

Change-Id: I5a6225507fd15ecc87e9e50385b8a57988e074fc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d837d54fb6290b1d6fc698cce71cfa06f51608f..bd4e54f443d73960335db5ccbb1074ffb67d93b3 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,40 +8,26 @@ SET(COMMON_INCLUDE_DIRS
     /usr/include/osp
     /usr/include/osp/base
        )
-     
-SET(EXTRA_CFLAGS  "${EXTRA_CFLAGS} -L/usr/lib/osp" )     
+
+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)
 
 ADD_SUBDIRECTORY(src/stt osp-stt)
 ADD_SUBDIRECTORY(src/tts osp-tts)
 
-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)
-                                                                               
+
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/inc/ DESTINATION include/osp FILES_MATCHING PATTERN "*.h")
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/inc/ DESTINATION include/osp/uix FILES_MATCHING PATTERN "*.h")
 

diff --git a/packaging/osp-speech.spec b/packaging/osp-speech.spec
old mode 100644 (file)
new mode 100755 (executable)
index 88cb2ca..f1c5846
--- a/packaging/osp-speech.spec
+++ b/packaging/osp-speech.spec
@@ -1,6 +1,3 @@
-%define debug_package %{nil}
-%define __strip /bin/true
-
 Name:          osp-speech
 Summary:       osp speech library
 Version:       1.2.1.0
@@ -15,7 +12,7 @@ BuildRequires:  pkgconfig(osp-appfw)
 BuildRequires:  osp-appfw-internal-devel
 
 # runtime requires
-Requires: osp-appfw 
+Requires: osp-appfw
 
 %description
 osp speech library
@@ -36,18 +33,10 @@ Requires:   %{name} = %{version}-%{release}
 %description internal-devel
 osp speech library (Internal-DEV)
 
-%package debug
-Summary:    osp speech library (Development)
-Group:      TO_BE/FILLED_IN
-Requires:   %{name} = %{version}-%{release}
-
-%description debug
-osp speech 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}
@@ -80,6 +69,3 @@ cp %{_builddir}/%{name}-%{version}/LICENSE.APLv2  %{buildroot}/usr/share/license
 
 %files internal-devel
 %{_includedir}/osp/uix/*.h
-
-%files debug
-%{_libdir}/osp/debug/*.so*

diff --git a/src/stt/CMakeLists.txt b/src/stt/CMakeLists.txt
index 397b8963db5ef72668697a1df20ac96dba42b072..2e5bc57d584f61619667d303ed0efcf436acba4b 100755 (executable)
--- a/src/stt/CMakeLists.txt
+++ b/src/stt/CMakeLists.txt
@@ -2,7 +2,7 @@ SET (this_target osp-speech-stt)
 
 INCLUDE_DIRECTORIES(
        ./
-       ${COMMON_INCLUDE_DIRS}  
+       ${COMMON_INCLUDE_DIRS}
        )
 
 SET (${this_target}_SOURCE_FILES
@@ -27,6 +27,3 @@ SET(CMAKE_SHARED_LINKER_FLAGS -Wl,--no-undefined)
 
 TARGET_LINK_LIBRARIES(${this_target} "-losp-appfw" )
 TARGET_LINK_LIBRARIES(${this_target} "-lstt" )
-
-OSP_STRIP(${this_target})
-

diff --git a/src/tts/CMakeLists.txt b/src/tts/CMakeLists.txt
index cbeeee3b4c8533af2c7b97daba4971cf977c2c11..5debb5e7f7be947570671780ac293b0ce4d37b96 100755 (executable)
--- a/src/tts/CMakeLists.txt
+++ b/src/tts/CMakeLists.txt
@@ -2,7 +2,7 @@ SET (this_target osp-speech-tts)
 
 INCLUDE_DIRECTORIES(
        ./
-       ${COMMON_INCLUDE_DIRS}  
+       ${COMMON_INCLUDE_DIRS}
        )
 
 SET (${this_target}_SOURCE_FILES
@@ -27,6 +27,3 @@ SET(CMAKE_SHARED_LINKER_FLAGS -Wl,--no-undefined)
 
 TARGET_LINK_LIBRARIES(${this_target} "-losp-appfw" )
 TARGET_LINK_LIBRARIES(${this_target} "-ltts" )
-
-OSP_STRIP(${this_target})
-