mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-27 02:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_8 to hdf5_1_8

Browse Source 
* commit '5aee5213190f145b5a734f5dc76a67c82f7d6b82':
  emoved .gitattributes and .gitignore, as the manual migration did not create them. Corrected bbrelease script  to create new release version with revision hash.
  Translate svn commands to git commands for chkmanifest and bbrelease scripts with source in git repository. Removed the -p option from the command to run autogen.sh.  It interfered with running chkmanifest on a machine with the correct autotools versions but without access to /usr/hdf/bin/AUTOTOOLS.  The autogen.sh script says the option is for HDF group use only and is likely to be removed.  The same effect can be achieved by adding /usr/hdf/bin/AUTOTOOLS to the beginning of PATH.
  Removed the -p option from the command to run autogen.sh.  It interfered with running chkmanifest on a machine with the correct autotools versions but without access to /usr/hdf/bin/AUTOTOOLS.  The autogen.sh script says the option is for HDF group use only and is likely to be removed.  The same effect can be achieved by adding /usr/hdf/bin/AUTOTOOLS to the beginning of PATH.
This commit is contained in:
Larry Knox 2016-08-30 17:11:45 -05:00 committed by lrknox
parent b368f0de8d
commit 5372b04bab
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bin/bbrelease
View File

@ -33,6 +33,15 @@
# #
# James Laird, 2005-09-07 # James Laird, 2005-09-07
# Added the md5 method. # Added the md5 method.
#
# Larry Knox, 2016-08-30
# Added the --revision option to create private releases with the
# code revision hash in the version strings. Currently the version
# of this script with the --revision option is named bbrelease. It
# can probably be merged into the original release script in the
# future.
# Commands to get the revision hash have now been converted to git
# to match the source repository change.
# Function definitions # Function definitions
# #
@ -265,19 +274,18 @@ fi
if [ X$revmode = Xyes ]; then if [ X$revmode = Xyes ]; then
VERS_OLD=$VERS VERS_OLD=$VERS
echo "Save old version $VERS_OLD for restoration later."
# Copy old version of config/lt_vers.am, since it's hard to # Copy old version of config/lt_vers.am, since it's hard to
# "undo" changes to it. # "undo" changes to it.
cp config/lt_vers.am $tmpdir cp config/lt_vers.am $tmpdir
#branch=`svn info | grep ^URL: | awk -F/ '{print $NF}'` branch=`git branch | grep '*' | awk '{print $NF}'`
#revision=`svn info | grep "Revision:" | awk '{print $2}'`
branch=`git branch | awk '{print $2}'`
revision=`git rev-parse HEAD` revision=`git rev-parse HEAD`
# Set version information to m.n.r-r$revision. # Set version information to m.n.r-r$revision.
# (h5vers does not correctly handle just m.n.r-$today.) # (h5vers does not correctly handle just m.n.r-$today.)
VERS=`echo $VERS | sed -e s/-.*//`-r$revision VERS=`echo $VERS | sed -e s/-.*//`-$revision
echo Private release of $VERS echo Private release of $VERS
bin/h5vers -s $VERS bin/h5vers -s $VERS
HDF5_VERS=hdf5-$branch-r$revision HDF5_VERS=hdf5-$branch-$revision
# use a generic directory name for revision releases # use a generic directory name for revision releases
HDF5_IN_VERS=hdfsrc HDF5_IN_VERS=hdfsrc
else else
@ -394,6 +402,7 @@ test -f $tmpdir/Makefile.x && mv $tmpdir/Makefile.x Makefile
# Restore OLD version information, then no need for trap. # Restore OLD version information, then no need for trap.
if [ X$pmode = Xyes ] || [ X$revmode = Xyes ]; then if [ X$pmode = Xyes ] || [ X$revmode = Xyes ]; then
echo "Restore the original version $VERS_OLD"
RESTORE_VERSION RESTORE_VERSION
trap 0 trap 0
fi fi