diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2009-10-12 20:16:31 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2009-10-12 20:16:31 (GMT) |
commit | b41e7eda1989005bd36c713ffec14e4693d0f722 (patch) | |
tree | 9578f32e415d1756fd46a97094a3f27c1ca83b4d /windows/hdf5build.BAT | |
parent | 64ffab68819873ad03560e39366e97d4a3f7a862 (diff) | |
download | hdf5-b41e7eda1989005bd36c713ffec14e4693d0f722.zip hdf5-b41e7eda1989005bd36c713ffec14e4693d0f722.tar.gz hdf5-b41e7eda1989005bd36c713ffec14e4693d0f722.tar.bz2 |
[svn-r17631] Removed vnet assignments and allow default /vs8 and /ivf91 on command line.
Tested: windows
Diffstat (limited to 'windows/hdf5build.BAT')
-rwxr-xr-x | windows/hdf5build.BAT | 57 |
1 files changed, 20 insertions, 37 deletions
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
|