From 00b5ba099ebb5d8ebeffcad9f2548a9b5b02f224 Mon Sep 17 00:00:00 2001 From: Scott Wegner Date: Mon, 16 Jul 2007 11:50:07 -0500 Subject: [svn-r13981] Purpose: Windows catchup Description: - Add new source file H5version.h to Windows projects - Add new h5stat tests, and uncomment one that no longer fails - Clean up autotests a little bit. Tested: VS.NET on WinXP --- windows/hdf5build.BAT | 5 +- windows/proj/hdf5/hdf5.vcproj | 3 + windows/proj/hdf5dll/hdf5dll.vcproj | 3 + windows/tools/stattest.BAT | 288 ++++++++++++++++++----------------- windows_vs6/proj/hdf5/hdf5.dsp | 16 +- windows_vs6/proj/hdf5dll/hdf5dll.dsp | 16 +- 6 files changed, 178 insertions(+), 153 deletions(-) diff --git a/windows/hdf5build.BAT b/windows/hdf5build.BAT index 9fc55fa..53a2ff3 100755 --- a/windows/hdf5build.BAT +++ b/windows/hdf5build.BAT @@ -100,8 +100,8 @@ goto main ) else set hdf5_sln="%CD%\windows\proj\all\all.sln" :: Set external libraries if they aren't already set - if x%hdf5_ext_zlib%==x set hdf5_ext_zlib=%zlib_name% - if x%hdf5_ext_szip%==x set hdf5_ext_szip=%szip_name% + if "x%hdf5_ext_zlib%"=="x" set hdf5_ext_zlib=%zlib_name% + if "x%hdf5_ext_szip%"=="x" set hdf5_ext_szip=%szip_name% :: Setup Visual Studio environment. By default, use the Visual Studio .NET environment @@ -120,6 +120,7 @@ goto main echo.Building Fortran from commandline with .NET not yet implemented! echo.Building Fortran from commandline with .NET not yet implemented! >> %build_results% exit /b 1 + ) ) exit /b 0 diff --git a/windows/proj/hdf5/hdf5.vcproj b/windows/proj/hdf5/hdf5.vcproj index 822095c..328130d 100644 --- a/windows/proj/hdf5/hdf5.vcproj +++ b/windows/proj/hdf5/hdf5.vcproj @@ -7504,6 +7504,9 @@ RelativePath="..\..\..\src\H5Tpublic.h"> + + + + diff --git a/windows/tools/stattest.BAT b/windows/tools/stattest.BAT index 1a76f7d..ae9a819 100644 --- a/windows/tools/stattest.BAT +++ b/windows/tools/stattest.BAT @@ -10,142 +10,152 @@ @REM is linked from the top-level documents page. It can also be found at @REM http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have @REM access to either file, you may request a copy from help@hdfgroup.org. - -@echo off - -::This batch file is for h5stat tests. -::Usage -:: stattest release -- release static version -:: stattest debug -- debug static version -:: stattest release dll -- release dll version -:: stattest debug dll -- debug dll version -:: Written By:MuQun Yang -:: Date : Oct. 18, 2006 - -:: Track total number of testing errors - set /A totalerr=0 - set /A totalskip=0 - -::********************************************** -:: Generate a new temp directory for test h5stat -::********************************************** - -:: Make a tempory directory for stattest - mkdir temptest - -::**************************************************** -:: Set the Environment Variables & Change Dir to .EXE -::**************************************************** - - :: The first incoming parameter should be configuration (debug or release) - set p1=%1 - :: The second parameter should be the types of library (dll or blank) - set p2=%2 - - :: Set up some variables for convenience - :: tempResults will contain the tests results temporarily - set tempResults=stattest%p2%_%p1%.txt - :: exefile will contain the file name of the executable file - set exefile=h5stat%p2% - :: tooltest is the sub-batch file which will be called by tool test - set tooltest=..\..\tooltest - ::Handle the expected file and the actual output file - ::ln is the total line numbers to be deleted from the actual output - set ln=1 - ::ln_exp is the total line numbers to be deleted from the expected output - set ln_exp=4 - - :: NOTE1 - ::Set some variables to contain .h5 file and its path for convenience - - set file1=..\..\misc\testfiles\h5stat_filters.h5 - - ::Create the file to contain the tests output - type nul > %tempResults% - - ::Change directory to the directory where the .exe file is located - cd h5stat%p2%\%p1% - -::********************************************* -:: Test each function by calling TOOLTEST.BAT -::********************************************* -::USAGE of stattest.bat -::1. Set flag -::2. Call batch file tooltest.bat followed with the expected file name -::3. Example -::If we want to test h5stat \testfiles\file1.h5 -::At first, we need to set the flag like -::set flag=%file1% -::Secondly, we call batch file tooltest.bat by -::call %tooltest% h5stat_1.txt - -echo. -echo.**************************************************** -echo. H5stat%2 %1 T E S T S -echo.**************************************************** - -::-------------- -::Common usage -::-------------- - -::1.0 help message -set flag=-h -call %tooltest% h5stat_help1.ddl - -::1.1 another way to generate "help message" -set flag=--help -call %tooltest% h5stat_help2.ddl - -::1.2 all statisical information -set flag=%file1% -call %tooltest% h5stat_filters.ddl - -::1.3 print file information -set flag=-f %file1% -call %tooltest% h5stat_filters-file.ddl - -::1.4 print file metadata information -set flag=-F %file1% -call %tooltest% h5stat_filters-F.ddl - -::1.5 print dataset information -set flag=-d %file1% -call %tooltest% h5stat_filters-d.ddl - -::1.6 print group information -set flag=-g %file1% -call %tooltest% h5stat_filters-g.ddl - -::1.7 print datatype metadata -set flag=%file1% -dT -::call %tooltest% h5stat_filters-dT.ddl - - -::Change directory to hdf5\tools -cd ..\.. - -::Check if any of tests failed or skiped for the time being -echo. -if "%totalerr%"=="0" ( -echo. All of the %exefile% %p1% Tests Passed! -echo. All of the %exefile% %p1% Tests Passed! >> %tempResults% -) else ( -echo. %exefile% %p1% Tests Finished with %totalerr% Errors! -echo. %exefile% %p1% Tests Finished with %totalerr% Errors!>> %tempResults% -) - -if not "%totalskip%"=="0" ( -echo. %totalskip% Tests in total Skiped! >> %tempResults% -echo. %totalskip% Tests in total Skiped! -find "SKIPED" %tempResults% | more +2 -) - -::NOTE1 CLEAN -::Clean up Environment Variables -for %%i in (p1 p2 tempResults exefile tooltest ln ln_exp totalskip totalerr file1) do set %%i= -set flag= - -::Clean up Temporary Files -:: rmdir /s/q temptest - - + +@echo off + +::This batch file is for h5stat tests. +::Usage +:: stattest release -- release static version +:: stattest debug -- debug static version +:: stattest release dll -- release dll version +:: stattest debug dll -- debug dll version +:: Written By:MuQun Yang +:: Date : Oct. 18, 2006 + +:: Track total number of testing errors + set /A totalerr=0 + set /A totalskip=0 + +::********************************************** +:: Generate a new temp directory for test h5stat +::********************************************** + +:: Make a tempory directory for stattest + mkdir temptest + +::**************************************************** +:: Set the Environment Variables & Change Dir to .EXE +::**************************************************** + + :: The first incoming parameter should be configuration (debug or release) + set p1=%1 + :: The second parameter should be the types of library (dll or blank) + set p2=%2 + + :: Set up some variables for convenience + :: tempResults will contain the tests results temporarily + set tempResults=stattest%p2%_%p1%.txt + :: exefile will contain the file name of the executable file + set exefile=h5stat%p2% + :: tooltest is the sub-batch file which will be called by tool test + set tooltest=..\..\tooltest + ::Handle the expected file and the actual output file + ::ln is the total line numbers to be deleted from the actual output + set ln=1 + ::ln_exp is the total line numbers to be deleted from the expected output + set ln_exp=4 + + :: NOTE1 + ::Set some variables to contain .h5 file and its path for convenience + + set file1=..\..\misc\testfiles\h5stat_filters.h5 + set file2=..\..\misc\testfiles\h5stat_tsohm.h5 + set file3=..\..\misc\testfiles\h5stat_newgrat.h5 + + ::Create the file to contain the tests output + type nul > %tempResults% + + ::Change directory to the directory where the .exe file is located + cd h5stat%p2%\%p1% + +::********************************************* +:: Test each function by calling TOOLTEST.BAT +::********************************************* +::USAGE of stattest.bat +::1. Set flag +::2. Call batch file tooltest.bat followed with the expected file name +::3. Example +::If we want to test h5stat \testfiles\file1.h5 +::At first, we need to set the flag like +::set flag=%file1% +::Secondly, we call batch file tooltest.bat by +::call %tooltest% h5stat_1.txt + +echo. +echo.**************************************************** +echo. H5stat%2 %1 T E S T S +echo.**************************************************** + +::-------------- +::Common usage +::-------------- + +::1.0 help message +set flag=-h +call %tooltest% h5stat_help1.ddl + +::1.1 another way to generate "help message" +set flag=--help +call %tooltest% h5stat_help2.ddl + +::1.2 all statisical information +set flag=%file1% +call %tooltest% h5stat_filters.ddl + +::1.3 print file information +set flag=-f %file1% +call %tooltest% h5stat_filters-file.ddl + +::1.4 print file metadata information +set flag=-F %file1% +call %tooltest% h5stat_filters-F.ddl + +::1.5 print dataset information +set flag=-d %file1% +call %tooltest% h5stat_filters-d.ddl + +::1.6 print group information +set flag=-g %file1% +call %tooltest% h5stat_filters-g.ddl + +::1.7 print datatype metadata +set flag-dT =%file1% +call %tooltest% h5stat_filters-dT.ddl + +:: h5stat_tsohm.h5 is a copy of ../test/tsohm.h5 generated by tsohm.c +:: as of release 1.8.0-alpha4 +set flag=%file2% +call %tooltest% h5stat_tsohm.ddl + +:: h5stat_newgrat.h5 is generated by h5stat_gentest.c +set flag=%file3% +call %tooltest% h5stat_newgrat.ddl + +::Change directory to hdf5\tools +cd ..\.. + +::Check if any of tests failed or skiped for the time being +echo. +if "%totalerr%"=="0" ( +echo. All of the %exefile% %p1% Tests Passed! +echo. All of the %exefile% %p1% Tests Passed! >> %tempResults% +) else ( +echo. %exefile% %p1% Tests Finished with %totalerr% Errors! +echo. %exefile% %p1% Tests Finished with %totalerr% Errors!>> %tempResults% +) + +if not "%totalskip%"=="0" ( +echo. %totalskip% Tests in total Skiped! >> %tempResults% +echo. %totalskip% Tests in total Skiped! +find "SKIPED" %tempResults% | more +2 +) + +::NOTE1 CLEAN +::Clean up Environment Variables +for %%i in (p1 p2 tempResults exefile tooltest ln ln_exp totalskip totalerr file1 file2 file3) do set %%i= +set flag= + +::Clean up Temporary Files +:: rmdir /s/q temptest + + diff --git a/windows_vs6/proj/hdf5/hdf5.dsp b/windows_vs6/proj/hdf5/hdf5.dsp index 0d01791..ac23c4c 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 "" -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 +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 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 "" -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 +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 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -3556,6 +3556,10 @@ SOURCE=..\..\..\src\H5Tpublic.h # End Source File # Begin Source File +SOURCE=..\..\..\src\H5version.h +# End Source File +# Begin Source File + SOURCE=..\..\..\src\H5Vprivate.h # End Source File # Begin Source File diff --git a/windows_vs6/proj/hdf5dll/hdf5dll.dsp b/windows_vs6/proj/hdf5dll/hdf5dll.dsp index bc2e68e..713ca1b 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 "" -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 +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 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 "" -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 +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 MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 @@ -3774,6 +3774,10 @@ SOURCE=..\..\..\src\H5Tpublic.h # End Source File # Begin Source File +SOURCE=..\..\..\src\H5version.h +# End Source File +# Begin Source File + SOURCE=..\..\..\src\H5Vprivate.h # End Source File # Begin Source File -- cgit v0.12