summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlrknox <lrknox>2017-10-26 21:36:21 (GMT)
committerlrknox <lrknox>2017-10-26 21:36:21 (GMT)
commitb752960f56845f737d0e54cf257474d924fd2f0c (patch)
tree57ad75a321f71caf56f51d94d45436e3ec708a43
parente92f3f858bf16a84c59aeb6692f5cab5e6b8e66f (diff)
downloadhdf5-b752960f56845f737d0e54cf257474d924fd2f0c.zip
hdf5-b752960f56845f737d0e54cf257474d924fd2f0c.tar.gz
hdf5-b752960f56845f737d0e54cf257474d924fd2f0c.tar.bz2
Remove extra spaces and 1 "currently under development" to match hdf5_1_10
version.
-rwxr-xr-xbin/h5vers10
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/h5vers b/bin/h5vers
index 5228903..a00beb7 100755
--- a/bin/h5vers
+++ b/bin/h5vers
@@ -198,7 +198,7 @@ my $H5_JAVA = $file;
$H5_JAVA =~ s/[^\/]*$/..\/java\/src\/hdf\/hdf5lib\/H5.java/;
die "unable to read file: $H5_JAVA\n" unless -r $file;
my $TESTH5_JAVA = $file;
-$TESTH5_JAVA =~ s/[^\/]*$/..\/java\/test\/TestH5.java/;
+$TESTH5_JAVA =~ s/[^\/]*$/..\/java\/test\/TestH5.java/;
die "unable to read file: $TESTH5_JAVA\n" unless -r $file;
my $REPACK_LAYOUT_PLUGIN_VERSION = $file;
$REPACK_LAYOUT_PLUGIN_VERSION =~ s/[^\/]*$/..\/tools\/test\/h5repack\/testfiles\/h5repack_layout.h5-plugin_version_test.ddl/;
@@ -354,7 +354,7 @@ if ($HDF5CONFIGCMAKE) {
my $sub_rel_ver_str = (
$newver[3] eq ""
? sprintf("\"%s\"", "")
- : sprintf("\"%s\"", "-".$newver[3].", currently under development")
+ : sprintf("\"%s\"", "-".$newver[3])
);
my $version_string = sprintf("\"%d.%d.%d\"", @newver[0,1,2]);
@@ -377,7 +377,7 @@ if ($H5_JAVA) {
my $version_string2 = sprintf("%d, %d, %d", @newver[0,1,2]);
$data =~ s/\@version HDF5 .* <BR>/\@version HDF5 $version_string1 <BR>/;
- $data =~ s/ public final static int LIB_VERSION\[\] = { \d*, \d*, \d* };/ public final static int LIB_VERSION[] = { $version_string2 };/;
+ $data =~ s/ public final static int LIB_VERSION\[\] = { \d*, \d*, \d* };/ public final static int LIB_VERSION[] = { $version_string2 };/;
write_file($H5_JAVA, $data);
}
@@ -395,7 +395,7 @@ if ($TESTH5_JAVA) {
my $version_string2 = sprintf("int majnum = %d, minnum = %d, relnum = %d", @newver[0,1,2]);
$data =~ s/ int libversion\[\] = { .* };/ int libversion\[\] = { $version_string1 };/;
- $data =~ s/ int majnum = \d*, minnum = \d*, relnum = \d*;/ $version_string2;/;
+ $data =~ s/ int majnum = \d*, minnum = \d*, relnum = \d*;/ $version_string2;/;
write_file($TESTH5_JAVA, $data);
}
@@ -410,7 +410,7 @@ if ($REPACK_LAYOUT_PLUGIN_VERSION) {
write_file($REPACK_LAYOUT_PLUGIN_VERSION, $data);
}
-# helper function to read the file for updating c++/src/cpp_doc_config,
+# helper function to read the file for updating c++/src/cpp_doc_config,
# config/cmake/scripts/HDF5Config.cmake, and java files.
# The version string in that file is not at the top, so the string replacement
# is not for the first line, and reading/writing the entire file as one string