[svn-r18360] Updated project files and release docs to VS2008 and IVF101 based.

Made change to cpp version of testhdf5 for the elimination of dsets standalone.

Tested: Windows

1 files changed, 43 insertions, 87 deletions

diff --git a/windows/hdf5build.BAT b/windows/hdf5build.BAT
index 9c9d84d..2ac1ee5 100755
--- a/windows/hdf5build.BAT
+++ b/windows/hdf5build.BAT
@@ -16,12 +16,10 @@ rem access to either file, you may request a copy from helphdfgroup.org.
 rem File Name: hdf5build.bat

 rem This batch file is used to build 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 HDF5 with Fortran libraries

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

-rem .  /ivf91            Note: Default is Intel Visual Fortran 9.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.

@@ -57,13 +55,10 @@ 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 HDF5 with Fortran libraries using the

-    echo.                       Intel Fortran version specified, or 9.1 by default

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

-    echo.   /ivf91              Note: Default is Intel Visual Fortran 9.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.

@@ -77,8 +72,9 @@ rem Parse through the parameters sent to file, and set appropriate variables
 

     for %%a in (%*) do (

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

-            rem Use Visual Studio 2005

-            set hdf5_vs2005=true

+            rem Visual Studio 2005 no longer supported

+            call :help

+            exit /b 1

             

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

             rem Use Visual Studio 2008

@@ -88,13 +84,18 @@ rem Parse through the parameters sent to file, and set appropriate variables
             rem Enable Fortran

             set hdf5_enablefortran=true

             

-        ) else if "%%a"=="/ivf91" (

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

             rem Enable Fortran

-            set hdf5_ivf91=true

+            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

@@ -142,15 +143,6 @@ rem Setup our environment
         ) else (

             set hdf5_sln="%CD%\windows\proj\all\all.sln"

         )

-        

-    ) else (

-        echo.Using Visual Studio 2005

-        if defined hdf5_enablefortran (

-            echo.Building Fortran projects enabled

-            set hdf5_sln="%CD%\windows\proj\all_fortran\all_fortran.sln"

-        ) else (

-            set hdf5_sln="%CD%\windows\proj\all\all.sln"

-        )

     )

     

     

@@ -173,7 +165,7 @@ rem Setup our environment
     if defined hdf5_vs2008 (

         if not defined hdf5_enablefortran (

             if defined vs90comntools (

-                rem This sets the Visual Studio 2005 path and environment variables

+                rem This sets the Visual Studio 2008 path and environment variables

                 if %hdf5_platform%==Win32 (

                     call "%vs90comntools%\..\..\VC\vcvarsall.bat" x86

                 ) else (

@@ -187,78 +179,42 @@ rem Setup our environment
             )

             

         ) 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

-            )

-        )

-        

-    ) else (

-        rem Assume Visual Studio 2005

-        if not defined hdf5_enablefortran (

-            if defined vs80comntools (

-                rem This sets the Visual Studio 2005 path and environment variables

-                if %hdf5_platform%==Win32 (

-                    call "%vs80comntools%\..\..\VC\vcvarsall.bat" x86

-                ) else (

-                    call "%vs80comntools%\..\..\VC\vcvarsall.bat" x86_amd64

-                )

-

-            ) else (

-                echo.Error: Cannot setup Visual Studio 2005 environment.  Please

-                echo.make sure VS80COMNTOOLS is defined in the environment.

-                exit /b 1

-            )

-            

-        ) else (

             if not defined hdf5_ivf101 (

-                echo.with Intel Visual Fortran 9.1

+                echo.with Intel Visual Fortran 11.1

                 

-                if defined ifort_compiler91 (

-                    rem This sets the Intel Fortran 9.1 environment, as well as

+                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_compiler91%\IA32\Bin\ifortvars.bat"

+                        call "%ifort_compiler111%\Bin\IA32\ifortvars_ia32.bat"

                     ) else (

-                        call "%ifort_compiler91%\em64t\Bin\ifortvars.bat"

+                        call "%ifort_compiler111%\Bin\intel64\ifortvars_intel64.bat"

                     )

                 ) else (

-                    echo.Error: Cannot setup Intel Fortran 9.1 environment.  Please

-                    echo.make sure IFORT_COMPILER91 is defined in the environment.

+                    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

-                )

-            )

+            

+				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

+				)

+			)

         )

     )

         

@@ -345,13 +301,13 @@ rem This is where the magic happens
     )

     

     rem Upgrade the project files if needed

-    if defined hdf5_vs2008 (

-        call :upgrade

-        if not errorlevel 0 (

-            echo.Error upgrading project files!

-            goto error

-        )

-    )

+    rem if defined hdf5_vs2008 (

+    rem     call :upgrade

+    rem     if not errorlevel 0 (

+    rem         echo.Error upgrading project files!

+    rem         goto error

+    rem     )

+    rem )

 

     echo.Building HDF5 Libraries and Tools

     echo.