[svn-r14207] Purpose: Bring Windows up-to-date

Description:
-- Add new source files to Windows projects: H5Pdeprec.c, H5Pint.c, H5Ddbg.c, H5Dint.c
-- Add new h5dump XML tests to Windows test script

Tested:
VS2005 on WinXP

5 files changed, 172 insertions, 12 deletions

diff --git a/windows/proj/hdf5/hdf5.vcproj b/windows/proj/hdf5/hdf5.vcproj
index fa6fee2..4698bf0 100644
--- a/windows/proj/hdf5/hdf5.vcproj
+++ b/windows/proj/hdf5/hdf5.vcproj
@@ -1265,6 +1265,10 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\..\..\src\H5Ddbg.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\src\H5Ddeprec.c"

 				>

 				<FileConfiguration

@@ -1357,6 +1361,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\src\H5Dint.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\src\H5Dio.c"

 				>

 				<FileConfiguration

@@ -6253,6 +6261,10 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\..\..\src\H5Pdeprec.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\src\H5Pdxpl.c"

 				>

 				<FileConfiguration

@@ -6475,6 +6487,10 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\..\..\src\H5Pint.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\src\H5Plapl.c"

 				>

 				<FileConfiguration

diff --git a/windows/proj/hdf5dll/hdf5dll.vcproj b/windows/proj/hdf5dll/hdf5dll.vcproj
index 186ba36..357bca2 100644
--- a/windows/proj/hdf5dll/hdf5dll.vcproj
+++ b/windows/proj/hdf5dll/hdf5dll.vcproj
@@ -1343,6 +1343,10 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\..\..\src\H5Ddbg.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\src\H5Ddeprec.c"

 				>

 				<FileConfiguration

@@ -1435,6 +1439,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\src\H5Dint.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\src\H5Dio.c"

 				>

 				<FileConfiguration

@@ -6299,6 +6307,10 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\..\..\src\H5Pdeprec.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\src\H5Pdxpl.c"

 				>

 				<FileConfiguration

@@ -6523,6 +6535,10 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\..\..\src\H5Pint.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\src\H5Plapl.c"

 				>

 				<FileConfiguration

diff --git a/windows/tools/h5dump/testh5dumpxml.bat b/windows/tools/h5dump/testh5dumpxml.bat
index 1cfde06..7fd04f3 100644
--- a/windows/tools/h5dump/testh5dumpxml.bat
+++ b/windows/tools/h5dump/testh5dumpxml.bat
@@ -198,6 +198,14 @@ rem ############################################################################
     call :tooltest tall-2A.h5.xml --xml -A tall.h5

 

     

+    rem tests for attribute order

+    call :tooltest torderattr1.h5.xml --xml -H --sort_by=name --sort_order=ascending torderattr.h5

+    call :tooltest torderattr2.h5.xml --xml -H --sort_by=name --sort_order=descending torderattr.h5

+    call :tooltest torderattr3.h5.xml --xml -H --sort_by=creation_order --sort_order=ascending torderattr.h5

+    call :tooltest torderattr4.h5.xml --xml -H --sort_by=creation_order --sort_order=descending torderattr.h5    

+    

+    

+    

     if %nerrors% equ 0 (

         echo.All %dumper% tests passed.

     )

diff --git a/windows_vs6/proj/hdf5/hdf5.dsp b/windows_vs6/proj/hdf5/hdf5.dsp
index 77c5352..dabf5df 100755
--- a/windows_vs6/proj/hdf5/hdf5.dsp
+++ b/windows_vs6/proj/hdf5/hdf5.dsp
@@ -97,12 +97,12 @@ LIB32=link.exe -lib
 # PROP Output_Dir "Debug"

 # PROP Intermediate_Dir "Debug"

 # PROP Target_Dir ""

-F90=df.exe

-# ADD BASE F90 /browser /compile_only /debug:full /include:"hdf5___W/" /nologo /warn:nofileopt

-# ADD F90 /browser /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt

 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Z7 /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c

 # ADD CPP /nologo /Gt0 /W3 /GX /Z7 /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c

+F90=df.exe

+# ADD BASE F90 /browser /compile_only /debug:full /include:"hdf5___W/" /nologo /warn:nofileopt

+# ADD F90 /browser /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -122,12 +122,12 @@ LIB32=link.exe -lib
 # PROP Output_Dir "Release"

 # PROP Intermediate_Dir "Release"

 # PROP Target_Dir ""

-F90=df.exe

-# ADD BASE F90 /compile_only /include:"hdf5___0/" /nologo /warn:nofileopt

-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt

 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

 # ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

+F90=df.exe

+# ADD BASE F90 /compile_only /include:"hdf5___0/" /nologo /warn:nofileopt

+# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -494,6 +494,21 @@ SOURCE=..\..\..\src\H5Dcontig.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\..\src\H5Ddbg.c

+

+!IF  "$(CFG)" == "hdf5 - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"

+

+!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\..\src\H5Ddeprec.c

 

 !IF  "$(CFG)" == "hdf5 - Win32 Release"

@@ -541,6 +556,21 @@ SOURCE=..\..\..\src\H5Dfill.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\..\src\H5Dint.c

+

+!IF  "$(CFG)" == "hdf5 - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"

+

+!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\..\src\H5Dio.c

 

 !IF  "$(CFG)" == "hdf5 - Win32 Release"

@@ -2317,6 +2347,21 @@ SOURCE=..\..\..\src\H5Pdcpl.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\..\src\H5Pdeprec.c

+

+!IF  "$(CFG)" == "hdf5 - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"

+

+!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\..\src\H5Pdxpl.c

 

 !IF  "$(CFG)" == "hdf5 - Win32 Release"

@@ -2398,6 +2443,21 @@ SOURCE=..\..\..\src\H5Pgcpl.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\..\src\H5Pint.c

+

+!IF  "$(CFG)" == "hdf5 - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"

+

+!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\..\src\H5Plapl.c

 

 !IF  "$(CFG)" == "hdf5 - Win32 Release"

diff --git a/windows_vs6/proj/hdf5dll/hdf5dll.dsp b/windows_vs6/proj/hdf5dll/hdf5dll.dsp
index 5447208..68f855b 100755
--- a/windows_vs6/proj/hdf5dll/hdf5dll.dsp
+++ b/windows_vs6/proj/hdf5dll/hdf5dll.dsp
@@ -107,12 +107,12 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-F90=df.exe

-# ADD BASE F90 /compile_only /debug:full /include:"hdf5dll_/" /dll /nologo /warn:nofileopt

-# ADD F90 /compile_only /debug:full /include:"Debug/" /dll /nologo /warn:nofileopt

 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_HDF5DLL_" /YX /FD /MTd /c

 # ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_HDF5DLL_" /YX /FD /MDd /c

+F90=df.exe

+# ADD BASE F90 /compile_only /debug:full /include:"hdf5dll_/" /dll /nologo /warn:nofileopt

+# ADD F90 /compile_only /debug:full /include:"Debug/" /dll /nologo /warn:nofileopt

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

@@ -138,12 +138,12 @@ LINK32=link.exe
 # PROP Output_Dir "Release"

 # PROP Intermediate_Dir "Release"

 # PROP Target_Dir ""

-F90=df.exe

-# ADD BASE F90 /compile_only /include:"hdf5dll0/" /dll /nologo /warn:nofileopt

-# ADD F90 /compile_only /include:"Release/" /dll /nologo /warn:nofileopt

 CPP=cl.exe

 # ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_HDF5DLL_" /YX /FD /c

 # ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_HDF5DLL_" /YX /FD /c

+F90=df.exe

+# ADD BASE F90 /compile_only /include:"hdf5dll0/" /dll /nologo /warn:nofileopt

+# ADD F90 /compile_only /include:"Release/" /dll /nologo /warn:nofileopt

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

@@ -532,6 +532,21 @@ SOURCE=..\..\..\src\H5Dcontig.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\..\src\H5Ddbg.c

+

+!IF  "$(CFG)" == "hdf5dll - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"

+

+!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\..\src\H5Ddeprec.c

 

 !IF  "$(CFG)" == "hdf5dll - Win32 Release"

@@ -581,6 +596,21 @@ SOURCE=..\..\..\src\H5Dfill.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\..\src\H5Dint.c

+

+!IF  "$(CFG)" == "hdf5dll - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"

+

+!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\..\src\H5Dio.c

 

 !IF  "$(CFG)" == "hdf5dll - Win32 Release"

@@ -2453,6 +2483,21 @@ SOURCE=..\..\..\src\H5Pdcpl.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\..\src\H5Pdeprec.c

+

+!IF  "$(CFG)" == "hdf5dll - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"

+

+!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\..\src\H5Pdxpl.c

 

 !IF  "$(CFG)" == "hdf5dll - Win32 Release"

@@ -2540,6 +2585,21 @@ SOURCE=..\..\..\src\H5Pgcpl.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\..\src\H5Pint.c

+

+!IF  "$(CFG)" == "hdf5dll - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"

+

+!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\..\src\H5Plapl.c

 

 !IF  "$(CFG)" == "hdf5dll - Win32 Release"