ChangeLogTag:Tue Aug 24 16:23:07 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

2 files changed, 33 insertions, 7 deletions

diff --git a/ChangeLog-99b b/ChangeLog-99b
index 25dc40a7907..013170d3fc3 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,3 +1,11 @@
+Tue Aug 24 16:23:07 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+	* bin/make_release:
+	  Use an explicit temporary file to create the ChangeLog, i had
+	  some problems with the previous scheme, but it could be my
+	  shell.
+	  When tagging TAO we have to change directories.
+
 Tue Aug 24 12:19:29 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
 	* tests/Makefile:
diff --git a/bin/make_release b/bin/make_release
index e9ad848bb6c..e08a26209dd 100755
--- a/bin/make_release
+++ b/bin/make_release
@@ -478,15 +478,27 @@ sub update_version_files () {
 sub update_changelog () {
   my $logname = $ENV{'LOGNAME'};
   my $signature = $ENV{'SIGNATURE'} || $logname;
-  my $message = "$now  $signature  <$logname\\\@cs.wustl.edu>\n\n" .
+  my $message = "$now  $signature  <$logname\@cs.wustl.edu>\n\n" .
                 "        * $KIT version $version released.\n\n";
 
-  &ex ("perl -pi -e 'BEGIN {\$message_printed = 0;} " .
-                     "if (! \$message_printed) { " .
-                       "print \"$message\"; " .
-                       "++\$message_printed; " .
-                     "}' ChangeLog");
-  return 1 if $? >> 8;
+  if ("$exec_prefix") {
+    print "Adding to ChangeLog: \n", $message, "\n";
+    return 0;
+  }
+  open (NEW_CHANGELOG, ">ChangeLog.bak")
+    || return 1;
+  open (CHANGELOG, "ChangeLog")
+    || return 1;
+  print NEW_CHANGELOG $message;
+  while (<CHANGELOG>) {
+    print NEW_CHANGELOG $_;
+  }
+  close (CHANGELOG)
+    || return 1;
+  close (NEW_CHANGELOG)
+    || return 1;
+  rename "ChangeLog.bak", "ChangeLog"
+    || return 1;
 
   my $version_h = $kit =~ /^ace/  ?  'ace/Version.h'  :  'tao/Version.h';
 
@@ -508,7 +520,13 @@ sub tag () {
   $tag =~ tr/./_/;
 
   print "start tagging $tag\n";
+  if ($KIT eq "TAO") {
+    chdir "..";
+  }
   &ex ("$cvs -q tag $tag $controlled_files > /dev/null");
+  if ($KIT eq "TAO") {
+    chdir "TAO";
+  }
   return 1 if $? >> 8;
   print "finished tagging $tag\n";