Changeset 1453
- Timestamp:
- 11/04/10 17:11:38 (22 months ago)
- Location:
- branches/4.2
- Files:
-
- 3 edited
-
configure.ac (modified) (1 diff)
-
include/napi.h (modified) (1 diff)
-
test/testsuite.at (modified) (19 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/4.2/configure.ac
r1441 r1453 31 31 AC_PREREQ(2.61) 32 32 AC_REVISION($Revision$) 33 AC_INIT([NeXus Library], [4.2. 0], [nexus-developers@nexusformat.org], [nexus])33 AC_INIT([NeXus Library], [4.2.1], [nexus-developers@nexusformat.org], [nexus]) 34 34 AC_COPYRIGHT([Copyright (C) 2004 NeXus International Advisory Committee 35 35 This software is covered by the GNU LESSER GENERAL PUBLIC LICENSE 36 36 see file COPYING for further information]) 37 37 38 # used by libtool - need to get if from 4.2. 0better38 # used by libtool - need to get if from 4.2.1 better 39 39 NXLTVERSINFO="4:2:4" 40 40 -
branches/4.2/include/napi.h
r1429 r1453 50 50 51 51 /* NeXus HDF45 */ 52 #define NEXUS_VERSION "4.2. 0" /* major.minor.patch */52 #define NEXUS_VERSION "4.2.1" /* major.minor.patch */ 53 53 54 54 #define CONSTCHAR const char -
branches/4.2/test/testsuite.at
r1427 r1453 31 31 [[NXinquirefile found: NXtest.hdf 32 32 Number of global attributes: 4 33 NeXus_version = 4.2. 033 NeXus_version = 4.2.1 34 34 file_name = NXtest.hdf 35 35 Number of group attributes: 2 … … 86 86 [[NXinquirefile found: NXtest.h5 87 87 Number of global attributes: 4 88 NeXus_version = 4.2. 088 NeXus_version = 4.2.1 89 89 file_name = NXtest.h5 90 90 Number of group attributes: 2 … … 143 143 [[NXinquirefile found: NXtest.hdf 144 144 Number of global attributes: 4 145 NeXus_version = 4.2. 0145 NeXus_version = 4.2.1 146 146 file_name = NXtest.hdf 147 147 Number of group attributes: 2 … … 198 198 [[NXinquirefile found: NXtest.h5 199 199 Number of global attributes: 4 200 NeXus_version = 4.2. 0200 NeXus_version = 4.2.1 201 201 file_name = NXtest.h5 202 202 Number of group attributes: 2 … … 255 255 [[NXinquirefile found: NXtest.xml 256 256 Number of global attributes: 7 257 NeXus_version = 4.2. 0257 NeXus_version = 4.2.1 258 258 file_name = NXtest.xml 259 259 xmlns = http://definition.nexusformat.org/schema/3.1 … … 315 315 [[NXinquirefile found: NXtest.xml 316 316 Number of global attributes: 7 317 NeXus_version = 4.2. 0317 NeXus_version = 4.2.1 318 318 file_name = NXtest.xml 319 319 xmlns = http://definition.nexusformat.org/schema/3.1 … … 375 375 [[NXinquirefile found: NXtest-table.xml 376 376 Number of global attributes: 7 377 NeXus_version = 4.2. 0377 NeXus_version = 4.2.1 378 378 file_name = NXtest-table.xml 379 379 xmlns = http://definition.nexusformat.org/schema/3.1 … … 436 436 AT_CHECK([ $HAVE_F77 && $HAVE_HDF4 && $SETUP_TEST && napif_test-hdf4 | sed -e 's/\r$//' ], [], 437 437 [[ Number of global attributes: 4 438 NeXus_version = 4.2. 0438 NeXus_version = 4.2.1 439 439 file_name = NXtest.nxs 440 440 Group: entry(NXentry) contains 8 items … … 478 478 AT_CHECK([ $HAVE_F77 && $HAVE_HDF5 && $SETUP_TEST && napif_test-hdf5 | sed -e 's/\r$//' ], [], 479 479 [[ Number of global attributes: 4 480 NeXus_version = 4.2. 0480 NeXus_version = 4.2.1 481 481 file_name = NXtest.nxs 482 482 Group: entry(NXentry) contains 8 items … … 521 521 [[Writing character data 522 522 Number of global attributes: 4 523 NeXus_version = 4.2. 0523 NeXus_version = 4.2.1 524 524 file_name = NXtest.nxs 525 525 Group: entry(NXentry) contains 8 items … … 559 559 [[NXinquirefile found: napi_test_cpp.hdf 560 560 Number of global attributes: 4 561 NeXus_version = 4.2. 0561 NeXus_version = 4.2.1 562 562 file_name = napi_test_cpp.hdf 563 563 Number of group attributes: 2 … … 595 595 [[NXinquirefile found: napi_test_cpp.h5 596 596 Number of global attributes: 4 597 NeXus_version = 4.2. 0597 NeXus_version = 4.2.1 598 598 file_name = napi_test_cpp.h5 599 599 Number of group attributes: 2 … … 633 633 [[NXinquirefile found: napi_test_cpp.xml 634 634 Number of global attributes: 7 635 NeXus_version = 4.2. 0635 NeXus_version = 4.2.1 636 636 file_name = napi_test_cpp.xml 637 637 xmlns = http://definition.nexusformat.org/schema/3.1 … … 816 816 817 817 attribute name: NeXus_version 818 attribute value: 4.2. 0818 attribute value: 4.2.1 819 819 820 820 NXgetnextattr status: 1 … … 1233 1233 1234 1234 attribute name: NeXus_version 1235 attribute value: 4.2. 01235 attribute value: 4.2.1 1236 1236 1237 1237 NXgetnextattr status: 1 … … 1650 1650 1651 1651 attribute name: NeXus_version 1652 attribute value: 4.2. 01652 attribute value: 4.2.1 1653 1653 1654 1654 NXgetnextattr status: 1 … … 2029 2029 AT_SETUP([Checking HDF4 test file]) 2030 2030 AT_CHECK([$HAVE_HDF4 && env NO_READLINE=1 nxbrowse NXtest.hdf < ${abs_srcdir}/nxbrowse.txt | grep -v 'HDF_version = ' | grep -v 'file_time = ' | sed -e 's/\r$//' | sed -e 's/[ ]*$//' ],[], 2031 [[NXBrowse 4.2. 0Copyright (C) 2009 NeXus Data Format2032 NeXus_version = 4.2. 02031 [[NXBrowse 4.2.1 Copyright (C) 2009 NeXus Data Format 2032 NeXus_version = 4.2.1 2033 2033 file_name = NXtest.hdf 2034 2034 NX> NX Group : entry (NXentry) … … 2041 2041 AT_SETUP([Checking HDF5 test file]) 2042 2042 AT_CHECK([$HAVE_HDF5 && env NO_READLINE=1 nxbrowse NXtest.h5 < ${abs_srcdir}/nxbrowse.txt | grep -v 'HDF5_Version = ' | grep -v 'file_time = ' | sed -e 's/\r$//' | sed -e 's/[ ]*$//' ],[], 2043 [[NXBrowse 4.2. 0Copyright (C) 2009 NeXus Data Format2044 NeXus_version = 4.2. 02043 [[NXBrowse 4.2.1 Copyright (C) 2009 NeXus Data Format 2044 NeXus_version = 4.2.1 2045 2045 file_name = NXtest.h5 2046 2046 NX> NX Group : entry (NXentry) … … 2053 2053 AT_SETUP([Checking XML test file]) 2054 2054 AT_CHECK([$HAVE_XML && env NO_READLINE=1 nxbrowse NXtest.xml < ${abs_srcdir}/nxbrowse.txt | grep -v 'file_time = ' | grep -v 'XML_version = ' | sed -e 's/\r$//' | sed -e 's/[ ]*$//' ],[], 2055 [[NXBrowse 4.2. 0Copyright (C) 2009 NeXus Data Format2056 NeXus_version = 4.2. 02055 [[NXBrowse 4.2.1 Copyright (C) 2009 NeXus Data Format 2056 NeXus_version = 4.2.1 2057 2057 file_name = NXtest.xml 2058 2058 xmlns = http://definition.nexusformat.org/schema/3.1
Note: See TracChangeset
for help on using the changeset viewer.
