[svn-r27819] bbrelease is a modified copy of the release script, which checks for the "configure" file to verify that it is in the top level HDF5 directory. bbrelease creates a tar file for buildbot testing, and since configure is no longer checked in, the script failed. configure.ac should always be present in the top level source directory, even before running autogen.sh, so it should be a workable substitute for the verification.

Tested with h5committest.

1 files changed, 9 insertions, 1 deletions

diff --git a/bin/bbrelease b/bin/bbrelease
index 1e3b88d..3101ae1 100755
--- a/bin/bbrelease
+++ b/bin/bbrelease
@@ -156,7 +156,15 @@ tar2zip()
 
 # This command must be run at the top level of the hdf5 source directory.
 # Verify this requirement.
-if [ ! \( -f configure -a -f bin/release \) ]; then
+# Since we are running bbrelease to create an HDF5 source tarfile for buildbot
+# testing with source that is not for release, there is not a file named
+# "configure" but there will be one named "configure.ac".  The "configure"
+# file will be created when autogen.sh runs. There probably will always
+# be a bin/release file, but just in case it is removed, we can check for 
+# this script, bbrelease, in the bin directory.  The bin/release script should
+# continue to check for "configure" because it should be present in release 
+# source.
+if [ ! \( -f configure.ac -a -f bin/bbrelease \) ]; then
     echo "$0 must be run at the top level of the hdf5 source directory"
     exit 1
 fi