From 75ce2782dfb378b5b784bea154e26645020723b2 Mon Sep 17 00:00:00 2001 From: jongmyeongko Date: Thu, 19 Jan 2017 15:04:08 +0900 Subject: [PATCH] Make the library version to be same as the pakcage version Change-Id: Ib5af69fc93cfd13eade47f8342ea8b84692f66e7 Signed-off-by: jongmyeongko --- CMakeLists.txt | 2 -- client/CMakeLists.txt | 4 ++-- client/pkgmgr.pc.in | 4 ++-- installer/CMakeLists.txt | 20 ++------------------ installer/pkgmgr-installer.pc.in | 2 +- packaging/pkgmgr.spec | 3 ++- types/pkgmgr-types.pc.in | 2 +- 7 files changed, 10 insertions(+), 27 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c5c2d1..5a6fbfa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,8 +4,6 @@ SET(CMAKE_SKIP_BUILD_RPATH true) PROJECT(package-manager C) INCLUDE(TizenCommon) -SET(VERSION_MAJOR 0) -SET(VERSION ${VERSION_MAJOR}.1.68) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index ab19c7b..5154bbd 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -20,8 +20,8 @@ INCLUDE_DIRECTORIES(include) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") ADD_LIBRARY(${PKGMGR_CLIENT} SHARED ${SRCS}) -SET_TARGET_PROPERTIES(${PKGMGR_CLIENT} PROPERTIES SOVERSION ${VERSION_MAJOR}) -SET_TARGET_PROPERTIES(${PKGMGR_CLIENT} PROPERTIES VERSION ${VERSION}) +SET_TARGET_PROPERTIES(${PKGMGR_CLIENT} PROPERTIES SOVERSION ${MAJORVER}) +SET_TARGET_PROPERTIES(${PKGMGR_CLIENT} PROPERTIES VERSION ${FULLVER}) TARGET_LINK_LIBRARIES(${PKGMGR_CLIENT} pkgmgr-info ${CLIENT_DEPS_LDFLAGS}) diff --git a/client/pkgmgr.pc.in b/client/pkgmgr.pc.in index 907eb80..5ac5652 100644 --- a/client/pkgmgr.pc.in +++ b/client/pkgmgr.pc.in @@ -8,9 +8,9 @@ exec_prefix=@EXEC_PREFIX@ libdir=@LIBDIR@ includedir=@INCLUDEDIR@ -Name: package manager +Name: package manager Description: SLP Package Manager Package -Version: @VERSION@ +Version: @FULLVER@ Requires: dlog pkgmgr-types dbus-glib-1 Libs: -L${libdir} -L${libdir}/pkgmgr -lpkgmgr-client Cflags: -I${includedir} diff --git a/installer/CMakeLists.txt b/installer/CMakeLists.txt index b96af58..c3b72ef 100644 --- a/installer/CMakeLists.txt +++ b/installer/CMakeLists.txt @@ -6,22 +6,6 @@ cmake_minimum_required(VERSION 2.6) #set(CMAKE_SKIP_BUILD_RPATH true) set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) - -### Versioning -if(DEFINED ${VERSION}) - message("VERSION: ${VERSION}") -else() - message("VERSION is not defined. set it as 0.1.0") - set(VERSION 0.1.0) -endif() -if(DEFINED ${VERSION_MAJOR}) - message("VERSION_MAJOR: ${VERSION_MAJOR}") -else() - message( "VERSION_MAJOR is not defined. set it as 0") - set(VERSION_MAJOR 0) -endif() -message(STATUS "version/major : ${VERSION} / ${VERSION_MAJOR}") - ### Get required CFLAGS, LDFLAGS from pkg-config include(FindPkgConfig) @@ -40,8 +24,8 @@ ENDFOREACH() ## pkgmgr_installer object (by youmin.ha) # This library is for installer backend add_library(pkgmgr_installer SHARED pkgmgr_installer.c) -set_target_properties(pkgmgr_installer PROPERTIES SOVERSION ${VERSION_MAJOR}) -set_target_properties(pkgmgr_installer PROPERTIES VERSION ${VERSION}) +set_target_properties(pkgmgr_installer PROPERTIES SOVERSION ${MAJORVER}) +set_target_properties(pkgmgr_installer PROPERTIES VERSION ${FULLVER}) set_target_properties(pkgmgr_installer PROPERTIES COMPILE_FLAGS "${installer_pkgs_CFLAGS_str} -fPIC") target_link_libraries(pkgmgr_installer ${installer_pkgs_LDFLAGS}) diff --git a/installer/pkgmgr-installer.pc.in b/installer/pkgmgr-installer.pc.in index 06c0002..f812a3b 100644 --- a/installer/pkgmgr-installer.pc.in +++ b/installer/pkgmgr-installer.pc.in @@ -10,7 +10,7 @@ includedir=@INCLUDEDIR@ Name: package manager installer library Description: SLP package manager's installer lib for each backends -Version: @VERSION@ +Version: @FULLVER@ Requires: Libs: -L${libdir} -lpkgmgr_installer Cflags: -I${includedir}/pkgmgr diff --git a/packaging/pkgmgr.spec b/packaging/pkgmgr.spec index 6b6caa1..88118d7 100644 --- a/packaging/pkgmgr.spec +++ b/packaging/pkgmgr.spec @@ -90,7 +90,8 @@ Package Manager client types develpoment package for packaging cp %{SOURCE1001} %{SOURCE1002} %{SOURCE1003} %{SOURCE1004} %{SOURCE1005} %{SOURCE1006} . %build -%cmake . +MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` +%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} %__make %{?_smp_mflags} diff --git a/types/pkgmgr-types.pc.in b/types/pkgmgr-types.pc.in index 0e53688..8597bab 100644 --- a/types/pkgmgr-types.pc.in +++ b/types/pkgmgr-types.pc.in @@ -10,7 +10,7 @@ includedir=@INCLUDEDIR@ Name: package manager types Description: SLP package manager's types header -Version: @VERSION@ +Version: @FULLVER@ Requires: Libs: Cflags: -I${includedir} -- 2.34.1