[svn-r17896] Description:

	Bring r17546:17895 from trunk to revise_chunks branch.  Changes to
fixed and extensible array dataset chunk indexing code to accommodate changes
to private APIs in those interfaces.  Also, other adjustments to source code
and expected output in response to changes on the trunk.

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 (smirom) 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, in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
        Mac OS X/32 10.6.2 (amazon) in debug mode
        Mac OS X/32 10.6.2 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode

1 files changed, 26 insertions, 18 deletions

diff --git a/windows/hdf5bt.BAT b/windows/hdf5bt.BAT
index 1cb4644..c0b58a5 100755
--- a/windows/hdf5bt.BAT
+++ b/windows/hdf5bt.BAT
@@ -16,14 +16,15 @@ rem access to either file, you may request a copy from help@hdfgroup.org.
 rem File Name: hdf5bt.bat

 rem This batch file is used to build and test HDF5 Libraries and Tools.

 rem This batch file takes the following options:

+rem .  /vs8              Build HDF5 using 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 .                     in the environment, rather than the IDE.

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

+rem .  /ivf91            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

@@ -61,11 +62,12 @@ rem Print a help message
     echo.

     echo Usage: %~nx0 [OPTION]

     echo.

+    echo.   /vs8              Build HDF5 using 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.   /ivf91            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,12 +79,10 @@ rem Parse through the parameters sent to file, and set appropriate variables
 :parse_params

 

     for %%a in (%*) do (

-        if "%%a"=="/vs7" (

-            rem Visual Studio .NET not supported

-            rem Set errorlevel 1 and send to help

-            call :help

-            exit /b 1

-    

+        if "%%a"=="/vs8" (

+            rem Use Visual Studio 2005 to build

+            set hdf5_vs2005=true

+            

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

             rem Use Visual Studio 2008 to build

             set hdf5_vs2008=true

@@ -91,6 +91,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

+            set hdf5_ivf91=true

+            

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

             rem Enable Fortran

             set hdf5_ivf101=true

@@ -127,8 +131,8 @@ rem Setup our environment
     set hdf5build_params=

     set hdf5check_params=enablecpp

     

-    if defined hdf5_vnet (

-        set hdf5build_params=%hdf5build_params% /vs7

+    if defined hdf5_vs2005 (

+        set hdf5build_params=%hdf5build_params% /vs8

     )

     

     if defined hdf5_vs2008 (

@@ -140,6 +144,10 @@ rem Setup our environment
         set hdf5check_params=enableall

     )

     

+    if defined hdf5_ivf91 (

+        set hdf5build_params=%hdf5build_params% /ivf91

+    )

+    

     if defined hdf5_ivf101 (

         set hdf5build_params=%hdf5build_params% /ivf101

     )

@@ -211,8 +219,8 @@ rem This is where the magic happens
 :main

 

     call :parse_params %*

-    if %errorlevel% neq 0 (

-        if !errorlevel! equ 1 (

+    if not errorlevel 0 (

+        if errorlevel 1 (

             rem This isn't an error case-- this means /? was specified.  Simply

             rem quit.

             goto end

@@ -225,7 +233,7 @@ rem This is where the magic happens
     )

 

     call :setup

-    if %errorlevel% neq 0 (

+    if not errorlevel 0 (

         echo.Error setting up hdf5bt environment!

         goto error

     )

@@ -236,13 +244,13 @@ rem This is where the magic happens
     echo.

 

     call :build

-    if %errorlevel% neq 0 (

+    if not errorlevel 0 (

         echo.Error building HDF5 libraries!

         goto error

     )

 

     call :test

-    if %errorlevel% neq 0 (

+    if not errorlevel 0 (

         echo.Error testing HDF5 libraries!

         goto error

     )