summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorlrknox <lrknox>2017-03-21 15:57:40 (GMT)
committerlrknox <lrknox>2017-03-21 15:57:40 (GMT)
commit7e7121fec6a7ac5ef96d2a420e3c5302da60dfc9 (patch)
tree0f5dc5d302c9c28a3d667af9b082a360b373abd3 /bin
parentdbff1180b763ae41c4ac6aba6a1ca8c782713f4a (diff)
downloadhdf5-7e7121fec6a7ac5ef96d2a420e3c5302da60dfc9.zip
hdf5-7e7121fec6a7ac5ef96d2a420e3c5302da60dfc9.tar.gz
hdf5-7e7121fec6a7ac5ef96d2a420e3c5302da60dfc9.tar.bz2
Remove incorrect " marks added to java files by bin/h5vers.
Pull version from configure for version test in h5repack_plugin.sh.in
Diffstat (limited to 'bin')
-rwxr-xr-xbin/h5vers12
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/h5vers b/bin/h5vers
index a72895c..efa97b1 100755
--- a/bin/h5vers
+++ b/bin/h5vers
@@ -366,7 +366,7 @@ if ($HDF5CONFIGCMAKE) {
write_file($HDF5CONFIGCMAKE, $data);
}
-# Update the java/src/hdf/hdflib/H5.java file
+# Update the java/src/hdf/hdf5lib/H5.java file
if ($H5_JAVA) {
my $data = read_file($H5_JAVA);
# my $sub_rel_ver_str = "";
@@ -375,10 +375,10 @@ if ($H5_JAVA) {
? sprintf("\"%s\"", "")
: sprintf("\"%s\"", "-".$newver[3].", currently under development")
);
- my $version_string1 = sprintf("\"%d.%d.%d\"", @newver[0,1,2]);
- my $version_string2 = sprintf("\"%d, %d, %d\"", @newver[0,1,2]);
+ my $version_string1 = sprintf("%d.%d.%d", @newver[0,1,2]);
+ my $version_string2 = sprintf("%d, %d, %d", @newver[0,1,2]);
- $data =~ s/ * \@version HDF5 .* <BR>/ * \@version HDF5 $version_string1 <BR>/;
+ $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 };/;
write_file($H5_JAVA, $data);
@@ -393,8 +393,8 @@ if ($TESTH5_JAVA) {
? sprintf("\"%s\"", "")
: sprintf("\"%s\"", "-".$newver[3].", currently under development")
);
- my $version_string1 = sprintf("\"%d, %d, %d\"", @newver[0,1,2]);
- my $version_string2 = sprintf("\"int majnum = %d, minnum = %d, relnum = %d\"", @newver[0,1,2]);
+ my $version_string1 = sprintf("%d, %d, %d", @newver[0,1,2]);
+ 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;/;