summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README2
-rwxr-xr-xbin/h5vers25
-rwxr-xr-xbin/snapshot4
-rw-r--r--tools/testh5toh42
4 files changed, 29 insertions, 4 deletions
diff --git a/README b/README
index 1902f79..885747b 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is hdf5-1.1.106 released on Mon Jun 14 19:34:21 CDT 1999
+This is hdf5-1.1.107 currently under development
Please refer to the INSTALL file for installation instructions.
------------------------------------------------------------------------------
diff --git a/bin/h5vers b/bin/h5vers
index 6d30ffd..dac587d 100755
--- a/bin/h5vers
+++ b/bin/h5vers
@@ -36,6 +36,11 @@ require 5.003;
#
# If a file is specified then that file is used instead of
# ./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 file one
+# directory above the H5public.h file is also modified so it looks
+# something like: This is hdf5-1.2.3 currently under development.
##############################################################################
sub getvers {
@@ -108,13 +113,17 @@ while ($_ = shift) {
}
die "mutually exclusive options given\n" if $set && $inc;
-# Determine file to use
+# Determine file to use as H5public.h and README. The README file is
+# always in the directory above H5public.h
unless ($file) {
for (@files) {
($file=$_,last) if -f $_;
}
}
die "unable to read file: $file\n" unless -r $file;
+$README = $file;
+$README =~ s/[^\/]*$/..\/README/;
+die "unable to read file: $README\n" unless -r $file;
# Get the current version number.
open FILE, $file or die "unable to open $file: $!\n";
@@ -148,6 +157,8 @@ if ($set) {
} elsif ($inc) {
die "unknown increment field: $inc\n";
} else {
+ # Nothing to do but print result
+ $README = "";
@newver = @curver;
}
@@ -169,6 +180,18 @@ if ($newver[0]!=$curver[0] ||
close FILE;
}
+# Update the README file
+if ($README) {
+ open FILE, $README or die "$README: $!\n";
+ @contents = <FILE>;
+ close FILE;
+ $contents[0] = sprintf("This is hdf5-%d.%d.%d currently under development\n",
+ @newver);
+ open FILE, ">$README" or die "$README: $!\n";
+ print FILE @contents;
+ close FILE;
+}
+
# Print the new version number
if ($verbose) {
printf "version %d.%d release %d\n", @newver;
diff --git a/bin/snapshot b/bin/snapshot
index 105f9d2..680a44e 100755
--- a/bin/snapshot
+++ b/bin/snapshot
@@ -47,6 +47,7 @@ if [ -d ${COMPARE}/previous ]; then
snapshot=no
for src in `grep '^\.' ${COMPARE}/current/MANIFEST|expand|cut -f1 -d' '`; do
diff -I H5_VERS_RELEASE -I " released on " \
+ -I " currently under development" \
${COMPARE}/previous/$src ${COMPARE}/current/$src || \
snapshot=yes
# Don't break because we want to see all the diffs.
@@ -72,8 +73,9 @@ if [ "$snapshot" = "yes" ]; then
cd ${COMPARE}/current
cvs -Q tag hdf5-`perl -w bin/h5vers |tr . _`
bin/release -d $ARCHIVES $METHODS
+ RELEASE_VERSION="`perl -w bin/h5vers -v`"
perl -w bin/h5vers -i
- cvs -Q commit -m Snapshot
+ cvs -Q commit -m "Snapshot $RELEASE_VERSION"
)
fi
diff --git a/tools/testh5toh4 b/tools/testh5toh4
index 97586d7..0c66d89 100644
--- a/tools/testh5toh4
+++ b/tools/testh5toh4
@@ -139,7 +139,7 @@ CONVERT()
if [ $outfile = "tloop" -a $H4DUMPVER -lt 413 ]
then
- echo "*-SKIP-*"
+ echo " -SKIP-"
result="skipped"
touch $expect_out $actual_out # fake them
else