[svn-r26350] Merge of r26273-26348 from the trunk.

Tested on: h5committest

3 files changed, 10 insertions, 15 deletions

diff --git a/bin/chkmanifest b/bin/chkmanifest
index 6188eab..8abd8ea 100755
--- a/bin/chkmanifest
+++ b/bin/chkmanifest
@@ -86,15 +86,18 @@ for file in $svn_stat; do
     # The line listing them starts with 'A'.
     letter="$(echo $file | head -c 1)"
     if [ "$letter" = "A" ]; then
-        # Convert 'A     ' to './' so it matches
+        # Convert the seven Subversion status columns to './' so it matches
         # the manifest file name.
-        path=`echo $file | sed 's/^A\s*/\.\//g'`
+        #
+        # There is a space between the status columns and file name, hence
+        # the '8' instead of '7'.
+        path=`echo $file | sed 's/^.\{8\}/\.\//g'`
         # Ignore directories
         if [ ! -d $path ]; then
             if (grep ^$path$ $MANIFEST >/dev/null); then
                 :
             else
-                echo "+ $path"
+                echo "- $path"
                 fail=yes
             fi
         fi
diff --git a/bin/h5vers b/bin/h5vers
index 475ff5a..cb4b9e0 100755
--- a/bin/h5vers
+++ b/bin/h5vers
@@ -159,10 +159,10 @@ while ($_ = shift) {
 die "mutually exclusive options given\n" if $set && $inc;
 
 # Determine file to use as H5public.h, README.txt,
-# release_docs/RELEASE.txt, configure.ac, windows/src/H5pubconf.h,
-# vms/src/h5pubconf.h and config/lt_vers.am. 
+# release_docs/RELEASE.txt, configure.ac, windows/src/H5pubconf.h
+# and config/lt_vers.am. 
 # The README.txt, release_docs/RELEASE.txt, configure.ac, 
-# vms/src/h5pubconf.h, windows/src/H5pubconf.h, and config/lt_vers.am 
+# windows/src/H5pubconf.h, and config/lt_vers.am 
 # files are always in the directory above H5public.h
 unless ($file) {
   for (@files) {
@@ -187,10 +187,6 @@ die "unable to read file: $RELEASE\n" unless -r $file;
 my $CONFIGURE = $file;
 $CONFIGURE =~ s/[^\/]*$/..\/configure.ac/;
 die "unable to read file: $CONFIGURE\n" unless -r $file;
-# vms/src/h5pubconf.h
-my $H5VMSPUBCONF = $file;
-$H5VMSPUBCONF =~ s/[^\/]*$/..\/vms\/src\/h5pubconf.h/;
-die "unable to read file: $H5VMSPUBCONF\n" unless -r $file;
 
 # Get the current version number.
 open FILE, $file or die "unable to open $file: $!\n";
@@ -238,7 +234,6 @@ if ($set) {
   $README = "";
   $RELEASE = "";
   $CONFIGURE = "";
-  $H5VMSPUBCONF = "";
   $LT_VERS = "";
   @newver = @curver;
 }
@@ -387,9 +382,6 @@ sub gen_h5pubconf {
     close FILE;
 }
 
-# Update the VMS-maintained h5pubconf.h file
-gen_h5pubconf("HDF5", $H5VMSPUBCONF, @newver) if $H5VMSPUBCONF;
-    
 # Print the new version number
 if ($verbose) {
   printf("version %d.%d release %d%s\n", @newver[0,1,2],
diff --git a/bin/trace b/bin/trace
index 5d5c5be..2823982 100755
--- a/bin/trace
+++ b/bin/trace
@@ -285,7 +285,7 @@ sub rewrite_func ($$$$$) {
     # Ignored due to NO TRACE comment.
   } elsif ($body =~ s/((\n[ \t]*)H5TRACE\d+\s*\(.*?\);)\n/"$2$trace"/es) {
     # Replaced an H5TRACE macro.
-  } elsif ($body=~s/((\n[ \t]*)FUNC_ENTER\w*\s*\(.*?\);??)\n/"$1$2$trace"/es) {
+  } elsif ($body=~s/((\n[ \t]*)FUNC_ENTER\w*\s*(\(.*?\))?;??)\n/"$1$2$trace"/es) {
     # Added an H5TRACE macro after a FUNC_ENTER macro.
   } else {
     errmesg $file, $name, "unable to insert tracing information";