summaryrefslogtreecommitdiffstats
path: root/windows
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2011-02-22 19:37:06 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2011-02-22 19:37:06 (GMT)
commit727b687ae6c80c9854cb53814fa1c12f27c2994c (patch)
treefabe359aaddbe3b4d1e2bb58ceb3b94311d66a1c /windows
parent25486d50895fa4a30809d289b9aff4de583a9b84 (diff)
downloadhdf5-727b687ae6c80c9854cb53814fa1c12f27c2994c.zip
hdf5-727b687ae6c80c9854cb53814fa1c12f27c2994c.tar.gz
hdf5-727b687ae6c80c9854cb53814fa1c12f27c2994c.tar.bz2
[svn-r20146] Description:
Bring r19714:20145 from trunk to revise_chunks branch. Tested on: FreeBSD/32 6.3 (duty) in debug mode FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x, w/C++ & FORTRAN, in production mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, w/threadsafe, in production mode Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode Mac OS X/32 10.6.6 (amazon) in debug mode Mac OS X/32 10.6.6 (amazon) w/C++ & FORTRAN, w/threadsafe, in production mode
Diffstat (limited to 'windows')
-rwxr-xr-xwindows/InstallExamples.bat22
-rwxr-xr-xwindows/InstallcppExamples.BAT16
-rwxr-xr-xwindows/Installf90Examples.BAT30
-rw-r--r--windows/c++/test/checkcpptests.bat5
-rwxr-xr-xwindows/copy_hdf.bat2
-rw-r--r--windows/fortran/test/checkfortrantests.bat4
-rwxr-xr-xwindows/hdf5bt.BAT24
-rwxr-xr-xwindows/hdf5build.BAT94
-rw-r--r--windows/hdf5build_examples.BAT101
-rw-r--r--windows/hl/c++/test/checkhlcpptests.bat1
-rw-r--r--windows/hl/fortran/test/checkhlfortrantests.bat1
-rwxr-xr-xwindows/install_hlcexamples.BAT4
-rw-r--r--windows/install_hlf90examples.BAT4
-rw-r--r--windows/perform/checkperformtests.bat1
-rw-r--r--windows/proj/hdf5/hdf5.vcproj12
-rw-r--r--windows/proj/hdf5dll/hdf5dll.vcproj4
-rwxr-xr-xwindows/src/H5pubconf.h6
-rw-r--r--windows/test/efc/efc.vcproj435
-rw-r--r--windows/test/efcdll/efcdll.vcproj431
-rw-r--r--windows/tools/checktools.bat1
-rw-r--r--windows/tools/h5dump/testh5dump.bat7
-rw-r--r--windows/tools/h5ls/testh5ls.bat3
22 files changed, 970 insertions, 238 deletions
diff --git a/windows/InstallExamples.bat b/windows/InstallExamples.bat
index d0bf4dd..5316f5d 100755
--- a/windows/InstallExamples.bat
+++ b/windows/InstallExamples.bat
@@ -23,96 +23,76 @@ cd examples
mkdir examplesREL
mkdir examplesRELDLL
-mkdir examplesDBG
-mkdir examplesDBGDLL
cd attributetest
-copy debug\attributetest.exe ..\examplesDBG\
copy release\attributetest.exe ..\examplesREL\
cd ..
cd attributetestdll
-copy debug\attributetestdll.exe ..\examplesDBGDLL\
-copy release\attributetestdll.exe ..\examplesRELDLL\
+opy release\attributetestdll.exe ..\examplesRELDLL\
cd ..
cd chunkread
-copy debug\chunkread.exe ..\examplesDBG\
copy release\chunkread.exe ..\examplesREL\
cd ..
cd chunkreaddll
-copy debug\chunkreaddll.exe ..\examplesDBGDLL\
copy release\chunkreaddll.exe ..\examplesRELDLL\
cd ..
cd compoundtest
-copy debug\compoundtest.exe ..\examplesDBG\
copy release\compoundtest.exe ..\examplesREL\
cd ..
cd compoundtestdll
-copy debug\compoundtestdll.exe ..\examplesDBGDLL\
copy release\compoundtestdll.exe ..\examplesRELDLL\
cd ..
cd extendwritetest
-copy debug\extendwritetest.exe ..\examplesDBG\
copy release\extendwritetest.exe ..\examplesREL\
cd ..
cd extendwritetestdll
-copy debug\extendwritetestdll.exe ..\examplesDBGDLL\
copy release\extendwritetestdll.exe ..\examplesRELDLL\
cd ..
cd grouptest
-copy debug\grouptest.exe ..\examplesDBG\
copy release\grouptest.exe ..\examplesREL\
cd ..
cd grouptestdll
-copy debug\grouptestdll.exe ..\examplesDBGDLL\
copy release\grouptestdll.exe ..\examplesRELDLL\
cd ..
cd intermgrouptest
-copy debug\intermgrouptest.exe ..\examplesDBG\
copy release\intermgrouptest.exe ..\examplesREL\
cd ..
cd intermgrouptestdll
-copy debug\intermgrouptestdll.exe ..\examplesDBGDLL\
copy release\intermgrouptestdll.exe ..\examplesRELDLL\
cd ..
cd readtest
-copy debug\readtest.exe ..\examplesDBG\
copy release\readtest.exe ..\examplesREL\
cd ..
cd readtestdll
-copy debug\readtestdll.exe ..\examplesDBGDLL\
copy release\readtestdll.exe ..\examplesRELDLL\
cd ..
cd selectest
-copy debug\selectest.exe ..\examplesDBG\
copy release\selectest.exe ..\examplesREL\
cd ..
cd selectestdll
-copy debug\selectestdll.exe ..\examplesDBGDLL\
copy release\selectestdll.exe ..\examplesRELDLL\
cd ..
cd writetest
-copy debug\writetest.exe ..\examplesDBG\
copy release\writetest.exe ..\examplesREL\
cd ..
cd writetestdll
-copy debug\writetestdll.exe ..\examplesDBGDLL\
copy release\writetestdll.exe ..\examplesRELDLL\
cd ..
diff --git a/windows/InstallcppExamples.BAT b/windows/InstallcppExamples.BAT
index 14317ab..fb0f800 100755
--- a/windows/InstallcppExamples.BAT
+++ b/windows/InstallcppExamples.BAT
@@ -23,76 +23,60 @@ cd c++\examples
mkdir cppexamplesREL
mkdir cppexamplesRELDLL
-mkdir cppexamplesDBG
-mkdir cppexamplesDBGDLL
cd chunkstest
-copy debug\chunkstest.exe ..\cppexamplesDBG\
copy release\chunkstest.exe ..\cppexamplesREL\
cd ..
cd chunkstestdll
-copy debug\chunkstestdll.exe ..\cppexamplesDBGDLL\
copy release\chunkstestdll.exe ..\cppexamplesRELDLL\
cd ..
cd compoundtest
-copy debug\compoundtest.exe ..\cppexamplesDBG\
copy release\compoundtest.exe ..\cppexamplesREL\
cd ..
cd compoundtestdll
-copy debug\compoundtestdll.exe ..\cppexamplesDBGDLL\
copy release\compoundtestdll.exe ..\cppexamplesRELDLL\
cd ..
cd createtest
-copy debug\createtest.exe ..\cppexamplesDBG\
copy release\createtest.exe ..\cppexamplesREL\
cd ..
cd createtestdll
-copy debug\createtestdll.exe ..\cppexamplesDBGDLL\
copy release\createtestdll.exe ..\cppexamplesRELDLL\
cd ..
cd extend_dstest
-copy debug\extend_dstest.exe ..\cppexamplesDBG\
copy release\extend_dstest.exe ..\cppexamplesREL\
cd ..
cd extend_dstestdll
-copy debug\extend_dstestdll.exe ..\cppexamplesDBGDLL\
copy release\extend_dstestdll.exe ..\cppexamplesRELDLL\
cd ..
cd h5grouptest
-copy debug\h5grouptest.exe ..\cppexamplesDBG\
copy release\h5grouptest.exe ..\cppexamplesREL\
cd ..
cd h5grouptestdll
-copy debug\h5grouptestdll.exe ..\cppexamplesDBGDLL\
copy release\h5grouptestdll.exe ..\cppexamplesRELDLL\
cd ..
cd readdatatest
-copy debug\readdatatest.exe ..\cppexamplesDBG\
copy release\readdatatest.exe ..\cppexamplesREL\
cd ..
cd readdatatestdll
-copy debug\readdatatestdll.exe ..\cppexamplesDBGDLL\
copy release\readdatatestdll.exe ..\cppexamplesRELDLL\
cd ..
cd writedatatest
-copy debug\writedatatest.exe ..\cppexamplesDBG\
copy release\writedatatest.exe ..\cppexamplesREL\
cd ..
cd writedatatestdll
-copy debug\writedatatestdll.exe ..\cppexamplesDBGDLL\
copy release\writedatatestdll.exe ..\cppexamplesRELDLL\
cd ..
diff --git a/windows/Installf90Examples.BAT b/windows/Installf90Examples.BAT
index acde3a7..535cec1 100755
--- a/windows/Installf90Examples.BAT
+++ b/windows/Installf90Examples.BAT
@@ -24,146 +24,116 @@ cd fortran\examples
mkdir f90examplesREL
mkdir f90examplesRELDLL
-mkdir f90examplesDBG
-mkdir f90examplesDBGDLL
cd attreexampletest
-copy debug\attreexampletest.exe ..\f90examplesDBG\
copy release\attreexampletest.exe ..\f90examplesREL\
cd ..
cd attreexampletestdll
-copy debug\attreexampletestdll.exe ..\f90examplesDBGDLL\
copy release\attreexampletestdll.exe ..\f90examplesRELDLL\
cd ..
cd compoundtest
-copy debug\compoundtest.exe ..\f90examplesDBG\
copy release\compoundtest.exe ..\f90examplesREL\
cd ..
cd compoundtestdll
-copy debug\compoundtestdll.exe ..\f90examplesDBGDLL\
copy release\compoundtestdll.exe ..\f90examplesRELDLL\
cd ..
cd dsetexampletest
-copy debug\dsetexampletest.exe ..\f90examplesDBG\
copy release\dsetexampletest.exe ..\f90examplesREL\
cd ..
cd dsetexampletestdll
-copy debug\dsetexampletestdll.exe ..\f90examplesDBGDLL\
copy release\dsetexampletestdll.exe ..\f90examplesRELDLL\
cd ..
cd fileexampletest
-copy debug\fileexampletest.exe ..\f90examplesDBG\
copy release\fileexampletest.exe ..\f90examplesREL\
cd ..
cd fileexampletestdll
-copy debug\fileexampletestdll.exe ..\f90examplesDBGDLL\
copy release\fileexampletestdll.exe ..\f90examplesRELDLL\
cd ..
cd groupexampletest
-copy debug\groupexampletest.exe ..\f90examplesDBG\
copy release\groupexampletest.exe ..\f90examplesREL\
cd ..
cd groupexampletestdll
-copy debug\groupexampletestdll.exe ..\f90examplesDBGDLL\
copy release\groupexampletestdll.exe ..\f90examplesRELDLL\
cd ..
cd grpdsetexampletest
-copy debug\grpdsetexampletest.exe ..\f90examplesDBG\
copy release\grpdsetexampletest.exe ..\f90examplesREL\
cd ..
cd grpdsetexampletestdll
-copy debug\grpdsetexampletestdll.exe ..\f90examplesDBGDLL\
copy release\grpdsetexampletestdll.exe ..\f90examplesRELDLL\
cd ..
cd grpittest
-copy debug\grpittest.exe ..\f90examplesDBG\
copy release\grpittest.exe ..\f90examplesREL\
cd ..
cd grpittestdll
-copy debug\grpittestdll.exe ..\f90examplesDBGDLL\
copy release\grpittestdll.exe ..\f90examplesRELDLL\
cd ..
cd grpsexampletest
-copy debug\grpsexampletest.exe ..\f90examplesDBG\
copy release\grpsexampletest.exe ..\f90examplesREL\
cd ..
cd grpsexampletestdll
-copy debug\grpsexampletestdll.exe ..\f90examplesDBGDLL\
copy release\grpsexampletestdll.exe ..\f90examplesRELDLL\
cd ..
cd hyperslabtest
-copy debug\hyperslabtest.exe ..\f90examplesDBG\
copy release\hyperslabtest.exe ..\f90examplesREL\
cd ..
cd hyperslabtestdll
-copy debug\hyperslabtestdll.exe ..\f90examplesDBGDLL\
copy release\hyperslabtestdll.exe ..\f90examplesRELDLL\
cd ..
cd mountexampletest
-copy debug\mountexampletest.exe ..\f90examplesDBG\
copy release\mountexampletest.exe ..\f90examplesREL\
cd ..
cd mountexampletestdll
-copy debug\mountexampletestdll.exe ..\f90examplesDBGDLL\
copy release\mountexampletestdll.exe ..\f90examplesRELDLL\
cd ..
cd refobjexampletest
-copy debug\refobjexampletest.exe ..\f90examplesDBG\
copy release\refobjexampletest.exe ..\f90examplesREL\
cd ..
cd refobjexampletestdll
-copy debug\refobjexampletestdll.exe ..\f90examplesDBGDLL\
copy release\refobjexampletestdll.exe ..\f90examplesRELDLL\
cd ..
cd refregexampletest
-copy debug\refregexampletest.exe ..\f90examplesDBG\
copy release\refregexampletest.exe ..\f90examplesREL\
cd ..
cd refregexampletestdll
-copy debug\refregexampletestdll.exe ..\f90examplesDBGDLL\
copy release\refregexampletestdll.exe ..\f90examplesRELDLL\
cd ..
cd rwdsetexampletest
-copy debug\rwdsetexampletest.exe ..\f90examplesDBG\
copy release\rwdsetexampletest.exe ..\f90examplesREL\
cd ..
cd rwdsetexampletestdll
-copy debug\rwdsetexampletestdll.exe ..\f90examplesDBGDLL\
copy release\rwdsetexampletestdll.exe ..\f90examplesRELDLL\
cd ..
cd selecteletest
-copy debug\selecteletest.exe ..\f90examplesDBG\
copy release\selecteletest.exe ..\f90examplesREL\
cd ..
cd selecteletestdll
-copy debug\selecteletestdll.exe ..\f90examplesDBGDLL\
copy release\selecteletestdll.exe ..\f90examplesRELDLL\
cd ..
diff --git a/windows/c++/test/checkcpptests.bat b/windows/c++/test/checkcpptests.bat
index 285210d..828de6d 100644
--- a/windows/c++/test/checkcpptests.bat
+++ b/windows/c++/test/checkcpptests.bat
@@ -91,9 +91,8 @@ rem on it for sending parameters. --SJW 9/6/07
if "%nerrors%"=="0" (
echo.All C++ library tests passed.
) else (
- echo.** FAILED C++ Library tests.
+ echo.** FAILED C++ library tests.
)
-
+
popd
endlocal & exit /b %nerrors%
- \ No newline at end of file
diff --git a/windows/copy_hdf.bat b/windows/copy_hdf.bat
index d6a368d..a6dc153 100755
--- a/windows/copy_hdf.bat
+++ b/windows/copy_hdf.bat
@@ -17,7 +17,7 @@ rem Purpose : Copy all Files in the following formats from Windows to
rem approapriate directory: .bat .c .f90 .h .txt .js
rem :
rem Written By : Muqun Yang
-rem Last Update : November 17, 2007 by Scott Wegner
+rem Last Update : 2/18/08 by Scott Wegner
pushd %~dp0
diff --git a/windows/fortran/test/checkfortrantests.bat b/windows/fortran/test/checkfortrantests.bat
index e4d7a4e..d806e7e 100644
--- a/windows/fortran/test/checkfortrantests.bat
+++ b/windows/fortran/test/checkfortrantests.bat
@@ -95,8 +95,8 @@ rem on it for sending parameters. --SJW 9/6/07
if "%nerrors%"=="0" (
echo.All Fortran library tests passed.
) else (
- echo.** FAILED Fortran Library tests.
+ echo.** FAILED Fortran library tests.
)
-
+
popd
endlocal & exit /b %nerrors%
diff --git a/windows/hdf5bt.BAT b/windows/hdf5bt.BAT
index 0d61260..2f75286 100755
--- a/windows/hdf5bt.BAT
+++ b/windows/hdf5bt.BAT
@@ -19,9 +19,8 @@ rem This batch file takes the following options:
rem . /vs9 Build HDF5 using Visual Studio 2008
rem . /fort Build and test HDF5 with Fortran libraries
rem . /useenv Build HDF5 using compiler settings defined
-rem . in the environment, rather than the IDE.
+rem . in the environment, rather than the IDE.
rem . /ivf101 Build HDF5 Fortran using Intel Visual Fortran 10.1
-rem . /ivf111 Build HDF5 Fortran using Intel Visual Fortran 11.1
rem . /log Log the build and test results in files defined by
rem . environment variables HDF5BUILD_LOG and
rem . HDF5CHECK_LOG
@@ -60,7 +59,6 @@ rem Print a help message
echo. /vs9 Build HDF5 using Visual Studio 2008
echo. /fort Build and test HDF5 with Fortran libraries
echo. /ivf101 Build HDF5 Fortran using Intel Visual Fortran 10.1
- echo. /ivf111 Build HDF5 Fortran using Intel Visual Fortran 9.1
echo. /useenv Build HDF5 using compiler settings defined
echo. in the environment, rather than the IDE.
echo. /? Help information
@@ -72,12 +70,7 @@ rem Parse through the parameters sent to file, and set appropriate variables
:parse_params
for %%a in (%*) do (
- if "%%a"=="/vs8" (
- rem Use Visual Studio 2005 to build
- call :help
- exit /b 1
-
- ) else if "%%a"=="/vs9" (
+ if "%%a"=="/vs9" (
rem Use Visual Studio 2008 to build
set hdf5_vs2008=true
@@ -85,19 +78,10 @@ rem Parse through the parameters sent to file, and set appropriate variables
rem Enable Fortran
set hdf5_enablefortran=true
- ) else if "%%a"=="/ivf91" (
- rem Enable Fortran
- call :help
- exit /b 1
-
) else if "%%a"=="/ivf101" (
rem Enable Fortran
set hdf5_ivf101=true
- ) else if "%%a"=="/ivf111" (
- rem Enable Fortran
- set hdf5_ivf111=true
-
) else if "%%a"=="/useenv" (
rem Pass /useenv flag to devenv
set hdf5_useenv=true
@@ -139,10 +123,6 @@ rem Setup our environment
set hdf5check_params=enableall
)
- if defined hdf5_ivf111 (
- set hdf5build_params=%hdf5build_params% /ivf111
- )
-
if defined hdf5_ivf101 (
set hdf5build_params=%hdf5build_params% /ivf101
)
diff --git a/windows/hdf5build.BAT b/windows/hdf5build.BAT
index 2ac1ee5..651ecfb 100755
--- a/windows/hdf5build.BAT
+++ b/windows/hdf5build.BAT
@@ -19,7 +19,6 @@ rem This batch file takes the following options:
rem . /vs9 Build HDF5 using Visual Studio 2008
rem . /fort Build HDF5 with Fortran libraries
rem . /ivf101 Build HDF5 Fortran using Intel Visual Fortran 10.1
-rem . /ivf111 Build HDF5 Fortran using Intel Visual Fortran 11.1
rem . /nodebug Note: Default is to build debug and release versions
rem . /useenv Build HDF5 using compiler settings defined
rem . in the environment, rather than the IDE.
@@ -56,9 +55,8 @@ rem Print a help message
echo.Usage: %~nx0 [OPTION]
echo.
echo. /vs9 Build HDF5 using Visual Studio 2008
- echo. /fort Build HDF5 with Fortran libraries using the
+ echo. /fort Build HDF5 with Fortran libraries
echo. /ivf101 Build HDF5 Fortran using Intel Visual Fortran 10.1
- echo. /ivf111 Build HDF5 Fortran using Intel Visual Fortran 11.1
echo. /nodebug Note: Default is to build debug and release versions
echo. /useenv Build HDF5 using compiler settings defined
echo. in the environment, rather than the IDE.
@@ -71,31 +69,17 @@ rem Parse through the parameters sent to file, and set appropriate variables
:parse_params
for %%a in (%*) do (
- if "%%a"=="/vs8" (
- rem Visual Studio 2005 no longer supported
- call :help
- exit /b 1
-
- ) else if "%%a"=="/vs9" (
- rem Use Visual Studio 2008
+ if "%%a"=="/vs9" (
+ rem Use Visual Studio .NET 2003
set hdf5_vs2008=true
) else if "%%a"=="/fort" (
rem Enable Fortran
set hdf5_enablefortran=true
- ) else if "%%a"=="/ivf111" (
- rem Enable Fortran
- set hdf5_ivf111=true
-
) else if "%%a"=="/ivf101" (
rem Enable Fortran
set hdf5_ivf101=true
-
- ) else if "%%a"=="/ivf91" (
- rem Enable Fortran
- call :help
- exit /b 1
) else if "%%a"=="/nodebug" (
rem Enable Fortran
@@ -128,11 +112,11 @@ rem Setup our environment
echo.Setting up environment
- rem Make sure /vs8 and /vs9 weren't specified together
- if "%hdf5_vs2005%%hdf5_vs2008%"=="truetrue" (
- echo.Error: /vs8 and /vs9 should not be specified together.
- exit /b 1
- )
+ rem Make sure /vs10 and /vs9 weren't specified together
+ rem if "%hdf5_vs2010%%hdf5_vs2008%"=="truetrue" (
+ rem echo.Error: /vs10 and /vs9 should not be specified together.
+ rem exit /b 1
+ rem )
rem Figure out which solution file to use based on configuration
if defined hdf5_vs2008 (
@@ -143,7 +127,8 @@ rem Setup our environment
) else (
set hdf5_sln="%CD%\windows\proj\all\all.sln"
)
- )
+
+ )
rem Make sure PROCESSOR_ARCHITECURE is set to either x86 or AMD64
@@ -179,43 +164,24 @@ rem Setup our environment
)
) else (
- if not defined hdf5_ivf101 (
- echo.with Intel Visual Fortran 11.1
+ echo.with Intel Visual Fortran 10.1
+
+ if defined ifort_compiler10 (
+ rem This sets the Intel Fortran 10.1 environment, as well as
+ rem setting the appropriate Visual Studio environment
- if defined ifort_compiler111 (
- rem This sets the Intel Fortran 11.1 environment, as well as
- rem setting the appropriate Visual Studio environment
-
- if %hdf5_platform%==Win32 (
- call "%ifort_compiler111%\Bin\IA32\ifortvars_ia32.bat"
- ) else (
- call "%ifort_compiler111%\Bin\intel64\ifortvars_intel64.bat"
- )
+ if %hdf5_platform%==Win32 (
+ call "%ifort_compiler10%\IA32\Bin\ifortvars.bat"
) else (
- echo.Error: Cannot setup Intel Fortran 11.1 environment. Please
- echo.make sure IFORT_COMPILER111 is defined in the environment.
- exit /b 1
+ call "%ifort_compiler10%\em64t\Bin\ifortvars.bat"
)
-
) else (
- echo.with Intel Visual Fortran 10.1
-
- if defined ifort_compiler10 (
- rem This sets the Intel Fortran 10.1 environment, as well as
- rem setting the appropriate Visual Studio environment
-
- if %hdf5_platform%==Win32 (
- call "%ifort_compiler10%\IA32\Bin\ifortvars.bat"
- ) else (
- call "%ifort_compiler10%\em64t\Bin\ifortvars.bat"
- )
- ) else (
- echo.Error: Cannot setup Intel Fortran 10.1 environment. Please
- echo.make sure IFORT_COMPILER10 is defined in the environment.
- exit /b 1
- )
- )
+ echo.Error: Cannot setup Intel Fortran 10.1 environment. Please
+ echo.make sure IFORT_COMPILER10 is defined in the environment.
+ exit /b 1
+ )
)
+
)
if defined hdf5_useenv (
@@ -301,13 +267,13 @@ rem This is where the magic happens
)
rem Upgrade the project files if needed
- rem if defined hdf5_vs2008 (
- rem call :upgrade
- rem if not errorlevel 0 (
- rem echo.Error upgrading project files!
- rem goto error
- rem )
- rem )
+ if defined hdf5_vs2008 (
+ call :upgrade
+ if not errorlevel 0 (
+ echo.Error upgrading project files!
+ goto error
+ )
+ )
echo.Building HDF5 Libraries and Tools
echo.
diff --git a/windows/hdf5build_examples.BAT b/windows/hdf5build_examples.BAT
index 3fea330..aa198b3 100644
--- a/windows/hdf5build_examples.BAT
+++ b/windows/hdf5build_examples.BAT
@@ -17,8 +17,8 @@ rem File Name: hdf5build_examples.bat
rem This batch file is used to build HDF5 C/C++/Fortran examples.
rem This batch file takes the following options:
rem . /fort Build HDF5 examples, including Fortran
-rem . /nodebug Note: Default is to build debug and release versions
rem . /useenv Build HDF5 examples using compiler settings defined
+rem . /nodebug Note: Default is to build debug and release versions
rem . in the environment, rather than the IDE.
rem . /? Help information
rem By Scott Wegner
@@ -43,7 +43,7 @@ pushd %~dp0
set nerrors=0
if "%1"=="/?" goto help
-set blddebug=debug
+set blddebug=
set bldrelease=release
goto main
@@ -55,9 +55,7 @@ rem Print a help message
echo.Usage: %~nx0 [OPTION]
echo.
echo. /fort Build HDF5 examples, including Fortran
- echo. /ivf101 Build HDF5 examples using Intel Visual Fortran 10.1
- echo. /ivf111 Build HDF5 examples using Intel Visual Fortran 11.1
- echo. /nodebug Note: Default is to build debug and release versions
+ echo. /debug Note: Default is to build release only versions
echo. /useenv Build HDF5 examples using compiler settings defined
echo. in the environment, rather than the IDE.
echo. /? Help information
@@ -73,17 +71,9 @@ rem Parse through the parameters sent to file, and set appropriate variables
rem Enable Fortran
set hdf5_enablefortran=true
- ) else if "%%a"=="/ivf111" (
- rem Enable Fortran
- set hdf5_ivf111=true
-
- ) else if "%%a"=="/ivf101" (
- rem Enable Fortran
- set hdf5_ivf101=true
-
- ) else if "%%a"=="/nodebug" (
+ ) else if "%%a"=="/debug" (
rem Enable Fortran
- set blddebug=
+ set blddebug=debug
) else if "%%a"=="/useenv" (
rem Pass /useenv flag to devenv
@@ -106,7 +96,10 @@ rem Setup our environment
rem Constants
echo.Setting up environment
-
+
+ rem Setup Visual Studio environment. By default, use the Visual Studio
+ rem 2008 environment.
+
rem Make sure PROCESSOR_ARCHITECURE is set to either x86 or AMD64
if "%PROCESSOR_ARCHITECTURE%"=="x86" (
set hdf5_platform=Win32
@@ -117,66 +110,44 @@ rem Setup our environment
echo.either x86 or AMD64
exit /b 1
)
-
- rem Setup Visual Studio environment. By default, use the Visual Studio
- rem 2008 environment.
set ccflags=
- rem Currently VS2008 is the only compiler supported. 8
+ rem Currently VS2008 is the only compiler supported.
echo.Using Visual Studio 2008
if not defined hdf5_enablefortran (
- if defined vs90comntools (
- rem This sets the Visual Studio 2008 path and environment variables
- if %hdf5_platform%==Win32 (
- call "%vs90comntools%\..\..\VC\vcvarsall.bat" x86
- ) else (
- call "%vs90comntools%\..\..\VC\vcvarsall.bat" x86_amd64
- )
- ) else (
- echo.Error: Cannot setup Visual Studio 2009 environment. Please
+ if defined vs90comntools (
+ rem This sets the Visual Studio 2008 path and environment variables
+ if %hdf5_platform%==Win32 (
+ call "%vs90comntools%\..\..\VC\vcvarsall.bat" x86
+ ) else (
+ call "%vs90comntools%\..\..\VC\vcvarsall.bat" x86_amd64
+ )
+
+ ) else (
+ echo.Error: Cannot setup Visual Studio 2008 environment. Please
echo.make sure VS90COMNTOOLS is defined in the environment.
exit /b 1
)
) else (
- if not defined hdf5_ivf101 (
- echo.with Intel Visual Fortran 11.1
-
- if defined ifort_compiler111 (
- rem This sets the Intel Fortran 11.1 environment, as well as
- rem setting the appropriate Visual Studio environment
-
- if %hdf5_platform%==Win32 (
- call "%ifort_compiler111%\Bin\IA32\ifortvars_ia32.bat"
- ) else (
- call "%ifort_compiler111%\Bin\intel64\ifortvars_intel64.bat"
- )
- ) else (
- echo.Error: Cannot setup Intel Fortran 11.1 environment. Please
- echo.make sure IFORT_COMPILER111 is defined in the environment.
- exit /b 1
- )
-
- ) else (
- echo.with Intel Visual Fortran 10.1
-
- if defined ifort_compiler10 (
- rem This sets the Intel Fortran 10.1 environment, as well as
- rem setting the appropriate Visual Studio environment
-
- if %hdf5_platform%==Win32 (
- call "%ifort_compiler10%\IA32\Bin\ifortvars.bat"
- ) else (
- call "%ifort_compiler10%\em64t\Bin\ifortvars.bat"
- )
- ) else (
- echo.Error: Cannot setup Intel Fortran 10.1 environment. Please
- echo.make sure IFORT_COMPILER10 is defined in the environment.
- exit /b 1
- )
- )
+ echo.with Intel Visual Fortran 10.1
+
+ if defined ifort_compiler10 (
+ rem This sets the Intel Fortran 10.1 environment, as well as
+ rem setting the appropriate Visual Studio environment
+
+ if %hdf5_platform%==Win32 (
+ call "%ifort_compiler10%\IA32\Bin\ifortvars.bat"
+ ) else (
+ call "%ifort_compiler10%\em64t\Bin\ifortvars.bat"
+ )
+ ) else (
+ echo.Error: Cannot setup Intel Fortran 10.1 environment. Please
+ echo.make sure IFORT_COMPILER10 is defined in the environment.
+ exit /b 1
+ )
)
rem Setup variables for our SLN files
diff --git a/windows/hl/c++/test/checkhlcpptests.bat b/windows/hl/c++/test/checkhlcpptests.bat
index db3f329..aaa8fe2 100644
--- a/windows/hl/c++/test/checkhlcpptests.bat
+++ b/windows/hl/c++/test/checkhlcpptests.bat
@@ -96,3 +96,4 @@ rem on it for sending parameters. --SJW 9/6/07
popd
endlocal & exit /b %nerrors%
+ \ No newline at end of file
diff --git a/windows/hl/fortran/test/checkhlfortrantests.bat b/windows/hl/fortran/test/checkhlfortrantests.bat
index 0710625..28d4822 100644
--- a/windows/hl/fortran/test/checkhlfortrantests.bat
+++ b/windows/hl/fortran/test/checkhlfortrantests.bat
@@ -98,3 +98,4 @@ rem on it for sending parameters. --SJW 9/6/07
popd
endlocal & exit /b %nerrors%
+ \ No newline at end of file
diff --git a/windows/install_hlcexamples.BAT b/windows/install_hlcexamples.BAT
index 7644ed0..043b7ee 100755
--- a/windows/install_hlcexamples.BAT
+++ b/windows/install_hlcexamples.BAT
@@ -30,8 +30,6 @@ rem Simply create the needed directories
:makedirs
mkdir %exdir%\HLCexamplesRELEASE
mkdir %exdir%\HLCexamplesRELEASEDLL
- mkdir %exdir%\HLCexamplesDEBUG
- mkdir %exdir%\HLCexamplesDEBUGDLL
exit /b
rem This function actally copies the file over, first making sure it exists. If not, we increment nerrors
@@ -61,7 +59,7 @@ rem %2 - destination to copy to
call :makedirs
rem copy the files
- for %%a in (DEBUG RELEASE) do (
+ for %%a in (RELEASE) do (
for %%b in (DLL static) do (
set ver=%%b
set ver=!ver:static=!
diff --git a/windows/install_hlf90examples.BAT b/windows/install_hlf90examples.BAT
index f786cb6..779acea 100644
--- a/windows/install_hlf90examples.BAT
+++ b/windows/install_hlf90examples.BAT
@@ -23,16 +23,12 @@ cd hl/fortran/examples
mkdir HLf90examplesRELEASE
mkdir HLf90examplesRELEASEDLL
-mkdir HLf90examplesDEBUG
-mkdir HLf90examplesDEBUGDLL
cd ex_lite
-copy debug\ex_lite.exe ..\HLf90examplesDEBUG\
copy release\ex_lite.exe ..\HLf90examplesRELEASE\
cd ..
cd ex_litedll
-copy debug\ex_litedll.exe ..\HLf90examplesDEBUGDLL\
copy release\ex_litedll.exe ..\HLf90examplesRELEASEDLL\
cd ..
diff --git a/windows/perform/checkperformtests.bat b/windows/perform/checkperformtests.bat
index 4d789d1..228dbe5 100644
--- a/windows/perform/checkperformtests.bat
+++ b/windows/perform/checkperformtests.bat
@@ -99,3 +99,4 @@ rem on it for sending parameters. --SJW 9/6/07
popd
endlocal & exit /b %nerrors%
+ \ No newline at end of file
diff --git a/windows/proj/hdf5/hdf5.vcproj b/windows/proj/hdf5/hdf5.vcproj
index 8a247ce..35f00b9 100644
--- a/windows/proj/hdf5/hdf5.vcproj
+++ b/windows/proj/hdf5/hdf5.vcproj
@@ -617,10 +617,14 @@
RelativePath="..\..\..\src\H5FDwindows.c"
>
</File>
- <File
- RelativePath="..\..\..\src\H5Ffake.c"
- >
- </File>
+ <File
+ RelativePath="..\..\..\src\H5Fefc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\H5Ffake.c"
+ >
+ </File>
<File
RelativePath="..\..\..\src\H5Fio.c"
>
diff --git a/windows/proj/hdf5dll/hdf5dll.vcproj b/windows/proj/hdf5dll/hdf5dll.vcproj
index abf4c09..60afacd 100644
--- a/windows/proj/hdf5dll/hdf5dll.vcproj
+++ b/windows/proj/hdf5dll/hdf5dll.vcproj
@@ -704,6 +704,10 @@
RelativePath="..\..\..\src\H5FDwindows.c"
>
</File>
+ <File
+ RelativePath="..\..\..\src\H5Fefc.c"
+ >
+ </File>
<File
RelativePath="..\..\..\src\H5Ffake.c"
>
diff --git a/windows/src/H5pubconf.h b/windows/src/H5pubconf.h
index a354809..2ab3efb 100755
--- a/windows/src/H5pubconf.h
+++ b/windows/src/H5pubconf.h
@@ -478,13 +478,13 @@
#define H5_PACKAGE_NAME "HDF5"
/* Define to the full name and version of this package. */
-#define H5_PACKAGE_STRING "HDF5 1.9.79-FA_a5"
+#define H5_PACKAGE_STRING "HDF5 1.9.80-FA_a5"
/* Define to the one symbol short name of this package. */
#define H5_PACKAGE_TARNAME "hdf5"
/* Define to the version of this package. */
-#define H5_PACKAGE_VERSION "1.9.79-FA_a5"
+#define H5_PACKAGE_VERSION "1.9.80-FA_a5"
/* Width for printf() for type `long long' or `__int64', use `ll' */
#define H5_PRINTF_LL_WIDTH "I64"
@@ -641,7 +641,7 @@
/* #undef H5_USING_MEMCHECKER */
/* Version number of package */
-#define H5_VERSION "1.9.79-FA_a5"
+#define H5_VERSION "1.9.80-FA_a5"
/* Define if vsnprintf() returns the correct value for formatted strings that
don't fit into size allowed */
diff --git a/windows/test/efc/efc.vcproj b/windows/test/efc/efc.vcproj
new file mode 100644
index 0000000..8668e64
--- /dev/null
+++ b/windows/test/efc/efc.vcproj
@@ -0,0 +1,435 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="efc"
+ ProjectGUID="{FD8B058E-F53A-4197-B75E-849904E5AA79}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\../../../test/efc/Release/efc.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\../../../test/efc/Release/efc.pch"
+ AssemblerListingLocation=".\../../../test/efc/Release/"
+ ObjectFile=".\../../../test/efc/Release/"
+ ProgramDataBaseFileName=".\../../../test/efc/Release/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
+ OutputFile="$(OutDir)\$(ProjectName).exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ IgnoreDefaultLibraryNames=""
+ ProgramDatabaseFile=".\../../../test/efc/Release/efc.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\../../../test/efc/Release/efc.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\../../../test/efc/Release/efc.pch"
+ AssemblerListingLocation=".\../../../test/efc/Release/"
+ ObjectFile=".\../../../test/efc/Release/"
+ ProgramDataBaseFileName=".\../../../test/efc/Release/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
+ OutputFile="$(OutDir)\$(ProjectName).exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ IgnoreDefaultLibraryNames=""
+ ProgramDatabaseFile=".\../../../test/efc/Release/efc.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\../../../test/efc/Debug/efc.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
+ RuntimeLibrary="1"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\../../../test/efc/Debug/efc.pch"
+ AssemblerListingLocation=".\../../../test/efc/Debug/"
+ ObjectFile=".\../../../test/efc/Debug/"
+ ProgramDataBaseFileName=".\../../../test/efc/Debug/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
+ OutputFile="$(OutDir)\$(ProjectName).exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\../../../test/efc/Debug/efc.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\../../../test/efc/Debug/efc.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
+ RuntimeLibrary="1"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\../../../test/efc/Debug/efc.pch"
+ AssemblerListingLocation=".\../../../test/efc/Debug/"
+ ObjectFile=".\../../../test/efc/Debug/"
+ ProgramDataBaseFileName=".\../../../test/efc/Debug/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
+ OutputFile="$(OutDir)\$(ProjectName).exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\../../../test/efc/Debug/efc.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\test\efc.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/windows/test/efcdll/efcdll.vcproj b/windows/test/efcdll/efcdll.vcproj
new file mode 100644
index 0000000..384977f
--- /dev/null
+++ b/windows/test/efcdll/efcdll.vcproj
@@ -0,0 +1,431 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="efcdll"
+ ProjectGUID="{D8D53F43-41EE-486A-8DBD-956D8CD072E8}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\../../../test/efcdll/Release/efcdll.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5TESTUSEDLL_"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\../../../test/efcdll/Release/efcdll.pch"
+ AssemblerListingLocation=".\../../../test/efcdll/Release/"
+ ObjectFile=".\../../../test/efcdll/Release/"
+ ProgramDataBaseFileName=".\../../../test/efcdll/Release/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"
+ OutputFile="$(OutDir)\$(ProjectName).exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ ProgramDatabaseFile=".\../../../test/efcdll/Release/efcdll.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\../../../test/efcdll/Release/efcdll.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5TESTUSEDLL_"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\../../../test/efcdll/Release/efcdll.pch"
+ AssemblerListingLocation=".\../../../test/efcdll/Release/"
+ ObjectFile=".\../../../test/efcdll/Release/"
+ ProgramDataBaseFileName=".\../../../test/efcdll/Release/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"
+ OutputFile="$(OutDir)\$(ProjectName).exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ ProgramDatabaseFile=".\../../../test/efcdll/Release/efcdll.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\../../../test/efcdll/Debug/efcdll.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5TESTUSEDLL_"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\../../../test/efcdll/Debug/efcdll.pch"
+ AssemblerListingLocation=".\../../../test/efcdll/Debug/"
+ ObjectFile=".\../../../test/efcdll/Debug/"
+ ProgramDataBaseFileName=".\../../../test/efcdll/Debug/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"
+ OutputFile="$(OutDir)\$(ProjectName).exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\../../../test/efcdll/Debug/efcdll.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\../../../test/efcdll/Debug/efcdll.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5TESTUSEDLL_"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\../../../test/efcdll/Debug/efcdll.pch"
+ AssemblerListingLocation=".\../../../test/efcdll/Debug/"
+ ObjectFile=".\../../../test/efcdll/Debug/"
+ ProgramDataBaseFileName=".\../../../test/efcdll/Debug/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"
+ OutputFile="$(OutDir)\$(ProjectName).exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\../../../test/efcdll/Debug/efcdll.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\test\efc.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/windows/tools/checktools.bat b/windows/tools/checktools.bat
index 376e1fb..87f30ca 100644
--- a/windows/tools/checktools.bat
+++ b/windows/tools/checktools.bat
@@ -161,3 +161,4 @@ rem on it for sending parameters. --SJW 9/6/07
popd
endlocal & exit /b %nerrors%
+ \ No newline at end of file
diff --git a/windows/tools/h5dump/testh5dump.bat b/windows/tools/h5dump/testh5dump.bat
index e776c07..dff1d1f 100644
--- a/windows/tools/h5dump/testh5dump.bat
+++ b/windows/tools/h5dump/testh5dump.bat
@@ -299,6 +299,9 @@ rem ############################################################################
rem ############################################################################
:main
+ rem test for signed/unsigned datasets
+ call :tooltest packedbits.ddl packedbits.h5
+
rem test for displaying groups
call :tooltest tgroup-1.ddl tgroup.h5
rem test for displaying the selected groups
@@ -371,6 +374,7 @@ rem ############################################################################
rem test for files with array data
call :tooltest tarray1.ddl tarray1.h5
+ call :tooltest tarray1_big.ddl -R tarray1_big.h5
call :tooltest tarray2.ddl tarray2.h5
call :tooltest tarray3.ddl tarray3.h5
call :tooltest tarray4.ddl tarray4.h5
@@ -607,6 +611,9 @@ rem ############################################################################
rem tests for traversal of external links
call :tooltest textlinksrc.ddl textlinksrc.h5
call :tooltest textlinkfar.ddl textlinkfar.h5
+
+ rem test for dangling external links
+ call :tooltest textlink.ddl textlink.h5
diff --git a/windows/tools/h5ls/testh5ls.bat b/windows/tools/h5ls/testh5ls.bat
index 953216d..f15274c 100644
--- a/windows/tools/h5ls/testh5ls.bat
+++ b/windows/tools/h5ls/testh5ls.bat
@@ -218,6 +218,9 @@ rem ############################################################################
rem test for the nested compound type
call :tooltest tnestcomp-1.ls 0 -w80 -r -d tnestedcomp.h5
+ call :tooltest tnestcomp-2.ls 0 -w80 -r -d -S tnestedcomp.h5
+ call :tooltest tnestcomp-3.ls 0 -w80 -r -d -l tnestedcomp.h5
+ call :tooltest tnestcomp-4.ls 0 -w80 -r -d -l -S tnestedcomp.h5
rem test for loop detection
call :tooltest tloop-1.ls 0 -w80 -r -d tloop.h5