diff options
Diffstat (limited to 'bin/release')
| -rwxr-xr-x | bin/release | 72 |
1 files changed, 42 insertions, 30 deletions
diff --git a/bin/release b/bin/release index 6b4aab7..3f75a00 100755 --- a/bin/release +++ b/bin/release @@ -197,37 +197,37 @@ tar2cmakezip() echo "usage: tar2cmakezip <tarfilename> <tgzfilename>" return 1 fi + cmziptmpdir=/tmp/cmziptmpdir$$ + mkdir -p $cmziptmpdir version=$1 tarfile=$2 zipfile=$3 - cmziptmpdir=/tmp/cmziptmpdir$$ - mkdir -p $cmziptmpdir/CMake-$version - # step 1: untar tarball in cmgztmpdir - (cd $cmziptmpdir/CMake-$version; tar xf -) < $tarfile + (cd $cmziptmpdir; tar xf -) < $tarfile # sanity check - if [ ! -d $cmziptmpdir/CMake-$version/$version ]; then - echo "untar did not create $cmziptmpdir/CMake-$version/$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 - cp /mnt/scr1/pre-release/hdf5/CMake/HDF5_1_10/build-VS2012-32.bat $cmziptmpdir/CMake-$version - cp /mnt/scr1/pre-release/hdf5/CMake/HDF5_1_10/build-VS2012-64.bat $cmziptmpdir/CMake-$version - cp /mnt/scr1/pre-release/hdf5/CMake/HDF5_1_10/build-VS2013-32.bat $cmziptmpdir/CMake-$version - cp /mnt/scr1/pre-release/hdf5/CMake/HDF5_1_10/build-VS2013-64.bat $cmziptmpdir/CMake-$version - cp /mnt/scr1/pre-release/hdf5/CMake/HDF5_1_10/build-VS2015-32.bat $cmziptmpdir/CMake-$version - cp /mnt/scr1/pre-release/hdf5/CMake/HDF5_1_10/build-VS2015-64.bat $cmziptmpdir/CMake-$version + # 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/HDF5_1_10/SZip.tar.gz $cmziptmpdir/CMake-$version - cp /mnt/scr1/pre-release/hdf5/CMake/HDF5_1_10/ZLib.tar.gz $cmziptmpdir/CMake-$version - cp $cmziptmpdir/CMake-$version/$version/config/cmake/scripts/CTestScript.cmake $cmziptmpdir/CMake-$version - cp $cmziptmpdir/CMake-$version/$version/config/cmake/scripts/HDF5config.cmake $cmziptmpdir/CMake-$version - cp $cmziptmpdir/CMake-$version/$version/config/cmake/scripts/HDF5options.cmake $cmziptmpdir/CMake-$version + 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 $cmziptmpdir/CMake-$version/$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 @@ -294,17 +298,16 @@ tar2cmaketgz() echo "usage: tar2cmaketgz <tarfilename> <tgzfilename>" return 1 fi + cmgztmpdir=/tmp/cmgztmpdir$$ + mkdir -p $cmgztmpdir version=$1 tarfile=$2 tgzfile=$3 - cmgztmpdir=/tmp/cmgztmpdir$$ - mkdir -p $cmgztmpdir/CMake-$version - # step 1: untar tarball in cmgztmpdir - (cd $cmgztmpdir/CMake-$version; tar xf -) < $tarfile + (cd $cmgztmpdir; tar xf -) < $tarfile # sanity check - if [ ! -d $cmgztmpdir/CMake-$version/$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 $cmgztmpdir/CMake-$version; 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 $cmgztmpdir/CMake-$version - cp /mnt/scr1/pre-release/hdf5/CMake/ZLib.tar.gz $cmgztmpdir/CMake-$version - cp $cmgztmpdir/CMake-$version/$version/config/cmake/scripts/CTestScript.cmake $cmgztmpdir/CMake-$version - cp $cmgztmpdir/CMake-$version/$version/config/cmake/scripts/HDF5config.cmake $cmgztmpdir/CMake-$version - cp $cmgztmpdir/CMake-$version/$version/config/cmake/scripts/HDF5options.cmake $cmgztmpdir/CMake-$version + 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..." |