enter version number(s) into BUG-REPORT-FORM

1 files changed, 55 insertions, 14 deletions

diff --git a/bin/make_release b/bin/make_release
index b17b7334d6b..ec58fb6dc03 100755
--- a/bin/make_release
+++ b/bin/make_release
@@ -225,10 +225,8 @@ sub get_versions () {
   if ($release_type eq 'beta') {
     if ($beta_version > 0) {
       $previous_version = "$major_version.$minor_version.$beta_version";
-    } elsif ($minor_version > 0) {
-      $previous_version = "$major_version.$minor_version";
     } else {
-      $previous_version = "$major_version";
+      $previous_version = "$major_version.$minor_version";
     }
 
     ++$beta_version;
@@ -240,11 +238,41 @@ sub get_versions () {
   } elsif ($release_type eq 'major' ) {
     $minor_version = $beta_version = 0;
     ++$major_version;
-    $version = "$major_version";
+    $version = "$major_version.$minor_version";
   }
 
   print "new $KIT version: $version\n";
 
+  if ($kit =~ /tao/) {
+    $ace_minor_version = $ace_beta_version = 0;
+    open (ACE_VERSION, '< ../VERSION')  ||
+      die "$0: unable to open ../VERSION\n";
+    while (<ACE_VERSION>) {
+      if (/ACE version (\d+)\.(\d+)\.(\d+)/o) {
+        $ace_major_version = $1;
+        $ace_minor_version = $2;
+        $ace_beta_version = $3;
+        last;
+      } elsif (/ACE version (\d+)\.(\d+)[^\.]/o) {
+        #### ACE release was a minor.
+        $ace_major_version = $1;
+        $ace_minor_version = $2;
+        last;
+      } elsif (/ACE version (\d+)[^\.]/o) {
+        #### ACE release was a major.
+        $ace_major_version = $1;
+        last;
+      }
+    }
+    close ACE_VERSION;
+
+    if ($ace_beta_version == 0) {
+      $ace_version = "$ace_major_version.$ace_minor_version";
+    } else {
+      $ace_version = "$ace_major_version.$ace_minor_version.$ace_beta_version";
+    }
+  }
+
   0;
 }
 
@@ -253,11 +281,22 @@ sub get_versions () {
 ########
 sub update_version_files () {
   system ("$exec_prefix" .
-    "perl -pi -e " .
-    "'s/$KIT version .*/$KIT version $version, released $now./' " .
+    "perl -pi -e 's/$KIT version .*/$KIT version $version, released $now./' " .
     "VERSION $exec_suffix");
   return 1 if $? >> 8;
 
+  system ("$exec_prefix" .
+    "perl -pi -e 's/$KIT VERSION:.*/$KIT VERSION: $version/' " .
+    "BUG-REPORT-FORM $exec_suffix");
+  return 1 if $? >> 8;
+
+  if ($kit =~ /^tao/) {
+    system ("$exec_prefix" .
+      "perl -pi -e 's/ACE VERSION:.*/ACE VERSION: $ace_version/' " .
+      "BUG-REPORT-FORM $exec_suffix");
+    return 1 if $? >> 8;
+  }
+
   if (! "$exec_prefix"  &&  $kit =~ /^ace/) {
     open (ACE_VERSION_H, "> ace/Version.h")  ||
       die "$0: unable to open ace/Version.h\n";
@@ -285,10 +324,11 @@ sub update_changelog () {
   my $signature = $ENV{'SIGNATURE'} || $logname;
   my $message = "$now  $signature  <$logname\\\@cs.wustl.edu>\n\n" .
                 "        * $KIT version $version released.\n\n";
-  my $message_insert = "perl -pi -e 'BEGIN {\$message_printed = 0;}
-     if (! \$message_printed) {
-       print \"$message\";
-       ++\$message_printed; }' ChangeLog";
+  my $message_insert =
+    "perl -pi -e 'BEGIN {\$message_printed = 0;}
+      if (! \$message_printed) {
+        print \"$message\";
+        ++\$message_printed; }' ChangeLog";
 
   if ("$exec_prefix") {
     print "$message_insert\n";
@@ -297,11 +337,12 @@ sub update_changelog () {
   }
 
   if ($kit =~ /^ace/) {
-    system ("$cvs commit -m'$version' VERSION ChangeLog ace/Version.h " .
-            "&& chmod 0644 VERSION ChangeLog ace/Version.h");
+    system ("$cvs commit -m'$version' " .
+            "VERSION BUG-REPORT-FORM ChangeLog ace/Version.h " .
+            "&& chmod 0644 VERSION BUG-REPORT-FORM ChangeLog ace/Version.h");
   } elsif ($kit =~ /tao/) {
-    system ("$cvs commit -m'$version' VERSION ChangeLog " .
-            "&& chmod 0644 VERSION ChangeLog");
+    system ("$cvs commit -m'$version' VERSION BUG-REPORT-FORM ChangeLog " .
+            "&& chmod 0644 VERSION BUG-REPORT-FORM ChangeLog");
   }
   return 1 if $? >> 8;