[svn-r17631] Removed vnet assignments and allow default /vs8 and /ivf91 on command line.

Tested: windows

2 files changed, 41 insertions, 46 deletions

diff --git a/windows/hdf5bt.BAT b/windows/hdf5bt.BAT
index 1cb4644..5539ce0 100755
--- a/windows/hdf5bt.BAT
+++ b/windows/hdf5bt.BAT
@@ -17,13 +17,13 @@ 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 .  /vs9              Build HDF5 using Visual Studio 2008

-rem .                    Note: Default is Visual Studio 2005

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

@@ -62,10 +62,10 @@ rem Print a help message
     echo Usage: %~nx0 [OPTION]

     echo.

     echo.   /vs9              Build HDF5 using Visual Studio 2008

-    echo.                     Note: Default is Visual Studio 2005

+    echo.   /vs8              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

@@ -83,6 +83,10 @@ rem Parse through the parameters sent to file, and set appropriate variables
             call :help

             exit /b 1

     

+        ) else 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 +95,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 +135,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 +148,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

     )

diff --git a/windows/hdf5build.BAT b/windows/hdf5build.BAT
index e2a062c..30ce1a0 100755
--- a/windows/hdf5build.BAT
+++ b/windows/hdf5build.BAT
@@ -17,10 +17,10 @@ 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 .  /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 .                       Note: Default is Intel Visual Fortran 9.1

+rem .  /vs8              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 .  /useenv           Build HDF5 using compiler settings defined

 rem .                    in the environment, rather than the IDE.

 rem .  /?                Help information

@@ -57,11 +57,11 @@ rem Print a help message
     echo.Usage: %~nx0 [OPTION]

     echo.

     echo.   /vs9                Build HDF5 using Visual Studio 2008

-    echo.                       Note: Default is Visual Studio 2005

+    echo.   /vs8                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.                       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

@@ -79,14 +79,22 @@ rem Parse through the parameters sent to file, and set appropriate variables
             call :help

             exit /b 1

             

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

+            rem Use Visual Studio 2005

+            set hdf5_vs2005=true

+            

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

-            rem Use Visual Studio .NET 2003

+            rem Use Visual Studio 2008

             set hdf5_vs2008=true

             

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

             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

@@ -118,29 +126,14 @@ rem Setup our environment
     

     echo.Setting up environment

 

-    rem Sanity check-- make sure VS.NET isn't specified with Fortran or x64

-    if defined hdf5_vnet (

-        if defined hdf5_enablefortran (

-            echo.Error: Building Fortran libraries with Visual Studio .NET is unsupported

-            exit /b 1

-        )

-        if "%PROCESSOR_ARCHITECTURE%"=="AMD64" (

-            echo.Error: Building HDF5 on x64 with Visual Studio .NET is unsupported

-            exit /b 1

-        )

-    )

-    rem Make sure /vs7 and /vs9 weren't specified together

-    if "%hdf5_vnet%%hdf5_vs2008%"=="truetrue" (

-        echo.Error: /vs7 and /vs9 should not be specified together.

+    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 Figure out which solution file to use based on configuration

-    if defined hdf5_vnet (

-        echo.Using Visual Studio .NET 2003

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

-        

-    ) else if defined hdf5_vs2008 (

+    if defined hdf5_vs2008 (

         echo.Using Visual Studio 2008

         if defined hdf5_enablefortran (

             echo.Building Fortran projects enabled

@@ -176,17 +169,7 @@ rem Setup our environment
     

     set ccflags=

     

-    if defined hdf5_vnet (

-        if defined vs71comntools (

-            rem This sets the Visual Studio .NET path and environment variables

-            call "%vs71comntools%\vsvars32.bat" 

-        ) else (

-            echo.Error: Cannot setup Visual Studio .NET 2003 environment.  Please

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

-            exit /b 1

-        )

-        

-    ) else if defined hdf5_vs2008 (

+    if defined hdf5_vs2008 (

         if not defined hdf5_enablefortran (

             if defined vs90comntools (

                 rem This sets the Visual Studio 2005 path and environment variables