ChangeLogTag: Tue Jul 11 10:40:48 2000 David L. Levine <levine@cs.wustl.edu>

4 files changed, 44 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 807a8fcb76e..1e9d1b8356e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Tue Jul 11 10:40:48 2000  David L. Levine  <levine@cs.wustl.edu>
+
+        * bin/make_release: robustness improvements:
+          1) set CVSROOT and ACE_ROOT environment variables, and $logname,
+             to reasonable default values if they were null.
+          2) Always prepend /project/danzon/pkg/gnu/bin to PATH.  Before,
+             -d was first used to check to see if it existed.  But, it
+             might not have been mounted, and -d won't cause it to automount.
+
 Tue Jul 11 08:24:33 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
 	* ace/POSIX_Asynch_IO.h,
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 807a8fcb76e..1e9d1b8356e 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,12 @@
+Tue Jul 11 10:40:48 2000  David L. Levine  <levine@cs.wustl.edu>
+
+        * bin/make_release: robustness improvements:
+          1) set CVSROOT and ACE_ROOT environment variables, and $logname,
+             to reasonable default values if they were null.
+          2) Always prepend /project/danzon/pkg/gnu/bin to PATH.  Before,
+             -d was first used to check to see if it existed.  But, it
+             might not have been mounted, and -d won't cause it to automount.
+
 Tue Jul 11 08:24:33 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
 	* ace/POSIX_Asynch_IO.h,
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 807a8fcb76e..1e9d1b8356e 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,12 @@
+Tue Jul 11 10:40:48 2000  David L. Levine  <levine@cs.wustl.edu>
+
+        * bin/make_release: robustness improvements:
+          1) set CVSROOT and ACE_ROOT environment variables, and $logname,
+             to reasonable default values if they were null.
+          2) Always prepend /project/danzon/pkg/gnu/bin to PATH.  Before,
+             -d was first used to check to see if it existed.  But, it
+             might not have been mounted, and -d won't cause it to automount.
+
 Tue Jul 11 08:24:33 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
 	* ace/POSIX_Asynch_IO.h,
diff --git a/bin/make_release b/bin/make_release
index 2d764e9b09c..99af114463a 100755
--- a/bin/make_release
+++ b/bin/make_release
@@ -45,6 +45,14 @@ unless ("$hostname" eq 'ace') {
   die "$0: must run on host ace\n";
 }
 
+if (! "$ENV{'CVSROOT'}") {
+  $ENV{'CVSROOT'} = '/project/cvs-repository';
+}
+
+if (! "$ENV{'ACE_ROOT'}") {
+  chop ($ENV{'ACE_ROOT'} = `/pkg/gnu/bin/pwd`);
+}
+
 
 ########
 ######## Configuration parameters.
@@ -59,15 +67,11 @@ if (-d '/pkg/gnu/bin') {
   $gnu = '';
 }
 
-my $gnu2;
-if (-d '/project/danzon/pkg/gnu/bin') {
-  $gnu2 = '/project/danzon/pkg/gnu/bin/';
-  #### Insert it at head of PATH, so that proper GNU utilities are used.
-  $ENV{'PATH'} = "/project/danzon/pkg/gnu/bin:" . $ENV{'PATH'};
-} else {
-  #### The default utilities had better be GNU.
-  $gnu2 = '';
-}
+#### Unconditionally insert this at the head of the path.  We're
+#### running on ace, so if it hadn't been automounted, -d might fail
+#### to find the directory.
+my $gnu2 = '/project/danzon/pkg/gnu/bin';
+$ENV{'PATH'} = "$gnu2" . ':' . $ENV{'PATH'};
 
 my $export_dir = '/project/ftp-doc/pub/ACE';
 my $diffs_dir = "$export_dir/diffs";
@@ -183,7 +187,7 @@ my $gzip = "${gnu}gzip";
 my $make = "${gnu}make -s";
 my $mv = '/bin/mv -f';
 my $rm = "${gnu}rm -f";
-my $md5sum = "${gnu2}md5sum";
+my $md5sum = "${gnu2}/md5sum";
 chop (my $now = `$date +"%a %b %d %T %Y"`);
 
 unless ("$controlled_files") {
@@ -523,6 +527,9 @@ sub update_version_files () {
 ########
 sub update_changelog () {
   my $logname = $ENV{'LOGNAME'};
+  if (! "$logname") {
+    chop ($logname = `/usr/ucb/whoami`);
+  }
   my $signature = $ENV{'SIGNATURE'} || $logname;
   my $message = "$now  $signature  <$logname\@cs.wustl.edu>\n\n" .
                 "        * $KIT version $version released.\n\n";