Changeset 5737

Timestamp:

11/07/09 12:17:40 (2 weeks ago)

Author:

balaji

Message:

Separate out MPICH2's version number from the ABI version so they can
be controlled independently.

Reviewed by buntinas.

Location:

mpich2/trunk

Files:

• configure.in (modified) (2 diffs)
• maint/Version (modified) (1 diff)
• maint/updatefiles (modified) (2 diffs)

mpich2/trunk/configure.in

@@ -138 +138 @@
 # Try to find the version
 if test -s "$srcdir/maint/Version" ; then
-    MPICH2_VERSION="`cat $srcdir/maint/Version`"
+    MPICH2_VERSION="`cat $srcdir/maint/Version | grep ^MPICH2_VERSION: | cut -f2 -d' '`"
     export MPICH2_VERSION
 else
@@ -202 +202 @@
 # Makefile.sm to pass the ABIVERSION to the createshlib script.
 # We use libtool-style version numbers (see --version-info in the 
-# libtool manual) 
-changequote(<<,>>)
-V1=`expr $MPICH2_VERSION : '\([0-9]*\)\.[0-9]*\.*[0-9]*[a-zA-Z]*[0-9]*'`
-V2=`expr $MPICH2_VERSION : '[0-9]*\.\([0-9]*\)\.*[0-9]*[a-zA-Z]*[0-9]*'`
-changequote([,])
-ABIVERSION="${V1}:${V2}"
+# libtool manual)
+ABIVERSION="`cat $srcdir/maint/Version | grep ^MPICH2_ABIVERSION: | cut -f2 -d' '`"
 AC_SUBST(ABIVERSION)
 

mpich2/trunk/maint/Version

@@ -1 @@
-1.2.1rc1
+MPICH2_VERSION: 1.2.1rc1
+MPICH2_ABIVERSION: 1:2

mpich2/trunk/maint/updatefiles

@@ -918 +918 @@
 if [ "$do_smpdversion" = yes ] ; then
     echo "Creating src/pm/smpd/smpd_version.h"
-    smpdVersion=`cat maint/Version`
+    smpdVersion=`cat maint/Version | grep ^MPICH2_VERSION | cut -f2 -d' '`
     cat >src/pm/smpd/smpd_version.h <<EOF
 /* -*- Mode: C; c-basic-offset:4 ; -*- */
@@ -929 +929 @@
 fi
 
-VERSION=`cat maint/Version`
+VERSION=`cat maint/Version | grep ^MPICH2_VERSION | cut -f2 -d' '`
 if [ -f README.vin ] ; then
     echo "Updating README's version ID."