diff options
| -rwxr-xr-x | bin/h5vers | 23 | ||||
| -rwxr-xr-x | bin/release | 29 |
2 files changed, 25 insertions, 27 deletions
@@ -56,7 +56,7 @@ use strict; # ./H5public.h or ./src/H5public.h. # # If the version number is changed (either `-s' or `-i' was used on -# the command line) then the first line of the README and RELEASE.txt files +# the command line) then the first line of the README.txt and RELEASE.txt files # one directory above the H5public.h file is also modified so it looks # something like: This is hdf5-1.2.3-pre1 currently under development. ############################################################################## @@ -136,8 +136,9 @@ while ($_ = shift) { } die "mutually exclusive options given\n" if $set && $inc; -# Determine file to use as H5public.h, README and RELEASE.txt. -# The README and RELEASE.txt files are always in the directory above H5public.h +# Determine file to use as H5public.h, README.txt and release_docs/RELEASE.txt. +# The README.txt and release_docs/RELEASE.txt files are always in the +# directory above H5public.h unless ($file) { for (@files) { ($file=$_,last) if -f $_; @@ -145,13 +146,13 @@ unless ($file) { } die "unable to find source files\n" unless defined $file; die "unable to read file: $file\n" unless -r $file; -# README +# README.txt my $README = $file; -$README =~ s/[^\/]*$/..\/README/; +$README =~ s/[^\/]*$/..\/README.txt/; die "unable to read file: $README\n" unless -r $file; -# RELEASE.txt +# release_docs/RELEASE.txt my $RELEASE = $file; -$RELEASE =~ s/[^\/]*$/..\/RELEASE.txt/; +$RELEASE =~ s/[^\/]*$/..\/release_docs\/RELEASE.txt/; die "unable to read file: $RELEASE\n" unless -r $file; # Get the current version number. @@ -221,12 +222,12 @@ if ($newver[0]!=$curver[0] || close FILE; } -# Update the README file +# Update the README.txt file if ($README) { open FILE, $README or die "$README: $!\n"; my @contents = <FILE>; close FILE; - $contents[0] = sprintf("This is hdf5-%d.%d.%d%s %s", + $contents[0] = sprintf("HDF5 version %d.%d.%d%s %s", @newver[0,1,2], $newver[3] eq "" ? "" : "-".$newver[3], "currently under development\n"); @@ -235,12 +236,12 @@ if ($README) { close FILE; } -# Update the RELEASE.txt file +# Update the release_docs/RELEASE.txt file if ($RELEASE) { open FILE, $RELEASE or die "$RELEASE: $!\n"; my @contents = <FILE>; close FILE; - $contents[0] = sprintf("HDF5 library version %d.%d.%d%s %s", + $contents[0] = sprintf("HDF5 version %d.%d.%d%s %s", @newver[0,1,2], $newver[3] eq "" ? "" : "-".$newver[3], "currently under development\n"); diff --git a/bin/release b/bin/release index e5d61c9..20e84a5 100755 --- a/bin/release +++ b/bin/release @@ -100,19 +100,17 @@ ln -s `pwd` ../hdf5-$VERS || exit 1 mv Makefile ../Makefile.x 2>/dev/null #might fail cp -p Makefile.dist Makefile -# Update some files with release information. -# Make sure new files are of the right access mode -umask 0133 -# update README -echo "This is hdf5-$VERS released on `date`" >README.x -tail +2l README >>README.x -mv README.x README -# update RELEASE.txt -echo "HDF5 version $VERS released on `date`" >RELEASE.x -tail +2l RELEASE.txt >>RELEASE.x -mv RELEASE.x RELEASE.txt -# synchronize the HISTORY and RELEASE files in the doc area -cp HISTORY.txt RELEASE.txt doc/html/ADGuide/. +# Update README.txt and release_docs/RELEASE.txt with release information. +for f in README.txt release_docs/RELEASE.txt; do + echo "HDF5 version $VERS released on `date`" >$f.x + tail +2l $f >>$f.x + mv $f.x $f + # Make sure new files are of the right access mode + chmod 644 $f +done + +# synchronize the HISTORY.tx and RELEASE.tx files in the doc area +cp release_docs/HISTORY.txt release_docs/RELEASE.txt doc/html/ADGuide/. # Create the tar file test "$verbose" && echo " Running tar..." 1>&2 @@ -139,9 +137,8 @@ for comp in $methods; do esac done -# Copy the RELEASE.txt to the release area. Make it ended with -# .txt to ensure easy display via web. -cp RELEASE.txt $DEST/hdf5-$VERS-RELEASE.txt +# Copy the RELEASE.txt to the release area. +cp release_docs/RELEASE.txt $DEST/hdf5-$VERS-RELEASE.txt # Remove temporary things test -f ../Makefile.x && mv ../Makefile.x Makefile |