Skip to content

Commit 7f32ad7

Browse files
FreddieAkeroydFreddie Akeroyd
authored andcommitted
Add 4.3.1 refs #306
git-svn-id: https://svn.nexusformat.org/code/tags/4.3.1@1876 ff5d1e40-2be0-497f-93bd-dc18237bd3c7
2 parents 6efb5c3 + 79a3099 commit 7f32ad7

3 files changed

Lines changed: 24 additions & 24 deletions

File tree

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ m4_define([SVNREV],m4_esyscmd([svn info | grep Revision | awk '{print $2}' | tr
3737
m4_define([SVN_RELEASE],m4_join([],ISODATE,[svn],SVNREV)))dnl
3838

3939
## main version we are based on
40-
m4_define([NEXUS_VERSION],[4.3.0])dnl
40+
m4_define([NEXUS_VERSION],[4.3.1])dnl
4141

4242
## things like rc1 or 20100903svn1734
4343
#m4_define([NEXUS_RELEASE],SVN_RELEASE)dnl

include/napi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
#endif /* HAVE_CONFIG_H */
5757

5858
/* NeXus HDF45 */
59-
#define NEXUS_VERSION "4.3.0" /* major.minor.patch */
59+
#define NEXUS_VERSION "4.3.1" /* major.minor.patch */
6060

6161
#define CONSTCHAR const char
6262

test/testsuite.at

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ AT_SETUP([Check the C binding using HDF4])
3030
AT_CHECK([ $HAVE_HDF4 && $SETUP_TEST && napi_test-hdf4 | sed -e 's/\r$//' ], [],
3131
[[NXinquirefile found: NXtest.hdf
3232
Number of global attributes: 4
33-
NeXus_version = 4.3.0
33+
NeXus_version = 4.3.1
3434
file_name = NXtest.hdf
3535
Number of group attributes: 2
3636
NXentry path /entry
@@ -87,7 +87,7 @@ AT_SETUP([Check the C binding using HDF5])
8787
AT_CHECK([ $HAVE_HDF5 && $SETUP_TEST && napi_test-hdf5 | sed -e 's/\r$//' ], [],
8888
[[NXinquirefile found: NXtest.h5
8989
Number of global attributes: 4
90-
NeXus_version = 4.3.0
90+
NeXus_version = 4.3.1
9191
file_name = NXtest.h5
9292
Number of group attributes: 2
9393
NXentry path /entry
@@ -146,7 +146,7 @@ AT_SETUP([Check the C binding using HDF4 (static library)])
146146
AT_CHECK([ $HAVE_HDF4 && $SETUP_TEST && napi_test-hdf4-static | sed -e 's/\r$//' ], [],
147147
[[NXinquirefile found: NXtest.hdf
148148
Number of global attributes: 4
149-
NeXus_version = 4.3.0
149+
NeXus_version = 4.3.1
150150
file_name = NXtest.hdf
151151
Number of group attributes: 2
152152
NXentry path /entry
@@ -203,7 +203,7 @@ AT_SETUP([Check the C binding using HDF5 (static library)])
203203
AT_CHECK([ $HAVE_HDF5 && $SETUP_TEST && napi_test-hdf5-static | sed -e 's/\r$//' ], [],
204204
[[NXinquirefile found: NXtest.h5
205205
Number of global attributes: 4
206-
NeXus_version = 4.3.0
206+
NeXus_version = 4.3.1
207207
file_name = NXtest.h5
208208
Number of group attributes: 2
209209
NXentry path /entry
@@ -262,7 +262,7 @@ AT_SETUP([Check the C binding using XML])
262262
AT_CHECK([ $HAVE_XML && $SETUP_TEST && napi_test-xml | sed -e 's/\r$//' ], [],
263263
[[NXinquirefile found: NXtest.xml
264264
Number of global attributes: 7
265-
NeXus_version = 4.3.0
265+
NeXus_version = 4.3.1
266266
file_name = NXtest.xml
267267
xmlns = http://definition.nexusformat.org/schema/3.1
268268
xmlns:xsi = http://www.w3.org/2001/XMLSchema-instance
@@ -324,7 +324,7 @@ AT_SETUP([Check the C binding using XML (static library)])
324324
AT_CHECK([ $HAVE_XML && $SETUP_TEST && napi_test-xml-static | sed -e 's/\r$//' ], [],
325325
[[NXinquirefile found: NXtest.xml
326326
Number of global attributes: 7
327-
NeXus_version = 4.3.0
327+
NeXus_version = 4.3.1
328328
file_name = NXtest.xml
329329
xmlns = http://definition.nexusformat.org/schema/3.1
330330
xmlns:xsi = http://www.w3.org/2001/XMLSchema-instance
@@ -386,7 +386,7 @@ AT_SETUP([Check the C binding using XML table (static library)])
386386
AT_CHECK([ $HAVE_XML && $SETUP_TEST && napi_test-xml-table-static | sed -e 's/\r$//' ], [],
387387
[[NXinquirefile found: NXtest-table.xml
388388
Number of global attributes: 7
389-
NeXus_version = 4.3.0
389+
NeXus_version = 4.3.1
390390
file_name = NXtest-table.xml
391391
xmlns = http://definition.nexusformat.org/schema/3.1
392392
xmlns:xsi = http://www.w3.org/2001/XMLSchema-instance
@@ -449,7 +449,7 @@ AT_BANNER([Check the FORTRAN binding.])
449449
AT_SETUP([Check the F77 binding using HDF4.])
450450
AT_CHECK([ $HAVE_F77 && $HAVE_HDF4 && $SETUP_TEST && napif_test-hdf4 | sed -e 's/\r$//' ], [],
451451
[[ Number of global attributes: 4
452-
NeXus_version = 4.3.0
452+
NeXus_version = 4.3.1
453453
file_name = NXtest.nxs
454454
Group: entry(NXentry) contains 8 items
455455
Path = /entry/ch_data
@@ -491,7 +491,7 @@ AT_CLEANUP
491491
AT_SETUP([Check the F77 binding using HDF5.])
492492
AT_CHECK([ $HAVE_F77 && $HAVE_HDF5 && $SETUP_TEST && napif_test-hdf5 | sed -e 's/\r$//' ], [],
493493
[[ Number of global attributes: 4
494-
NeXus_version = 4.3.0
494+
NeXus_version = 4.3.1
495495
file_name = NXtest.nxs
496496
Group: entry(NXentry) contains 8 items
497497
Path = /entry/ch_data
@@ -534,7 +534,7 @@ AT_SETUP([Check the F90 binding using HDF5.])
534534
AT_CHECK([ $HAVE_F90 && $HAVE_HDF5 && $SETUP_TEST && NXtest | sed -e 's/\r$//' ], [],
535535
[[Writing character data
536536
Number of global attributes: 4
537-
NeXus_version = 4.3.0
537+
NeXus_version = 4.3.1
538538
file_name = NXtest.nxs
539539
Group: entry(NXentry) contains 8 items
540540
ch_data : NX_CHAR
@@ -572,7 +572,7 @@ AT_SETUP([Check the C++ binding using HDF4.])
572572
AT_CHECK([ $HAVE_HDF4 && $SETUP_TEST && napi_test_cpp-hdf4 | sed -e 's/\r$//' ], [],
573573
[[NXinquirefile found: napi_test_cpp.hdf
574574
Number of global attributes: 4
575-
NeXus_version = 4.3.0
575+
NeXus_version = 4.3.1
576576
file_name = napi_test_cpp.hdf
577577
Number of group attributes: 2
578578
hugo = namenlos
@@ -609,7 +609,7 @@ AT_SETUP([Check the C++ binding using HDF5.])
609609
AT_CHECK([ $HAVE_HDF5 && $SETUP_TEST && napi_test_cpp-hdf5 | sed -e 's/\r$//' ], [],
610610
[[NXinquirefile found: napi_test_cpp.h5
611611
Number of global attributes: 4
612-
NeXus_version = 4.3.0
612+
NeXus_version = 4.3.1
613613
file_name = napi_test_cpp.h5
614614
Number of group attributes: 2
615615
hugo = namenlos
@@ -648,7 +648,7 @@ AT_SETUP([Check the C++ binding using xml.])
648648
AT_CHECK([ $HAVE_XML && $SETUP_TEST && napi_test_cpp-xml | sed -e 's/\r$//' ], [],
649649
[[NXinquirefile found: napi_test_cpp.xml
650650
Number of global attributes: 7
651-
NeXus_version = 4.3.0
651+
NeXus_version = 4.3.1
652652
file_name = napi_test_cpp.xml
653653
xmlns = http://definition.nexusformat.org/schema/3.1
654654
xmlns:xsi = http://www.w3.org/2001/XMLSchema-instance
@@ -832,7 +832,7 @@ Number of global attributes: 4
832832
NXgetnextattr status: 1
833833

834834
attribute name: NeXus_version
835-
attribute value: 4.3.0
835+
attribute value: 4.3.1
836836

837837
NXgetnextattr status: 1
838838

@@ -1249,7 +1249,7 @@ Number of global attributes: 4
12491249
NXgetnextattr status: 1
12501250

12511251
attribute name: NeXus_version
1252-
attribute value: 4.3.0
1252+
attribute value: 4.3.1
12531253

12541254
NXgetnextattr status: 1
12551255

@@ -1666,7 +1666,7 @@ Number of global attributes: 7
16661666
NXgetnextattr status: 1
16671667

16681668
attribute name: NeXus_version
1669-
attribute value: 4.3.0
1669+
attribute value: 4.3.1
16701670

16711671
NXgetnextattr status: 1
16721672

@@ -2045,8 +2045,8 @@ AT_CLEANUP
20452045
AT_BANNER([[Testing NXbrowse Tool.]])
20462046
AT_SETUP([Checking nxbrowse HDF4 test file])
20472047
AT_CHECK([$HAVE_HDF4 && env NO_READLINE=1 nxbrowse NXtest.hdf < ${abs_srcdir}/nxbrowse.txt | grep -v 'HDF_version = ' | grep -v 'file_time = ' | grep -v 'readline support' | sed -e 's/\r$//' | sed -e 's/[ ]*$//' ],[],
2048-
[[NXBrowse 4.3.0 Copyright (C) 2009 NeXus Data Format
2049-
NeXus_version = 4.3.0
2048+
[[NXBrowse 4.3.1 Copyright (C) 2009 NeXus Data Format
2049+
NeXus_version = 4.3.1
20502050
file_name = NXtest.hdf
20512051
NX> NX Group : entry (NXentry)
20522052
entry attribute: hugo = namenlos
@@ -2057,8 +2057,8 @@ NX>
20572057
AT_CLEANUP
20582058
AT_SETUP([Checking nxbrowse HDF5 test file])
20592059
AT_CHECK([$HAVE_HDF5 && env NO_READLINE=1 nxbrowse NXtest.h5 < ${abs_srcdir}/nxbrowse.txt | grep -v 'HDF5_Version = ' | grep -v 'file_time = ' | grep -v 'readline support' | sed -e 's/\r$//' | sed -e 's/[ ]*$//' ],[],
2060-
[[NXBrowse 4.3.0 Copyright (C) 2009 NeXus Data Format
2061-
NeXus_version = 4.3.0
2060+
[[NXBrowse 4.3.1 Copyright (C) 2009 NeXus Data Format
2061+
NeXus_version = 4.3.1
20622062
file_name = NXtest.h5
20632063
NX> NX Group : entry (NXentry)
20642064
entry attribute: hugo = namenlos
@@ -2069,8 +2069,8 @@ NX>
20692069
AT_CLEANUP
20702070
AT_SETUP([Checking nxbrowse XML test file])
20712071
AT_CHECK([$HAVE_XML && env NO_READLINE=1 nxbrowse NXtest.xml < ${abs_srcdir}/nxbrowse.txt | grep -v 'file_time = ' | grep -v 'XML_version = ' | grep -v 'readline support' | sed -e 's/\r$//' | sed -e 's/[ ]*$//' ],[],
2072-
[[NXBrowse 4.3.0 Copyright (C) 2009 NeXus Data Format
2073-
NeXus_version = 4.3.0
2072+
[[NXBrowse 4.3.1 Copyright (C) 2009 NeXus Data Format
2073+
NeXus_version = 4.3.1
20742074
file_name = NXtest.xml
20752075
xmlns = http://definition.nexusformat.org/schema/3.1
20762076
xmlns:xsi = http://www.w3.org/2001/XMLSchema-instance

0 commit comments

Comments
 (0)