From: František Dvořák <valtri@civ.zcu.cz>
Date: Tue, 23 Mar 2010 15:57:53 +0000 (+0000)
Subject: Resurrect libtool version numbering (remains as .so.1 for now).
X-Git-Tag: glite-lb-client-java_R_1_0_1_1~13
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=05124daf42b39cf322273dcb56ad73bfcf8c956f;p=jra1mw.git

Resurrect libtool version numbering (remains as .so.1 for now).
---

diff --git a/org.glite.security.gsoap-plugin/Makefile b/org.glite.security.gsoap-plugin/Makefile
index 11b15d9..20d0375 100644
--- a/org.glite.security.gsoap-plugin/Makefile
+++ b/org.glite.security.gsoap-plugin/Makefile
@@ -21,17 +21,30 @@ gsoap_versions_flavours:=${shell if ! echo $gsoap_versions_flavours | grep "\<${
 
 -include Makefile.inc
 -include ../Makefile.inc
+-include ../project/version.properties
+-include ../../project/version.properties
+
+version=${module.version}
 
 GSPLUGIN_DEBUG?=no
 GSPLUGIN_VERSION_CHECKING?=yes
 CC=gcc
 
-offset=0
+# In order to use libtool versioning correcty, we must have:
+#
+# current = major + minor + offset
+# revision = patch
+# age = minor
+#
+# where offset is a sum of maximal released minor's of all previous major's
+# 
+
+# counted minors: 1.5
+# TODO: bump offset to 5 on next major change
+offset=-1
 version_info:=-version-info ${shell \
 	perl -e '$$,=":"; @F=split "\\.","${version}"; print $$F[0]+$$F[1]+${offset},$$F[2],$$F[1]' }
 
-# version_info=-version-info `echo ${version} | cut -d. -f1,2 | tr . :`
-
 ext_repository:=${shell if [ -d "${repository}/externals" ]; then \
 	echo "${repository}/externals"; \
 	else echo "${repository}"; \
diff --git a/org.glite.security.gss/Makefile b/org.glite.security.gss/Makefile
index 12cdf54..3aaf817 100644
--- a/org.glite.security.gss/Makefile
+++ b/org.glite.security.gss/Makefile
@@ -17,14 +17,25 @@ thrflavour=gcc32pthr
 CC=gcc
 
 -include Makefile.inc
--include ../Makefile.inc
-
-offset=0
+-include ../project/version.properties
+
+version=${module.version}
+
+# In order to use libtool versioning correcty, we must have:
+#
+# current = major + minor + offset
+# revision = patch
+# age = minor
+#
+# where offset is a sum of maximal released minor's of all previous major's
+#
+
+# counted minors: gsoap-plugin 1.5
+# TODO: bump offset to 5 on next major change
+offset=-1
 version_info:=-version-info ${shell \
 	perl -e '$$,=":"; @F=split "\\.","${version}"; print $$F[0]+$$F[1]+${offset},$$F[2],$$F[1]' }
 
-# version_info=-version-info `echo ${version} | cut -d. -f1,2 | tr . :`
-
 VPATH=${top_srcdir}/src:${top_srcdir}/test
 
 TEST_LIBS:=-L${cppunit_prefix}/${libdir} -lcppunit