diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2019-08-07 19:55:45 (GMT) |
---|---|---|
committer | Larry Knox <lrknox@hdfgroup.org> | 2019-08-07 19:55:45 (GMT) |
commit | 0ce619b92d23416408b378f4971c83724c048340 (patch) | |
tree | e22ca6cf4647615130c3ec2093e865c8c670e01e | |
parent | 92d79a58400384863653ec35dbd75aa785fd984e (diff) | |
parent | c3c044cc003d6a4039635e638e1cd1c2487be177 (diff) | |
download | hdf5-0ce619b92d23416408b378f4971c83724c048340.zip hdf5-0ce619b92d23416408b378f4971c83724c048340.tar.gz hdf5-0ce619b92d23416408b378f4971c83724c048340.tar.bz2 |
Merge pull request #1843 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'c3c044cc003d6a4039635e638e1cd1c2487be177':
Escape { and } in regex as required by sh in updated cori.nersc.gov. Tested change on jam, jelly, emu, ostrich and osx1011test.
-rwxr-xr-x | bin/h5vers | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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); } @@ -394,7 +394,7 @@ if ($TESTH5_JAVA) { 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 libversion\[\] = \{ .* \};/ int libversion\[\] = \{ $version_string1 \};/; $data =~ s/ int majnum = \d*, minnum = \d*, relnum = \d*;/ $version_string2;/; write_file($TESTH5_JAVA, $data); @@ -405,7 +405,7 @@ if ($REPACK_LAYOUT_PLUGIN_VERSION) { my $data = read_file($REPACK_LAYOUT_PLUGIN_VERSION); my $version_string = sprintf("%d %d %d", @newver[0,1,2]); - $data =~ s/ PARAMS { 9 \d* \d* \d* }/ PARAMS { 9 $version_string }/g; + $data =~ s/ PARAMS \{ 9 \d* \d* \d* \}/ PARAMS \{ 9 $version_string \}/g; write_file($REPACK_LAYOUT_PLUGIN_VERSION, $data); } |