(check_workspace): use cvs checkout instead of update, to reveal new directories that have been added. Filter ^U from checkout output, so that release need not be based on the latest repository versions.

1 files changed, 28 insertions, 14 deletions

diff --git a/bin/make_release b/bin/make_release
index 8568400b3f6..47a5de7e2cf 100755
--- a/bin/make_release
+++ b/bin/make_release
@@ -158,21 +158,35 @@ sub cleanup {
 ######## the official release directory.
 ########
 sub check_workspace () {
-  if ("$controlled_files") {
-    my @out_of_date = ();
-    open (CVS, "$cvs -nq update $controlled_files |")  ||
-      die "$0: unable to open $cvs\n";
-    while (<CVS>) {
-      next if m%/tests/log/%;
-      push (@out_of_date, $_) if "$_";
-    }
-    close CVS;
+  my $module;
 
-    if (! "$exec_prefix"  &&  @out_of_date) {
-      warn "ERROR: workspace must be updated or cleaned:\n  " .
-           join ("\n  ", @out_of_date) . "\n";
-      return 1;
-    }
+  if ($kit =~ /^ace/) {
+    chdir '..'  ||  die "$0: unable to chdir ..\n";
+    $module = 'ACE_wrappers';
+  } elsif ($kit =~ /tao/) {
+    chdir '../..'  ||  die "$0: unable to chdir ../..\n";
+    $module = 'ACE_wrappers/TAO';
+  }
+
+  my @out_of_date = ();
+  open (CVS, "$cvs -nq checkout $module |")  ||
+    die "$0: unable to open $cvs\n";
+  while (<CVS>) {
+    next if m%^U %;    #### Allow others to update the repository.
+    push (@out_of_date, $_) if "$_";
+  }
+  close CVS;
+
+  if ($kit =~ /^ace/) {
+    chdir 'ACE_wrappers'  ||  die "$0: unable to chdir ACE_wrappers\n";
+  } elsif ($kit =~ /tao/) {
+    chdir 'ACE_wrappers/TAO'  ||  die "$0: unable to chdir ACE_wrappers/TAO\n";
+  }
+
+  if (! "$exec_prefix"  &&  @out_of_date) {
+    warn "ERROR: workspace must be updated or cleaned:\n  " .
+         join ("\n  ", @out_of_date) . "\n";
+    return 1;
   }
 
   0;