From 5e0a622eed5c432f584403554e21d1e648937aa8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20K=C5=99enek?= Date: Fri, 14 Oct 2005 14:48:04 +0000 Subject: [PATCH] push version, modify libtool versioning to follow the recommendations --- org.glite.lb.client-interface/project/version.properties | 2 +- org.glite.lb.client/Makefile | 5 ++++- org.glite.lb.client/project/version.properties | 2 +- org.glite.lb.common/Makefile | 6 +++++- org.glite.lb.common/project/version.properties | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/org.glite.lb.client-interface/project/version.properties b/org.glite.lb.client-interface/project/version.properties index a4b48ac..1b13372 100644 --- a/org.glite.lb.client-interface/project/version.properties +++ b/org.glite.lb.client-interface/project/version.properties @@ -1,4 +1,4 @@ #Fri Sep 02 14:16:31 CEST 2005 -module.version=2.1.0 +module.version=3.0.0 module.build=2 module.age=1 diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile index f9dcad0..4ac4d5d 100644 --- a/org.glite.lb.client/Makefile +++ b/org.glite.lb.client/Makefile @@ -148,7 +148,10 @@ FAKE_EXAMPLES:=job_log_fake MAN_GZ:=glite-lb-logevent.1.gz MAN = $(MAN_GZ:.gz=) -version_info=-version-info `echo ${version} | cut -d. -f1,2 | tr . :` +# version_info=-version-info `echo ${version} | cut -d. -f1,2 | tr . :` +offset=2 +version_info:=-version-info ${shell \ + perl -e '$$,=":"; @F=split "\\.","${version}"; print $$F[0]+$$F[1]+${offset},$$F[2],$$F[1]' } ${LIB}: ${LIBOBJS} ${LINK} ${version_info} -o $@ ${LIBLOBJS} -rpath ${glite_location}/lib \ diff --git a/org.glite.lb.client/project/version.properties b/org.glite.lb.client/project/version.properties index 355a1dd..ab27283 100644 --- a/org.glite.lb.client/project/version.properties +++ b/org.glite.lb.client/project/version.properties @@ -1,4 +1,4 @@ #Fri Sep 02 14:17:41 CEST 2005 -module.version=2.1.0 +module.version=3.0.0 module.build=2 module.age=1 diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile index 0326e5a..9bfa125 100644 --- a/org.glite.lb.common/Makefile +++ b/org.glite.lb.common/Makefile @@ -119,7 +119,11 @@ all compile: check_version ${STATICLIB} ${LTLIB} ${THRSTATICLIB} ${THRLTLIB} ${T # # where offset is a sum of maximal released minor's of all previous major's # -version_info=-version-info `echo ${version} | cut -d. -f1,2 | tr . :` +# version_info=-version-info `echo ${version} | cut -d. -f1,2 | tr . :` + +offset=1 +version_info:=-version-info ${shell \ + perl -e '$$,=":"; @F=split "\\.","${version}"; print $$F[0]+$$F[1]+${offset},$$F[2],$$F[1]' } ${STATICLIB}: ${OBJS} ar crv $@ ${OBJS} diff --git a/org.glite.lb.common/project/version.properties b/org.glite.lb.common/project/version.properties index 69f99a3..2d55ba2 100644 --- a/org.glite.lb.common/project/version.properties +++ b/org.glite.lb.common/project/version.properties @@ -1,4 +1,4 @@ #Fri Sep 02 14:17:07 CEST 2005 -module.version=2.1.0 +module.version=3.0.0 module.build=2 module.age=1 -- 1.8.2.3