Arrange version management

Change-Id: I42931c88e1d7a7a33db9a59062e6278c73a871c8
Signed-off-by: Seungha Son <seungha.son@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e43f940ef540205e810a1106489adaab7d23536..0d639684911717a23b8743e4bb71fd6338e200f5 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,8 +3,6 @@ PROJECT(ttrace C CXX)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
-SET(VERSION_MAJOR 1)
-SET(VERSION "${VERSION_MAJOR}.1")
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
@@ -54,8 +52,8 @@ ENDFOREACH(flag)
 ADD_LIBRARY(${TTRACE} SHARED ${SRCS_ttrace}
                              src/trace.c
                              )
-SET_TARGET_PROPERTIES(${TTRACE} PROPERTIES SOVERSION ${VERSION_MAJOR})
-SET_TARGET_PROPERTIES(${TTRACE} PROPERTIES VERSION ${VERSION})
+SET_TARGET_PROPERTIES(${TTRACE} PROPERTIES SOVERSION ${MAJORVER})
+SET_TARGET_PROPERTIES(${TTRACE} PROPERTIES VERSION ${FULLVER})
 SET_TARGET_PROPERTIES(${TTRACE} PROPERTIES COMPILE_FLAGS ${EXTRA_CFLAGS_common})
 TARGET_LINK_LIBRARIES(${TTRACE} ${pkg_ttrace_LDFLAGS} "-ldl")
 
@@ -119,8 +117,6 @@ SET(HEADER_atrace_helper
     )
 
 ADD_EXECUTABLE(${ATRACE} ${SRCS_atrace})
-SET_TARGET_PROPERTIES(${ATRACE} PROPERTIES SOVERSION ${VERSION_MAJOR})
-SET_TARGET_PROPERTIES(${ATRACE} PROPERTIES VERSION ${VERSION})
 #SET_TARGET_PROPERTIES(${ATRACE} PROPERTIES COMPILE_FLAGS ${EXTRA_CFLAGS_common})
 TARGET_LINK_LIBRARIES(${ATRACE} ${pkg_atrace_LDFLAGS} "-ldl")
 

diff --git a/packaging/ttrace.spec b/packaging/ttrace.spec
index 9c9e49101933cdb6b5307abe5267780e8598aa19..947807fe381fbe9b2b46b3baedb4ffe7566e5d44 100644 (file)
--- a/packaging/ttrace.spec
+++ b/packaging/ttrace.spec
@@ -69,8 +69,11 @@ export LDFLAGS+=" -lgcov"
 
 export CFLAGS="$CFLAGS -g -Wall -std=gnu99"
 export CXXFLAGS="$CXXFLAGS -std=c++0x -fPIE -pie -fno-exceptions"
+
+MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIBDIR=%{_libdir} -DINCLUDEDIR=%{_includedir} \
-      -DTTRACE_PROFILE=%{TTRACE_PROFILE} -DTTRACE_TIZEN_VERSION_MAJOR=%{TTRACE_TIZEN_VERSION_MAJOR}
+      -DTTRACE_PROFILE=%{TTRACE_PROFILE} -DTTRACE_TIZEN_VERSION_MAJOR=%{TTRACE_TIZEN_VERSION_MAJOR} \
+      -DMAJORVER=${MAJORVER} -DFULLVER=%{version}
 make %{?jobs:-j%jobs}
 
 %if 0%{?gcov:1}
@@ -107,7 +110,6 @@ install -m 0644 gcov-obj/* %{buildroot}%{_datadir}/gcov/obj
 %{_unitdir}/ttrace-marker.service
 %{_unitdir}/sys-kernel-debug-tracing.mount
 %attr(755,root,users) %{_bindir}/atrace
-%attr(755,root,users) %{_bindir}/atrace-1.1
 %attr(755,root,users) %{_bindir}/atrace-helper
 %{_unitdir}/sysinit.target.wants/ttrace-marker.service
 %{_unitdir}/sysinit.target.wants/sys-kernel-debug-tracing.mount