Changeset 1362 for trunk/prepare_new_release

Timestamp:

Jul 21, 2009 1:52:15 PM (12 years ago)

Author:

tkr

Message:

Merging changes related to setting version info

Location:

trunk

Files:

• . (modified) (1 prop)
• prepare_new_release (modified) (10 diffs)

trunk/prepare_new_release

@@ -12 +12 @@
 #       Accommodate simultaneous creation of releases with circular
 #       dependencies.
+# Modified: Ted Ralphs         Lehigh University 2009-07-10
+#       Set libtool version info automatically
 
 #set -x -v
@@ -30 +32 @@
 # nomenclature.
 
-determine_release ()
+#Determine revision number (patch release number--third digit in release 
+# version number
+
+determine_revision ()
 { 
   if test $isData = no ; then
@@ -36 +41 @@
     drtmp_stableBranch=`echo $1 | sed -e 's|.*/stable/||'`
     drtmp_baseURL=`echo $1 | sed -e 's|/stable/[0-9.]*||'`
-    drtmp_returnVal=
 
     # List the existing releases and screen for releases matching stableBranch.
@@ -56 +60 @@
     if test -z "$drtmp_release_vers" ; then
       if test $2 = 1 ; then
-        drtmp_returnVal="$drtmp_stableBranch.0"
+        drtmp_revision=0
       else
-        drtmp_returnVal="Error"
+        drtmp_revision="Error"
       fi
     else
@@ -64 +68 @@
     # There are releases. If we don't have one after the loop, we're confused.
 
-      drtmp_new_rel=-10000
+      drtmp_revision=-10000
       for drtmp_i in $drtmp_release_vers; do
-        drtmp_rel=`echo $drtmp_i | sed -e "s|^$drtmp_stableBranch.||"`
-        if test $drtmp_rel -gt $drtmp_new_rel; then
-          drtmp_new_rel=$drtmp_rel
+        drtmp_old_revision=`echo $drtmp_i | sed -e "s|^$drtmp_stableBranch.||"`
+        if test $drtmp_old_revision -gt $drtmp_revision; then
+          drtmp_revision=$drtmp_old_revision
         fi
       done
 
-      if test $drtmp_new_rel = -10000; then
-        drtmp_new_rel="Error"
+      if test $drtmp_revision = -10000; then
+        drtmp_revision="Error"
       elif test $2 = 1 ; then
-        drtmp_new_rel=`expr $drtmp_new_rel + 1`
+        drtmp_revision=`expr $drtmp_revision + 1`
       fi
-      drtmp_returnVal="$drtmp_stableBranch.$drtmp_new_rel"
     fi
+    
+    # determine current and age for the purposes of libtool versioning
 
   else  # end normal and ThirdParty, begin Data
@@ -107 +112 @@
     if test -z "$drtmp_release_vers" ; then
       if test $2 = 1 ; then
-        drtmp_returnVal="$drtmp_stableBranch.0"
+        drtmp_revision=0
       else
-        drtmp_returnVal="Error"
+        drtmp_revision="Error"
       fi
     else
@@ -140 +145 @@
       if test -z "$drtmp_release_vers" ; then
         if test $2 = 0 ; then
-          drtmp_returnVal="$drtmp_stableBranch.Error"
+          drtmp_revision="Error"
         else
-          drtmp_returnVal="$drtmp_stableBranch.0"
+          drtmp_revision=0
         fi
       else
-        drtmp_new_rel=-10000
+        drtmp_revision=-10000
         for drtmp_i in $drtmp_release_vers; do
-          drtmp_rel=`echo $drtmp_i | sed -e "s|^$drtmp_stableBranch.||"`
-          if test $drtmp_rel -gt $drtmp_new_rel; then
-            drtmp_new_rel=$drtmp_rel
+          drtmp_old_revision=`echo $drtmp_i | sed -e "s|^$drtmp_stableBranch.||"`
+          if test $drtmp_old_revision -gt $drtmp_revision; then
+            drtmp_revision=$drtmp_old_revision
           fi
         done
-        drtmp_new_rel=`expr $drtmp_new_rel + 1`
-        drtmp_returnVal="$drtmp_stableBranch.$drtmp_new_rel"
+        drtmp_revision=`expr $drtmp_revision + 1`
       fi
 
@@ -160 +164 @@
   fi    # for normal/Data
 
-  echo $drtmp_returnVal
+  echo $drtmp_revision
 }
 
+# Determine current (the total number of stable releases over all time)
+
+determine_current ()
+{ 
+  if test $isData = no ; then
+
+    dctmp_stableBranch=`echo $1 | sed -e 's|.*/stable/||'`
+    dctmp_baseURL=`echo $1 | sed -e 's|/stable/[0-9.]*||'`
+
+    dctmp_current=`svn list $dctmp_baseURL/stable | wc -w`
+
+  else
+
+    dctmp_current=0
+
+  fi
+
+  echo $dctmp_current
+}
+
+# Determine age (the number of backwards compatible stable releases (second 
+# number in stable version) 
+
+determine_age ()
+{
+  if test $isData = no ; then
+
+    datmp_stableBranch=`echo $1 | sed -e 's|.*/stable/||'`
+    datmp_baseURL=`echo $1 | sed -e 's|/stable/[0-9.]*||'`
+
+    datmp_age=`echo $datmp_stableBranch | sed -e 's|[0-9].||'`
+
+  else
+
+    datmp_age=0
+
+  fi
+
+  echo $datmp_age
+}
 
 # Specify the COIN URL base for convenience.
@@ -392 +436 @@
 echo "===> Checking releases for stable branch $stableBranch ..."
 
-new_ver=`determine_release "$stableURL" 1`
-
-echo ''
+echo $stableURL
+new_current=`determine_current "$stableURL" 1`
+new_revision=`determine_revision "$stableURL" 1`
+new_age=`determine_age "$stableURL" 1`
+new_ver="$stableBranch.$new_revision"
+
+echo ''
+echo "New current.......: $new_current"
+echo "New revision......: $new_revision"
+echo "New age...........: $new_age"
 echo "New release.......: $new_ver"
 buildBase="${stableProj}-$new_ver"
@@ -454 +505 @@
 
 echo ''
-echo "===> Updating version number ($new_ver) in configure.ac files"
+echo "===> Updating version numbers in configure.ac files"
 for i in $conf_ac_files; do
   sed -e "s|AC_INIT\(.*\)\[[0-9A-Za-z\.]*\],\(.*\)|AC_INIT\1[$new_ver],\2|" $i > bla
+  mv bla $i
+  sed -e "s|AC_COIN_PROJECTDIR_INIT\(.*\)|AC_COIN_PROJECTDIR_INIT\($new_current:$new_revision:$new_age\)|" $i > bla
   mv bla $i
   svn di $i