From 957e52777f92503a6891d7880c8f9a9e59a153db Mon Sep 17 00:00:00 2001 From: max Date: Wed, 28 Aug 2019 14:24:19 +0300 Subject: [PATCH] Bumped version number to 0.3.4 --- configure.ac | 9 ++++++--- embedded/teocli | 2 +- sh/make_package.c | 4 ++-- src/Makefile.am | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index a6fbb2322..b0f97e621 100644 --- a/configure.ac +++ b/configure.ac @@ -13,10 +13,13 @@ AC_SUBST([$1], ['$2']) AC_PREREQ([2.69]) -AC_INIT([teonet], [0.3.3], [kirill@scherba.ru]) -AC_DEFINE_SUBST(LIBRARY_MAJOR_VERSION, 158, [Teonet dynamic library version]) +AC_INIT([teonet], [0.3.4], [Kirill Scherba , Max Ponka ]) -AC_DEFINE(COPYRIGHT, ["(c) Kirsoft Inc., 1996-2019"], [Teonet library copyright]) +AC_DEFINE_SUBST(LIBRARY_CURRENT, 2, [teocli dynamic library version]) +AC_DEFINE_SUBST(LIBRARY_REVISION, 3, [teocli dynamic library version]) +AC_DEFINE_SUBST(LIBRARY_AGE, 2, [teocli dynamic library version]) + +AC_DEFINE(COPYRIGHT, ["(c) Teonet co., 1996-2019"], [Teonet library copyright]) AC_CONFIG_HEADERS([src/config/config.h]) AC_CONFIG_SRCDIR([src/teonet.hpp]) diff --git a/embedded/teocli b/embedded/teocli index 70832d272..a44e1ddad 160000 --- a/embedded/teocli +++ b/embedded/teocli @@ -1 +1 @@ -Subproject commit 70832d27298e73382338b4e358a831dc5bbfacd4 +Subproject commit a44e1ddade5b0236148ee23f95260f0e6915b4ef diff --git a/sh/make_package.c b/sh/make_package.c index 36b0b69a7..0d92b4915 100644 --- a/sh/make_package.c +++ b/sh/make_package.c @@ -107,8 +107,8 @@ int main(int argc, char** argv) { b_type == DEB ? argv[1] : "rpm", // 0 // Script parameters version, // $1 Version - LIBRARY_MAJOR_VERSION, // $2 Library major version - LIBRARY_MAJOR_VERSION, // $3 Library version + PACKAGE_VERSION, // $2 Library major version + PACKAGE_VERSION, // $3 Library version CI_BUILD_ID != NULL ? CI_BUILD_ID : (CIRCLE_BUILD_NUM != NULL ? CIRCLE_BUILD_NUM : "1"), // $4 Build argc >= 3 ? argv[2] : b_type == DEB ? "amd64" : "x86_64", // $5 Architecture b_type > DEB ? argv[1] : "deb" // $6 RPM subtype diff --git a/src/Makefile.am b/src/Makefile.am index e8663f4ba..dafbda484 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -219,7 +219,7 @@ endif # AM_LFLAGS=-Pcfg_yy -olex.yy.c #lexer.c: lexer.l -libteonet_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBRARY_MAJOR_VERSION):0:0 +libteonet_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBRARY_CURRENT):$(LIBRARY_REVISION):$(LIBRARY_AGE) #49:0:0 uninstall-local: