summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--release_docs/INSTALL_Windows.txt22
-rwxr-xr-xrelease_docs/INSTALL_Windows_From_Command_Line.txt8
-rwxr-xr-xwindows/hdf5bt.BAT14
-rwxr-xr-xwindows/hdf5build.BAT68
4 files changed, 81 insertions, 31 deletions
diff --git a/release_docs/INSTALL_Windows.txt b/release_docs/INSTALL_Windows.txt
index 76b0c09..580d918 100644
--- a/release_docs/INSTALL_Windows.txt
+++ b/release_docs/INSTALL_Windows.txt
@@ -39,8 +39,8 @@ Preconditions:
Visual Studio .NET. For simple Visual Studio .NET instructions, see the
document INSTALL_Windows_NET.TXT.
- 2. (Optional) Installed Intel Compiler 9.1 if you want to build HDF5 Fortran
- libraries.
+ 2. (Optional) Installed Intel Compiler 9.1 or 10.1 if you want to build HDF5
+ Fortran libraries.
3. Install Winzip or 7-zip for extracting source tarball.
@@ -180,9 +180,9 @@ Notes:
any more. To obtain HDF4 related tools, please check
http://hdfgroup.org/h4toh5/ and ftp://ftp.hdfgroup.org/HDF5/h4toh5
- 6. For Fortran users, Intel fortran Compiler 9.1 is currently supported--
- please see Section VI. Intel Compiler verion 7.x and 8.x are no longer
- supported.
+ 6. For Fortran users, Intel fortran Compiler 9.1 and 10.1 is currently
+ supported-- please see Section VI. Intel Compiler verion 7.x and 8.x are
+ no longer supported.
7. For users who would like to build Muti-threaded version of HDF5 library,
please read Section VII.
@@ -1112,9 +1112,9 @@ Warning: When you modify the H5pubconf.h file as described below, DO NOT just
Section VI: How to build HDF5 with Fortran Support
========================================================================
-Notes: 1. For Intel Compiler users, Intel fortran Compiler 9.1 is currently
- supported-- please see below. Intel Compiler verion 7.x and 8.x are no
- longer supported.
+Notes: 1. For Intel Compiler users, Intel fortran Compiler 9.1 and 10.1 are
+ currently supported-- please see below. Intel Compiler verion 7.x and
+ 8.x are no longer supported.
2. The Compaq Fortran Compiler is no longer supported for HDF5 1.8.
@@ -1145,7 +1145,7 @@ Notes: 1. For Intel Compiler users, Intel fortran Compiler 9.1 is currently
1) Invoke Microsoft Visual Studio 2005.
2) From the main menu, Go to Tools > Options > Intel(R) Fortran. In the
- right panel, make sure your "Selected Compiler" is Intel Fortran 9.1.
+ right panel, make sure your "Selected Compiler" is Intel Fortran.
3) Select the right-most box for "Libraries", and add Zlib and Szip
library paths (c:\zlib123\lib, c:\szip\dll for example).
@@ -1156,11 +1156,11 @@ Notes: 1. For Intel Compiler users, Intel fortran Compiler 9.1 is currently
5) Then click "OK".
-1. Build with Intel Fortran Compiler 9.1 under Visual Studio 2005
+1. Build with Intel Fortran Compiler 9.1 or 10.1 under Visual Studio 2005
Note: This step will build HDF5 Static and DLL C and C++ Library using
Visual Studio 2005 Compiler as well as HDF5 Static and High Level
- Fortran Library using Intel Fortran 9.1 Compiler.
+ Fortran Library using Intel Fortran 9.1 or 10.1 Compiler.
1.1 Open all_fortran.sln
diff --git a/release_docs/INSTALL_Windows_From_Command_Line.txt b/release_docs/INSTALL_Windows_From_Command_Line.txt
index 79b4eb6..62c3daa 100755
--- a/release_docs/INSTALL_Windows_From_Command_Line.txt
+++ b/release_docs/INSTALL_Windows_From_Command_Line.txt
@@ -78,7 +78,11 @@ notes in INSTALL_Windows.txt before starting below procedures.
from command line.
hdf5bt file takes the following options:
+ /vs7 Build HDF5 using Visual Studio .NET 2003
+ Note: Default is Visual Studio 2005
/fort Build and test HDF5 with Fortran libraries
+ /ivf101 Build HDF5 Fortran using Intel Visual Fortran 10.1
+ Note: Default is Intel Visual Fortran 9.1
/useenv Build HDF5 using compiler settings defined
in the environment, rather than the IDE.
/? Help information
@@ -103,7 +107,11 @@ notes in INSTALL_Windows.txt before starting below procedures.
tools from command line.
hdf55build takes the following options:
+ /vs7 Build HDF5 using Visual Studio .NET 2003
+ Note: Default is Visual Studio 2005
/fort Build HDF5 with Fortran libraries
+ /ivf101 Build HDF5 Fortran using Intel Visual Fortran 10.1
+ Note: Default is Intel Visual Fortran 9.1
/useenv Build HDF5 using compiler settings defined
in the environment, rather than the IDE.
/? Help information
diff --git a/windows/hdf5bt.BAT b/windows/hdf5bt.BAT
index 683b400..555d715 100755
--- a/windows/hdf5bt.BAT
+++ b/windows/hdf5bt.BAT
@@ -21,13 +21,15 @@ 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, 6/30/08
rem This batch file makes the following assumptions:
rem - The appropriate version of Visual Studio is installed and setup
@@ -62,6 +64,8 @@ rem Print a help message
echo. /vs7 Build HDF5 using Visual Studio .NET 2003
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
@@ -81,6 +85,10 @@ rem Parse through the parameters sent to file, and set appropriate variables
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
@@ -122,6 +130,10 @@ rem Setup our environment
set hdf5check_params=enableall
)
+ if defined hdf5_ivf101 (
+ set hdf5build_params=%hdf5build_params% /ivf101
+ )
+
if defined hdf5_useenv (
set hdf5build_params=%hdf5build_params% /useenv
)
diff --git a/windows/hdf5build.BAT b/windows/hdf5build.BAT
index 9efddd6..3a6d641 100755
--- a/windows/hdf5build.BAT
+++ b/windows/hdf5build.BAT
@@ -18,13 +18,15 @@ rem This batch file is used to build 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 . /fort Build HDF5 with Fortran libraries
+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 . /useenv Build HDF5 using compiler settings defined
rem . in the environment, rather than the IDE.
rem . /? Help information
rem By Xuan Bai
rem Created: Aug. 16, 2004
-rem Last Updated: May 13, 2008
+rem Last Updated: Scott Wegner, 6/30/08
rem This batch file makes the following assumptions:
rem - The appropriate version of Visual Studio is installed and setup
@@ -54,12 +56,15 @@ rem Print a help message
echo.
echo.Usage: %~nx0 [OPTION]
echo.
- echo. /vs7 Build HDF5 using Visual Studio .NET 2003
- echo. Note: Default is Visual Studio 2005
- echo. /fort Build HDF5 with Fortran libraries
- echo. /useenv Build HDF5 using compiler settings defined
- echo. in the environment, rather than the IDE.
- echo. /? Help information
+ echo. /vs7 Build HDF5 using Visual Studio .NET 2003
+ 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. 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
exit /b 0
@@ -71,10 +76,15 @@ rem Parse through the parameters sent to file, and set appropriate variables
if "%%a"=="/vs7" (
rem Use Visual Studio .NET 2003
set hdf5_vnet=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
@@ -172,21 +182,41 @@ rem Setup our environment
)
) else (
- echo.with Intel Visual Fortran 9.1
-
- if defined ifort_compiler91 (
- rem This sets the Intel Fortran 9.1 environment, as well as
- rem setting the appropriate Visual Studio environment
+ if not defined hdf5_ivf101 (
+ echo.with Intel Visual Fortran 9.1
- if %hdf5_platform%==Win32 (
- call "%ifort_compiler91%\IA32\Bin\ifortvars.bat"
+ if defined ifort_compiler91 (
+ rem This sets the Intel Fortran 9.1 environment, as well as
+ rem setting the appropriate Visual Studio environment
+
+ if %hdf5_platform%==Win32 (
+ call "%ifort_compiler91%\IA32\Bin\ifortvars.bat"
+ ) else (
+ call "%ifort_compiler91%\em64t\Bin\ifortvars.bat"
+ )
) else (
- call "%ifort_compiler91%\em64t\Bin\ifortvars.bat"
+ echo.Error: Cannot setup Intel Fortran 9.1 environment. Please
+ echo.make sure IFORT_COMPILER91 is defined in the environment.
+ exit /b 1
)
+
) else (
- echo.Error: Cannot setup Intel Fortran 9.1 environment. Please
- echo.make sure IFORT_COMPILER91 is defined in the environment.
- exit /b 1
+ echo.with Intel Visual Fortran 10.1
+
+ if defined ifort_compiler10 (
+ rem This sets the Intel Fortran 9.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
+ )
)
)
)
generated by cgit v0.12 at 2024-11-07 23:29:03 (GMT)