[svn-r15922] Description:

	Bring revisions 15289:15457 from trunk into metadata journaling
branch.

Tested on:
        FreeBSD/32 6.2 (duty) in debug mode
        FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
                                in debug mode
        Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
                                in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                                in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                                w/szip filter, in production mode
        Mac OS X/32 10.5.2 (amazon) in debug mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode

1 files changed, 25 insertions, 1 deletions

diff --git a/windows/hdf5bt.BAT b/windows/hdf5bt.BAT
index 683b400..dd48f10 100755
--- a/windows/hdf5bt.BAT
+++ b/windows/hdf5bt.BAT
@@ -18,16 +18,20 @@ rem This batch file is used to build and test HDF5 Libraries and Tools.
 rem This batch file takes the following options:

 rem .  /vs7              Build HDF5 using Visual Studio .NET 2003 

 rem .                    Note: Default is Visual Studio 2005

+rem .  /vs9              Build HDF5 using Visual Studio 2008

+rem .                    Note: Default is Visual Studio 2005

 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 .   /ivf101             Build HDF5 Fortran using Intel Visual Fortran 10.1

+rem .                       Note: Default is Intel Visual Fortran 9.1

 rem .  /log               Log the build and test results in files defined by

 rem .                      environment variables HDF5BUILD_LOG and

 rem .                      HDF5CHECK_LOG

 rem .  /?                Help information

 rem By Xuan Bai

 rem Created: Aug. 16, 2004

-rem Last Updated: Scott Wegner, 5/27/08

+rem Last Updated: Scott Wegner, 7/2/08

 

 rem This batch file makes the following assumptions:

 rem    - The appropriate version of Visual Studio is installed and setup

@@ -61,7 +65,11 @@ rem Print a help message
     echo.

     echo.   /vs7              Build HDF5 using Visual Studio .NET 2003 

     echo.                     Note: Default is Visual Studio 2005

+    echo.   /vs9              Build HDF5 using Visual Studio 2008

+    echo.                     Note: Default is Visual Studio 2005

     echo.   /fort             Build and test HDF5 with Fortran libraries

+    echo.   /ivf101           Build HDF5 Fortran using Intel Visual Fortran 10.1

+    echo.                     Note: Default is Intel Visual Fortran 9.1

     echo.   /useenv           Build HDF5 using compiler settings defined

     echo.                     in the environment, rather than the IDE.

     echo.   /?                Help information

@@ -77,10 +85,18 @@ rem Parse through the parameters sent to file, and set appropriate variables
             rem Use Visual Studio .NET to build

             set hdf5_vnet=true

     

+        ) else if "%%a"=="/vs9" (

+            rem Use Visual Studio 2008 to build

+            set hdf5_vs2008=true

+            

         ) else if "%%a"=="/fort" (

             rem Enable Fortran

             set hdf5_enablefortran=true

             

+        ) else if "%%a"=="/ivf101" (

+            rem Enable Fortran

+            set hdf5_ivf101=true

+            

         ) else if "%%a"=="/useenv" (

             rem Pass /useenv flag to devenv

             set hdf5_useenv=true

@@ -117,11 +133,19 @@ rem Setup our environment
         set hdf5build_params=%hdf5build_params% /vs7

     )

     

+    if defined hdf5_vs2008 (

+        set hdf5build_params=%hdf5build_params% /vs9

+    )

+

     if defined hdf5_enablefortran (

         set hdf5build_params=%hdf5build_params% /fort

         set hdf5check_params=enableall

     )

     

+    if defined hdf5_ivf101 (

+        set hdf5build_params=%hdf5build_params% /ivf101

+    )

+    

     if defined hdf5_useenv (

         set hdf5build_params=%hdf5build_params% /useenv

     )