Merge pull request #1106 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:1.8/master to 1.8/masterhdf5-1_8_21

* commit '664186b91d9198915baca4c6dca3f7b03695d316': (124 commits)
  Commit HDF5 1.8.21 release version strings.
  Update INSTALL and INSTALL_parallel files to remove references to ancient systems and add generic steps for building HDF5 on HPC clusters.
  Update various INSTALL files for 1.8.21 release.
  Add missing space and correct typo.
  Modified a section for newly supported systems and compilers (vs. 1.8.20 release); Brought edits for tools bug fixes from 1.10.2 RELEASE.txt as we agreed with Allen.
  It is my test under Larry's guidance.
  Remove build directory which was unintentionally committed.
  Updated MANIFEST
  Switch default build mode to production. Update version to 1.8.21 in anticipation of release.
  Fixed EED-319 Description:     Added an html version for the C++ function mapping table and removed     the single web page version.     Updated cpp_doc_config to use the html file.     Fixed some typos.     Running "doxygen cpp_doc_config" successfully.
  HDFFV-10473 fix HDFFV-10398 attribute location
  Add missing C++ entries to RELEASE.txt.
  pre1 release.
  Add missing RELEASE.txt entries for C++.
  Update Windows test machines
  Fix soversion naming and update cmake scripts
  Update version in RELEASE.txt. Correct merge errors from hdf5_1_8.
  Fixed typos
  Fixed typos
  Fixed typos
  ...

1 files changed, 43 insertions, 31 deletions

diff --git a/bin/release b/bin/release
index cb7a2fe..3f75a00 100755
--- a/bin/release
+++ b/bin/release
@@ -188,46 +188,46 @@ tar2zip()
 # Returns 0 if successful; 1 otherwise
 #
  # need function to create another temporary directory, extract the
-            
+            # $tmpdir/$HDF5_VERS.tar into it, add (create) build-unix.sh,
             # CTestScript.cmake, HDF5config.cmake, SZIP.tar.gz and ZLib.tar.gz,
              # and then tar.gz it.
 tar2cmakezip()
 {
     if [ $# -ne 3 ]; then
-	echo "usage: tar2cmakezip <tarfilename> <zipfilename>"
+	echo "usage: tar2cmakezip <tarfilename> <tgzfilename>"
 	return 1
     fi
-    cmziptmpdir=/tmp/cmziptmpdir
-    cmziptmpsubdir=$cmziptmpdir/CMake-$HDF5_VERS
-    mkdir -p $cmziptmpsubdir
+    cmziptmpdir=/tmp/cmziptmpdir$$
+    mkdir -p $cmziptmpdir
     version=$1
     tarfile=$2
     zipfile=$3
 
     # step 1: untar tarball in cmgztmpdir
-    (cd $cmziptmpsubdir; tar xf -) < $tarfile
+    (cd $cmziptmpdir; tar xf -) < $tarfile
     # sanity check
-    if [ ! -d $cmziptmpsubdir/$version ]; then
-	echo "untar did not create $cmziptmpsubdir/$version source dir"
+    if [ ! -d $cmziptmpdir/$version ]; then
+	echo "untar did not create $cmziptmpdir/$version source dir"
 	# cleanup
 	rm -rf $cmziptmpdir
 	return 1
     fi
 
-    # step 2: add batch file for building CMake on window
-    (cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS2012 -C Release -V -O hdf5.log" > build-VS2012-32.bat; chmod 755 build-VS2012-32.bat)
-    (cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201264 -C Release -V -O hdf5.log" > build-VS2012-64.bat; chmod 755 build-VS2012-64.bat)
-    (cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS2013 -C Release -V -O hdf5.log" > build-VS2013-32.bat; chmod 755 build-VS2013-32.bat)
-    (cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201364 -C Release -V -O hdf5.log" > build-VS2013-64.bat; chmod 755 build-VS2013-64.bat)
-    (cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS2015 -C Release -V -O hdf5.log" > build-VS2015-32.bat; chmod 755 build-VS2015-32.bat)
-    (cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201564 -C Release -V -O hdf5.log" > build-VS2015-64.bat; chmod 755 build-VS2015-32.bat)
+    # step 2: add batch files for building CMake on windows
+    cp /mnt/scr1/pre-release/hdf5/CMake/HDF5_1_10/build-VS2013-32.bat $cmziptmpdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/HDF5_1_10/build-VS2013-64.bat $cmziptmpdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/HDF5_1_10/build-VS2015-32.bat $cmziptmpdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/HDF5_1_10/build-VS2015-64.bat $cmziptmpdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/HDF5_1_10/build-VS2017-32.bat $cmziptmpdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/HDF5_1_10/build-VS2017-64.bat $cmziptmpdir
 
     # step 3: add SZIP.tar.gz, ZLib.tar.gz and cmake files
-    cp /mnt/scr1/pre-release/hdf5/CMake/SZip.tar.gz $cmziptmpsubdir
-    cp /mnt/scr1/pre-release/hdf5/CMake/ZLib.tar.gz $cmziptmpsubdir
-    cp $cmziptmpsubdir/$version/config/cmake/scripts/CTestScript.cmake $cmziptmpsubdir
-    cp $cmziptmpsubdir/$version/config/cmake/scripts/HDF5config.cmake $cmziptmpsubdir
-    cp $cmziptmpsubdir/$version/config/cmake/scripts/HDF5options.cmake $cmziptmpsubdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/SZip.tar.gz $cmziptmpdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/ZLib.tar.gz $cmziptmpdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-1.10.7-Source.tar.gz $cmziptmpdir
+    cp $cmziptmpdir/$version/config/cmake/scripts/CTestScript.cmake $cmziptmpdir
+    cp $cmziptmpdir/$version/config/cmake/scripts/HDF5config.cmake $cmziptmpdir
+    cp $cmziptmpdir/$version/config/cmake/scripts/HDF5options.cmake $cmziptmpdir
 
     # step 4: convert text files
     # There maybe a simpler way to do this.
@@ -235,12 +235,16 @@ tar2cmakezip()
     # -k   Keep the date stamp 
     # -q   quiet mode
     # grep redirect output to /dev/null because -q or -s are not portable.
-    find $cmziptmpsubdir/$version | \
+    find $cmziptmpdir/$version | \
 	while read inf; do \
 	    if file $inf | grep "$inf\: .*text" > /dev/null 2>&1 ; then \
 		unix2dos -q -k $inf; \
 	    fi\
 	done
+
+    
+    mkdir $cmziptmpdir/CMake-$HDF5_VERS
+    mv $cmziptmpdir/* $cmziptmpdir/CMake-$HDF5_VERS
     # step 3: make zipball
     # -9 maximum compression
     # -y Store symbolic links as such in the zip archive
@@ -295,16 +299,15 @@ tar2cmaketgz()
 	return 1
     fi
     cmgztmpdir=/tmp/cmgztmpdir$$
-    cmgztmpsubdir=$cmgztmpdir/CMake-$HDF5_VERS
-    mkdir -p $cmgztmpsubdir
+    mkdir -p $cmgztmpdir
     version=$1
     tarfile=$2
     tgzfile=$3
 
     # step 1: untar tarball in cmgztmpdir
-    (cd $cmgztmpsubdir; tar xf -) < $tarfile
+    (cd $cmgztmpdir; tar xf -) < $tarfile
     # sanity check
-    if [ ! -d $cmgztmpsubdir/$version ]; then
+    if [ ! -d $cmgztmpdir/$version ]; then
 	echo "untar did not create $cmgztmpdir/$version source dir"
 	# cleanup
 	rm -rf $cmgztmpdir
@@ -313,14 +316,17 @@ tar2cmaketgz()
 
 
     # step 2: add build-unix.sh script
-    (cd $cmgztmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=Unix -C Release -V -O hdf5.log" > build-unix.sh; chmod 755 build-unix.sh)
+    (cd $cmgztmpdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=Unix -C Release -V -O hdf5.log" > build-unix.sh; chmod 755 build-unix.sh)
 
     # step 3: add SZIP.tar.gz, ZLib.tar.gz and cmake files
-    cp /mnt/scr1/pre-release/hdf5/CMake/SZip.tar.gz $cmgztmpsubdir
-    cp /mnt/scr1/pre-release/hdf5/CMake/ZLib.tar.gz $cmgztmpsubdir
-    cp $cmgztmpsubdir/$version/config/cmake/scripts/CTestScript.cmake $cmgztmpsubdir
-    cp $cmgztmpsubdir/$version/config/cmake/scripts/HDF5config.cmake $cmgztmpsubdir
-    cp $cmgztmpsubdir/$version/config/cmake/scripts/HDF5options.cmake $cmgztmpsubdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/SZip.tar.gz $cmgztmpdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/ZLib.tar.gz $cmgztmpdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-1.10.7-Source.tar.gz $cmgztmpdir
+    cp $cmgztmpdir/$version/config/cmake/scripts/CTestScript.cmake $cmgztmpdir
+    cp $cmgztmpdir/$version/config/cmake/scripts/HDF5config.cmake $cmgztmpdir
+    cp $cmgztmpdir/$version/config/cmake/scripts/HDF5options.cmake $cmgztmpdir
+    mkdir $cmgztmpdir/CMake-$HDF5_VERS
+    mv $cmgztmpdir/* $cmgztmpdir/CMake-$HDF5_VERS
     tar czf $DEST/CMake-$HDF5_VERS.tar.gz -C $cmgztmpdir . || exit 1 
                  
     # cleanup
@@ -447,6 +453,12 @@ fi
 bin/chkmanifest || fail=yes
 if [ "X$fail" = "Xyes" ]; then
     if [ $check = yes ]; then
+        echo ""
+        echo "Note!  If you are running bin/release in a development branch"
+        echo "later than v 1.8 the MANIFEST check is expected to fail when"
+        echo "autogen.sh has not been run successfully. Either run autogen.sh " 
+        echo "with /usr/hdf/bin/AUTOTOOLS at the beginning of PATH or add the"
+        echo "--nocheck argument to the bin/release command."
         exit 1
     else
 	echo "Continuing anyway..."