diff options
| author | Petrica Manoila <petrica.manoila@continental-corporation.com> | 2014-09-16 12:18:13 +0200 |
|---|---|---|
| committer | Petrica Manoila <petrica.manoila@continental-corporation.com> | 2014-09-16 12:18:13 +0200 |
| commit | cfa3ec8a584a601ed68d16a7dcf2da796edadb24 (patch) | |
| tree | 4331c533402dff20550f34c097d05f505493ae49 | |
| parent | 8f0947949da77b5fd0bbf4a8a2f99b06e858af08 (diff) | |
| download | persistence-administrator-cfa3ec8a584a601ed68d16a7dcf2da796edadb24.tar.gz | |
PAS Vers. 1.0.4 - Fixed format for access lib version info.7.0
Change-Id: I81cc9117a4afd2c1b5120774b32e1b30e3c3b2b4
Signed-off-by: Petrica Manoila <petrica.manoila@continental-corporation.com>
| -rw-r--r-- | Administrator/Makefile.am | 2 | ||||
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 17 |
3 files changed, 14 insertions, 10 deletions
diff --git a/Administrator/Makefile.am b/Administrator/Makefile.am index 65831ab..33bf40e 100644 --- a/Administrator/Makefile.am +++ b/Administrator/Makefile.am @@ -33,7 +33,7 @@ libpers_admin_access_lib_la_CFLAGS = \ libpers_admin_access_lib_la_SOURCES = \ src/ssw_pers_admin_access_lib.c -libpers_admin_access_lib_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) +libpers_admin_access_lib_la_LDFLAGS = -version-info $(PERS_ADMINACCESSLIB_VERSION) # pkgconfig pkgconfigdir = $(libdir)/pkgconfig @@ -1,6 +1,11 @@ persistence-administrator ChangeLog =================================== +Version 1.0.4 16.09.2014 +------------------------ + +1. Fixed format for the access lib version info. + Version 1.0.3 12.09.2014 ------------------------ diff --git a/configure.ac b/configure.ac index 5ae56a7..0d6c713 100644 --- a/configure.ac +++ b/configure.ac @@ -18,13 +18,13 @@ dnl ************************************************************************** dnl *** First, define all of the version numbers up front *** dnl *** In particular, this allows the version macro to be used in AC_INIT *** dnl ************************************************************************** -m4_define([PERS_SERVICE_VERSION_S],[1.0.3]) -m4_define([PERS_SERVICE_VERSION_N],[1000003]) +m4_define([PERS_PACKAGE_VERSION_S],[1.0.4]) +m4_define([PERS_ADMINACCESSLIB_VERSION_N],[1000000]) dnl *************************** dnl *** Initialize autoconf *** dnl *************************** -AC_INIT([persistence-administration-service],[PERS_SERVICE_VERSION_S]) +AC_INIT([persistence-administration-service],[PERS_PACKAGE_VERSION_S]) AC_COPYRIGHT([Copyright (c) 2012 Continental Automotive GmbH]) AC_PREREQ([2.50]) @@ -38,11 +38,11 @@ AC_SUBST([ACLOCAL_AMFLAGS], ["$ACLOCAL_FLAGS -I m4"]) dnl ********************************* dnl *** Shared library versioning *** dnl ********************************* -PERSADMINACCESS_MAJOR=$((((PERS_SERVICE_VERSION_N() / 1000) / 1000) % 1000 )) -PERSADMINACCESS_MINOR=$(( (PERS_SERVICE_VERSION_N() / 1000) % 1000 )) -PERSADMINACCESS_MICRO=$(( PERS_SERVICE_VERSION_N() % 1000 )) -GENERIC_LIBRARY_VERSION=$PERSADMINACCESS_MAJOR:$PERSADMINACCESS_MINOR:$PERSADMINACCESS_MICRO -AC_SUBST(GENERIC_LIBRARY_VERSION) +PERS_ADMINACCESSLIB_CURRENT=$((((PERS_ADMINACCESSLIB_VERSION_N() / 1000) / 1000) % 1000 )) +PERS_ADMINACCESSLIB_REVISION=$(( (PERS_ADMINACCESSLIB_VERSION_N() / 1000) % 1000 )) +PERS_ADMINACCESSLIB_AGE=$(( PERS_ADMINACCESSLIB_VERSION_N() % 1000 )) +PERS_ADMINACCESSLIB_VERSION=$PERS_ADMINACCESSLIB_CURRENT:$PERS_ADMINACCESSLIB_REVISION:$PERS_ADMINACCESSLIB_AGE +AC_SUBST(PERS_ADMINACCESSLIB_VERSION) dnl ******************************** dnl *** Check for basic programs *** @@ -150,4 +150,3 @@ AC_CONFIG_FILES([ Makefile test/persadmin_tool/Makefile]) AC_OUTPUT - |