[svn-r20383] Description:

    Bring r19714:20382 from trunk to revise_chunks branch

Tested:
    Linux 2.6/64 (chicago)

7 files changed, 60 insertions, 52 deletions

diff --git a/windows/proj/hdf5_hl_cpp/hdf5_hl_cpp.vcproj b/windows/proj/hdf5_hl_cpp/hdf5_hl_cpp.vcproj
index 561f878..2938143 100644
--- a/windows/proj/hdf5_hl_cpp/hdf5_hl_cpp.vcproj
+++ b/windows/proj/hdf5_hl_cpp/hdf5_hl_cpp.vcproj
@@ -321,18 +321,8 @@
 	<References>

 	</References>

 	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"

-			>

-			<File

-				RelativePath="..\..\..\hl\c++\src\H5PacketTable.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd"

+		<File

+			RelativePath="..\..\..\hl\c++\src\H5PacketTable.cpp"

 			>

 		</Filter>

 	</Files>

diff --git a/windows/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj b/windows/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj
index 251c4fa..cc485aa 100644
--- a/windows/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj
+++ b/windows/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj
@@ -400,25 +400,10 @@
 	<References>

 	</References>

 	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"

+		<File

+			RelativePath="..\..\..\hl\c++\src\H5PacketTable.cpp"

 			>

-			<File

-				RelativePath="..\..\..\hl\c++\src\H5PacketTable.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-			>

-		</Filter>

+		</File>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/windows/proj/hdf5_hl_f90cstubdll/hdf5_hl_f90cstubdll.vcproj b/windows/proj/hdf5_hl_f90cstubdll/hdf5_hl_f90cstubdll.vcproj
index e524321..9ae1c76 100644
--- a/windows/proj/hdf5_hl_f90cstubdll/hdf5_hl_f90cstubdll.vcproj
+++ b/windows/proj/hdf5_hl_f90cstubdll/hdf5_hl_f90cstubdll.vcproj
@@ -419,16 +419,6 @@
 				>

 			</File>

 		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-			>

-		</Filter>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/windows/proj/hdf5_hldll/hdf5_hldll.vcproj b/windows/proj/hdf5_hldll/hdf5_hldll.vcproj
index 91554f2..c42533f 100644
--- a/windows/proj/hdf5_hldll/hdf5_hldll.vcproj
+++ b/windows/proj/hdf5_hldll/hdf5_hldll.vcproj
@@ -435,16 +435,6 @@
 				>

 			</File>

 		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-			>

-		</Filter>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/windows/src/H5pubconf.h b/windows/src/H5pubconf.h
index 2ab3efb..d86e76f 100755
--- a/windows/src/H5pubconf.h
+++ b/windows/src/H5pubconf.h
@@ -54,6 +54,10 @@
 /* As FC_FUNC, but for C identifiers containing underscores. */
 #define H5_FC_FUNC_(name,NAME) NAME
 
+/* LAHEY compiler for C identifiers containing underscores. */
+/* #define H5_FC_FUNC(name,NAME) name ## _ */
+/* #define H5_FC_FUNC_(name,NAME) name ## _ */
+
 /* Define if your system can handle overflow converting floating-point to
    integer values. */
 #define H5_FP_TO_INTEGER_OVERFLOW_WORKS 1
@@ -108,6 +112,7 @@
 /* #undef H5_HAVE_FEATURES_H */
 
 /* Define if support for deflate (zlib) filter is enabled */
+#define H5_HAVE_FILTER_DEFLATE 1
 
 /* Define if support for Fletcher32 checksum is enabled */
 #define H5_HAVE_FILTER_FLETCHER32 1
diff --git a/windows/tools/h5copy/testh5copy.bat b/windows/tools/h5copy/testh5copy.bat
index 495081c..c14b505 100644
--- a/windows/tools/h5copy/testh5copy.bat
+++ b/windows/tools/h5copy/testh5copy.bat
@@ -402,13 +402,13 @@ rem <none>
     call :tooltest -f ext -i %testfile% -o %fileout% -v -s /group_ext/extlink_dset -d /copy2_dset

 

     echo.Test copying dangling external link (no obj) directly without -f ext

-    call :tooltest -i %testfile% -o %fileout% -v -s /group_ext/extlink_notyet1 -d /copy_dangle1_1

+    call :tooltest -v -i %testfile% -o %fileout% -s /group_ext/extlink_notyet1 -d /copy_dangle1_1

 

     echo.Test copying dangling external link (no obj) directly with -f ext

     call :tooltest -f ext -i %testfile% -o %fileout% -v -s /group_ext/extlink_notyet1 -d /copy_dangle1_2

 

     echo.Test copying dangling external link (no file) directly without -f ext

-    call :tooltest -i %testfile% -o %fileout% -v -s /group_ext/extlink_notyet2 -d /copy_dangle2_1

+    call :tooltest -v -i %testfile% -o %fileout% -s /group_ext/extlink_notyet2 -d /copy_dangle2_1

 

     echo.Test copying dangling external link (no file) directly with -f ext

     call :tooltest -f ext -i %testfile% -o %fileout% -v -s /group_ext/extlink_notyet2 -d /copy_dangle2_2

diff --git a/windows/tools/h5diff/testh5diff.bat b/windows/tools/h5diff/testh5diff.bat
index f745c42..e960dd7 100644
--- a/windows/tools/h5diff/testh5diff.bat
+++ b/windows/tools/h5diff/testh5diff.bat
@@ -59,6 +59,8 @@ set srcexclude1_2=h5diff_exclude1-2.h5
 set srcexclude2_1=h5diff_exclude2-1.h5

 set srcexclude2_2=h5diff_exclude2-2.h5

 set src_comp_vl_strs=h5diff_comp_vl_strs.h5

+set src_ATTR_VERBOSE_LEVEL_FILE1=h5diff_attr_v_level1.h5

+set src_ATTR_VERBOSE_LEVEL_FILE2=h5diff_attr_v_level2.h5

 

 set file1=%indir%\h5diff_basic1.h5

 set file2=%indir%\h5diff_basic2.h5

@@ -91,6 +93,8 @@ set exclude1_2=%indir%\h5diff_exclude1-2.h5
 set exclude2_1=%indir%\h5diff_exclude2-1.h5

 set exclude2_2=%indir%\h5diff_exclude2-2.h5

 set comp_vl_strs=%indir%\h5diff_comp_vl_strs.h5

+set ATTR_VERBOSE_LEVEL_FILE1=%indir%\h5diff_attr_v_level1.h5

+set ATTR_VERBOSE_LEVEL_FILE2=%indir%\h5diff_attr_v_level2.h5

 

 

 rem The tool name

@@ -530,6 +534,50 @@ rem ############################################################################
     call :testing %h5diff% -v  %srcfile5% %srcfile6%

     call :tooltest h5diff_70.txt -v %file5% %file6%

 

+    rem ##################################################

+    rem  attrs with verbose option level

+    rem ##################################################

+    call :testing %h5diff% -v1 %srcfile5% %srcfile6%

+    call :tooltest h5diff_700.txt -v1 %file5% %file6%

+

+    call :testing %h5diff% -v2 %srcfile5% %srcfile6%

+    call :tooltest h5diff_701.txt -v2 %file5% %file6% 

+

+    call :testing %h5diff%  --verbose=1 %srcfile5% %srcfile6%

+    call :tooltest h5diff_702.txt --verbose=1 %file5% %file6% 

+

+    call :testing %h5diff% --verbose=2 %srcfile5% %srcfile6%

+    call :tooltest h5diff_703.txt --verbose=2 %file5% %file6% 

+

+    rem same attr number , all same attr name

+    call :testing %h5diff% -v2 %src_ATTR_VERBOSE_LEVEL_FILE1% %src_ATTR_VERBOSE_LEVEL_FILE2% /g

+    call :tooltest h5diff_704.txt -v2 %ATTR_VERBOSE_LEVEL_FILE1% %ATTR_VERBOSE_LEVEL_FILE2% /g

+

+    rem same attr number , some same attr name

+    call :testing %h5diff%  -v2 %src_ATTR_VERBOSE_LEVEL_FILE1% %src_ATTR_VERBOSE_LEVEL_FILE2% /dset

+    call :tooltest h5diff_705.txt -v2 %ATTR_VERBOSE_LEVEL_FILE1% %ATTR_VERBOSE_LEVEL_FILE2% /dset

+

+    rem same attr number , all different attr name

+    call :testing %h5diff% -v2 %src_ATTR_VERBOSE_LEVEL_FILE1% %src_ATTR_VERBOSE_LEVEL_FILE2% /ntype

+    call :tooltest h5diff_706.txt -v2 %ATTR_VERBOSE_LEVEL_FILE1% %ATTR_VERBOSE_LEVEL_FILE2% /ntype

+

+    rem different attr number , same attr name (intersected)

+    call :testing %h5diff% -v2 %src_ATTR_VERBOSE_LEVEL_FILE1% %src_ATTR_VERBOSE_LEVEL_FILE2% /g2

+    call :tooltest h5diff_707.txt -v2 %ATTR_VERBOSE_LEVEL_FILE1% %ATTR_VERBOSE_LEVEL_FILE2% /g2

+

+    rem different attr number , all different attr name 

+    call :testing %h5diff% -v2 %src_ATTR_VERBOSE_LEVEL_FILE1% %src_ATTR_VERBOSE_LEVEL_FILE2% /g3

+    call :tooltest h5diff_708.txt -v2 %ATTR_VERBOSE_LEVEL_FILE1% %ATTR_VERBOSE_LEVEL_FILE2% /g3

+

+    rem when no attributes exist in both objects

+    call :testing %h5diff% -v2 %src_ATTR_VERBOSE_LEVEL_FILE1% %src_ATTR_VERBOSE_LEVEL_FILE2% /g4

+    call :tooltest h5diff_709.txt -v2 %ATTR_VERBOSE_LEVEL_FILE1% %ATTR_VERBOSE_LEVEL_FILE2% /g4

+

+    rem file vs file

+    call :testing %h5diff% -v2 %src_ATTR_VERBOSE_LEVEL_FILE1% %src_ATTR_VERBOSE_LEVEL_FILE2%

+    call :tooltest h5diff_710.txt -v2 %ATTR_VERBOSE_LEVEL_FILE1% %ATTR_VERBOSE_LEVEL_FILE2%

+

+

     rem #######################################################################

     rem 8.  all dataset datatypes

     rem #######################################################################