diff options
author | lrknox <lrknox> | 2016-08-29 21:42:53 (GMT) |
---|---|---|
committer | lrknox <lrknox> | 2016-08-30 17:17:31 (GMT) |
commit | fb3ebd7d393505f87b3d1d2a20d33a25ce181e7c (patch) | |
tree | 9fd71b0bc50af518595afe022a9202398c74b3f0 /bin | |
parent | e90a880864f7a2c765bce1a7648de0adb95230be (diff) | |
download | hdf5-fb3ebd7d393505f87b3d1d2a20d33a25ce181e7c.zip hdf5-fb3ebd7d393505f87b3d1d2a20d33a25ce181e7c.tar.gz hdf5-fb3ebd7d393505f87b3d1d2a20d33a25ce181e7c.tar.bz2 |
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.
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/bbrelease | 8 | ||||
-rwxr-xr-x | bin/chkmanifest | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/bin/bbrelease b/bin/bbrelease index 7dcb535..1fe7d38 100755 --- a/bin/bbrelease +++ b/bin/bbrelease @@ -260,9 +260,11 @@ if [ X$revmode = Xyes ]; then # Copy old version of config/lt_vers.am, since it's hard to # "undo" changes to it. cp config/lt_vers.am $tmpdir - branch=`svn info | grep ^URL: | awk -F/ '{print $NF}'` - revision=`svn info | grep "Revision:" | awk '{print $2}'` - # Set version information to m.n.r-r$revision. +#branch=`svn info | grep ^URL: | awk -F/ '{print $NF}'` +#revision=`svn info | grep "Revision:" | awk '{print $2}'` + branch=`git branch | awk '{print $2}'` + revision=`git rev-parse HEAD` +# Set version information to m.n.r-r$revision. # (h5vers does not correctly handle just m.n.r-$today.) VERS=`echo $VERS | sed -e s/-.*//`-r$revision echo Private release of $VERS diff --git a/bin/chkmanifest b/bin/chkmanifest index 2d31d87..f747dce 100755 --- a/bin/chkmanifest +++ b/bin/chkmanifest @@ -90,23 +90,22 @@ done # Get the list of files under version control and check that they are # present. # -# First get a list of all the pending files with svn stat and +# First get a list of all the pending files with git status and # check those. git_stat=`git status -s` for file in $git_stat; do - # Newly added files are not listed by svn ls, which + # Newly added files are not listed by git ls-files, which # we check later. # The line listing new files starts with 'A'. letter=`echo $file | head -c 1` if [ "$letter" = "A" ]; then - # Convert the seven Subversion status columns to './' so it matches + # Convert the git status columns to './' so it matches # the manifest file name. # # There is a space between the status columns and file name, hence - # the '8' instead of '7'. - # For git status -s it's 3 instead of 8. + # the '3'. path=`echo $file | sed 's/^.\{3\}/\.\//g'` # Ignore directories if [ ! -d $path ]; then @@ -120,9 +119,8 @@ for file in $git_stat; do fi done -# Next check svn ls, which gets a list of all files that are +# Next check git ls-files, which gets a list of all files that are # checked in. -##svn_ls=`svn ls -R` git_ls=`git ls-files` for file in $git_ls; do path="./${file}" |