* mkrel (reldate): Fix to deal with release branch snapshots

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11666 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/util/ChangeLog b/src/util/ChangeLog
index c72703068ee6f8f146d2b2532d5946af85f03c52..2682795da59cac7817b4a6dc3639c7e427d99586 100644 (file)
--- a/src/util/ChangeLog
+++ b/src/util/ChangeLog
@@ -1,3 +1,7 @@
+1999-08-16  Tom Yu  <tlyu@mit.edu>
+
+       * mkrel (reldate): Fix to deal with release branch snapshots.
+
 Wed May 19 11:43:36 1999  Danilo Almeida  <dalmeida@mit.edu>
 
        * Makefile.in: Add all and cleanup rules for windows for windows,

diff --git a/src/util/mkrel b/src/util/mkrel
index ae7a1ed37a8e6df3793e6fbc941eb95979224b1e..e534a478f18ad2141c6d7de0a640afaf1d488023 100644 (file)
--- a/src/util/mkrel
+++ b/src/util/mkrel
@@ -54,6 +54,19 @@ krb5-*.*.*)
        relminor=`echo $release|awk -F. '{print $2}'`
        relpatch=`echo $release|awk -F. '{print $3}'`
        ;;
+krb5-*.*-current)
+       release=`echo $reldir|sed -e 's/krb5-//'`
+       relhead=`echo $release|sed -e 's/-.*//'`
+       relmajor=`echo $relhead|awk -F. '{print $1}'`
+       relminor=`echo $relhead|awk -F. '{print $2}'`
+       release=${relhead}-$reldate
+       ;;
+krb5-*.*-*)
+       release=`echo $reldir|sed -e 's/krb5-//'`
+       relhead=`echo $release|sed -e 's/-.*//'`
+       relmajor=`echo $relhead|awk -F. '{print $1}'`
+       relminor=`echo $relhead|awk -F. '{print $2}'`
+       ;;
 krb5-*.*)
        release=`echo $reldir|sed -e 's/krb5-//'`
        relmajor=`echo $release|awk -F. '{print $1}'`
@@ -62,9 +75,18 @@ krb5-*.*)
 krb5-current)
        release=current-$reldate
        ;;
-*);;
+*)
+       release="$reldir"
+       ;;
 esac
 
+echo "release=$release"
+echo "major=$relmajor minor=$relminor patch=$relpatch"
+
+# $release is used for send-pr
+# $reltag, $release, $reldate are used for brand.c currently
+# $relmajor, $relminor, $relpatch are used for patchlevel.h currently
+
 if test $checkout = t; then
        echo "Checking out krb5 with tag $reltag into directory $reldir..."
        cvs -q -d $repository export -r$reltag -d $reldir krb5