Make the library version to be same as the pakcage version

Change-Id: I72186c5353b8458e80759ec218edc8c7567bd6eb
Signed-off-by: jongmyeongko <jongmyeong.ko@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 312d9826ec8b6068a0cd3d36cc509b0ad996bf26..a20710980f2f7f7983ff00eb02aa4079cacc49b4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,8 +5,6 @@ SET(BINDIR "${CMAKE_INSTALL_PREFIX}/bin")
 SET(LIBDIR "${CMAKE_INSTALL_LIBDIR}")
 SET(SHAREDIR "${CMAKE_INSTALL_PREFIX}/share")
 SET(INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include")
-SET(VERSION_MAJOR 0)
-SET(VERSION "${VERSION_MAJOR}.1.0")
 SET(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 IF(NOT CMAKE_BUILD_TYPE)

diff --git a/packaging/manifest-parser.spec b/packaging/manifest-parser.spec
index b9a7e2a3e60f0db43939cd33db77f0118e742fad..6e0630d656fcbade5a7b82f002545ed7178b8227 100644 (file)
--- a/packaging/manifest-parser.spec
+++ b/packaging/manifest-parser.spec
@@ -60,8 +60,10 @@ export FFLAGS="$(echo $FFLAGS | sed 's/-Wl,--as-needed//g')"
 # with cmake, which are on one repository. Later this macro
 # is used in CMakeLists.txt files to distinguish, which project
 # is currently being build.
+MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %cmake . -DCMAKE_BUILD_TYPE=%{?build_type:%build_type} \
-         -DTIZEN_VERSION=%{tizen_version}
+         -DTIZEN_VERSION=%{tizen_version} \
+         -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
 
 make %{?_smp_mflags}
 

diff --git a/src/delta/CMakeLists.txt b/src/delta/CMakeLists.txt
index d64d278d1b10dff9674db276f3ba37c758db29ba..188142afc3769b7e0fc3ccc3bab729a9dc141680 100644 (file)
--- a/src/delta/CMakeLists.txt
+++ b/src/delta/CMakeLists.txt
@@ -7,8 +7,8 @@ TARGET_INCLUDE_DIRECTORIES(${TARGET_LIBNAME_DELTA_MANIFEST_HANDLERS} PUBLIC
                            "${CMAKE_CURRENT_SOURCE_DIR}/../")
 
 # Extra
-SET_TARGET_PROPERTIES(${TARGET_LIBNAME_WGT_MANIFEST_HANDLERS} PROPERTIES VERSION ${VERSION})
-SET_TARGET_PROPERTIES(${TARGET_LIBNAME_WGT_MANIFEST_HANDLERS} PROPERTIES SOVERSION ${VERSION_MAJOR})
+SET_TARGET_PROPERTIES(${TARGET_LIBNAME_WGT_MANIFEST_HANDLERS} PROPERTIES VERSION ${FULLVER})
+SET_TARGET_PROPERTIES(${TARGET_LIBNAME_WGT_MANIFEST_HANDLERS} PROPERTIES SOVERSION ${MAJORVER})
 
 # Install
 INSTALL(TARGETS ${TARGET_LIBNAME_DELTA_MANIFEST_HANDLERS} DESTINATION ${LIB_INSTALL_DIR})

diff --git a/src/delta/delta-manifest-handlers.pc.in b/src/delta/delta-manifest-handlers.pc.in
index 624ec735cc09fe64132d914df051d004cd974ba2..cb843ef9cb064f95b76d63a452a8b2b439c47da8 100644 (file)
--- a/src/delta/delta-manifest-handlers.pc.in
+++ b/src/delta/delta-manifest-handlers.pc.in
@@ -5,7 +5,7 @@ includedir=@INCLUDEDIR@
 
 Name: delta-manifest-handlers
 Description: Delta manifest handlers for manifest parser
-Version: @VERSION@
+Version: @FULLVER@
 Requires: manifest-parser
 Libs: -L${libdir} -ldelta-manifest-handlers
-Cflags: -I${includedir}
\ No newline at end of file
+Cflags: -I${includedir}

diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt
index b0ae2d2e9cf46fe618d60213fdf6ae2b60e416dc..133c26e048c1784b99a49b1327a3cff5426b4e11 100644 (file)
--- a/src/examples/CMakeLists.txt
+++ b/src/examples/CMakeLists.txt
@@ -21,8 +21,8 @@ TARGET_LINK_LIBRARIES(${TARGET_EXAMPLES} PUBLIC ${TARGET_LIBNAME_PARSER})
 INSTALL(FILES config.xml DESTINATION ${SHAREDIR}/manifest-parser)
 
 # Extra
-SET_TARGET_PROPERTIES(${TARGET_EXAMPLES} PROPERTIES VERSION ${VERSION})
-SET_TARGET_PROPERTIES(${TARGET_EXAMPLES} PROPERTIES SOVERSION ${VERSION_MAJOR})
+SET_TARGET_PROPERTIES(${TARGET_EXAMPLES} PROPERTIES VERSION ${FULLVER})
+SET_TARGET_PROPERTIES(${TARGET_EXAMPLES} PROPERTIES SOVERSION ${MAJORVER})
 
 # Install
 INSTALL(TARGETS ${TARGET_EXAMPLES} DESTINATION ${BINDIR}/manifest-parser)

diff --git a/src/manifest_parser/CMakeLists.txt b/src/manifest_parser/CMakeLists.txt
index 9110265a7b3c657d9f68660d7082724cbb7aa774..087b1d46b4dc642ba80c67d7c8ba7b5d02442d93 100644 (file)
--- a/src/manifest_parser/CMakeLists.txt
+++ b/src/manifest_parser/CMakeLists.txt
@@ -14,8 +14,8 @@ APPLY_PKG_CONFIG(${TARGET_LIBNAME_PARSER} PUBLIC
 )
 
 # Extra
-SET_TARGET_PROPERTIES(${TARGET_LIBNAME_PARSER} PROPERTIES VERSION ${VERSION})
-SET_TARGET_PROPERTIES(${TARGET_LIBNAME_PARSER} PROPERTIES SOVERSION ${VERSION_MAJOR})
+SET_TARGET_PROPERTIES(${TARGET_LIBNAME_PARSER} PROPERTIES VERSION ${FULLVER})
+SET_TARGET_PROPERTIES(${TARGET_LIBNAME_PARSER} PROPERTIES SOVERSION ${MAJORVER})
 
 # Target - in-package deps
 TARGET_LINK_LIBRARIES(${TARGET_LIBNAME_PARSER} PUBLIC ${TARGET_LIBNAME_UTILS})

diff --git a/src/manifest_parser/manifest-parser.pc.in b/src/manifest_parser/manifest-parser.pc.in
index 24bb701d9f770c596861fd10cd5ec3b889ffbce9..de2b8f8212288ec80d2e7d183631bae218be1aa5 100644 (file)
--- a/src/manifest_parser/manifest-parser.pc.in
+++ b/src/manifest_parser/manifest-parser.pc.in
@@ -5,7 +5,7 @@ includedir=@INCLUDEDIR@
 
 Name: manifest-parser
 Description: Universal manifest parser
-Version: @VERSION@
+Version: @FULLVER@
 Requires: libiri libxml-2.0 pkgmgr-info pkgmgr-parser vconf manifest-parser-utils
 Libs: -L${libdir} -lmanifest-parser
-Cflags: -I${includedir}
\ No newline at end of file
+Cflags: -I${includedir}

diff --git a/src/manifest_parser/utils/CMakeLists.txt b/src/manifest_parser/utils/CMakeLists.txt
index 101d0a14f9a5c6549c27ab0bbf11f300a4b24a5e..c69b432d98c102b1fd54940c7103c2f906b959df 100644 (file)
--- a/src/manifest_parser/utils/CMakeLists.txt
+++ b/src/manifest_parser/utils/CMakeLists.txt
@@ -13,8 +13,8 @@ APPLY_PKG_CONFIG(${TARGET_LIBNAME_UTILS} PUBLIC
 )
 
 # Extra
-SET_TARGET_PROPERTIES(${TARGET_LIBNAME_UTILS} PROPERTIES VERSION ${VERSION})
-SET_TARGET_PROPERTIES(${TARGET_LIBNAME_UTILS} PROPERTIES SOVERSION ${VERSION_MAJOR})
+SET_TARGET_PROPERTIES(${TARGET_LIBNAME_UTILS} PROPERTIES VERSION ${FULLVER})
+SET_TARGET_PROPERTIES(${TARGET_LIBNAME_UTILS} PROPERTIES SOVERSION ${MAJORVER})
 
 # Install
 INSTALL(TARGETS ${TARGET_LIBNAME_UTILS} DESTINATION ${LIB_INSTALL_DIR})