* tests/Param_Test/run_test: Allowed specification of the

invocation style (sii vs. dii) using a shaell variable.

* release.pl: Updated this script so that it can update different
levels of the release version number based on the setting of the
RELEASE_TYPE environment variable.

* Makefile: Added release.chk to the list of files going into the
release.  This file is our checklist for things that have been
tested and work leading up to a release.  Check in here for
details on how a test has worked on a platform.

1 files changed, 15 insertions, 4 deletions

diff --git a/TAO/release.pl b/TAO/release.pl
index 1acd18ff859..555dec1a682 100755
--- a/TAO/release.pl
+++ b/TAO/release.pl
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 $date = `/usr/bin/date +"%a %b %d %T %Y"`;
 chop $date;
 $VERSION = "VERSION";
@@ -8,6 +5,10 @@ $CHANGELOG = "ChangeLog";
 $TAO_VERSION = '';
 $MODNAME = 'TAO';
 
+# Range of values on this is "alpha", "beta", or "major",
+# in which case the 3rd, 2nd, or 1st digit.
+$BUMP_WHICH = $ENV{'RELEASE_TYPE'};
+
 sub inplace {
     my($ext, @files) = @_;
     my(@nfiles) = ();
@@ -34,7 +35,17 @@ open (VERSIONOUT, ">$VERSION")
 
 undef $version_number;
 while (<VERSION>) {
-    s/(TAO version \d+\.\d+\.)(\d+)/sprintf("$1%d",$2+1)/e;
+    if ($BUMP_WHICH =~ m/major/i) {
+	$bump_expr = 'sprintf("$1%d.0.0", $2+1)';
+    }
+    elsif ($BUMP_WHICH =~ m/beta/i) {
+	$bump_expr = 'sprintf("$1$2.%d.0", $3+1)';
+    }
+    else {
+	$bump_expr = 'sprintf("$1$2.$3.%d", $4+1)';
+    }
+    $subst = 's/(TAO version )(\d+)\.(\d+)\.(\d+)/' . $bump_expr . '/e';
+    eval $subst;
     ($version_number = $_) =~ s/.*(\d+\.\d+\.\d+).*/$1/ if (!defined($version_number));
     if (s/(, released ).*/$1$date./) {
 	($TAO_VERSION = $_) =~ s/^This is //;