[svn-r10139] Purpose:

Update windows installation file
Description:

Fix some bugs,
Add more contents for .Net and Intel.
Solution:

Platforms tested:

Misc. update:

1 files changed, 48 insertions, 21 deletions

diff --git a/release_docs/INSTALL_Windows.txt b/release_docs/INSTALL_Windows.txt
index 5d73fec..d889b97 100644
--- a/release_docs/INSTALL_Windows.txt
+++ b/release_docs/INSTALL_Windows.txt
@@ -163,7 +163,8 @@ The following sections discuss installation procedures in detail:
                  or DLL
    Section IV:   Helpful pointers
    Section V:    How to disable Gzip(Zlib)/Szip compression  
-   Section VI:   How to build in HDF5 in VS 7.0(.NET) 
+   Section VI:   How to build in HDF5 in VS 7.0(.NET) and Intel 8.x with
+                 .NET environment
    Section VII:  How to build and test HDF5 snapshot release
    Section VIII: Misc. 
 
@@ -260,7 +261,7 @@ STEP 1: Building HDF5 libraries and tools
              testhdf5_fortran
              testhdf5_fortrandll
 
-      3.3 Skip this step if you are not using Intel compilers
+      3.3 Skip this step if you are not using Intel 7.x compilers
     
           a. Intel C Compiler
              Go to Tools-->Select Compiler
@@ -272,7 +273,7 @@ STEP 1: Building HDF5 libraries and tools
              Go to Tools-->Customize-->Add-ins and Macro Files
              and check Intel Fortran Compiler Build Tool
            
-          Note: Szip library is different when using Intel compiler.
+          Note: Szip library is different when using Intel 7.x compiler.
                 You should build Szip source codes with Intel
                 compiler or download binaries for Intel compiler
                 from ftp://ftp.ncsa.uiuc.edu/HDF/szip/bin/windows.
@@ -462,6 +463,9 @@ We provide 2 options for users to test HDF5 libraries and tools.
    HDF5 comes with various test suites, all of which can be tested
    with hdf5check.bat batch file in c:\MyHDFstuff\hdf5 directory.
 
+   To use automatic testing batch file, you must build both HDF5 
+   release and debug libraries.
+
    hdf5check batch file can be run with one of the following four
    options:
    
@@ -749,7 +753,8 @@ To build and test HDF5 C examples:
    4. We provide a batch file named testExamples.bat and an expected
       examples tests output file named testExamples_exp_output.txt
       in c:\MyHDFstuff\hdf5\examples directory for you to test HDF5
-      C examples.
+      C examples. You need to run InstallExamples.bat before running 
+      testExamples.bat. 
       
       testExamples.bat batch file has 4 options:
 
@@ -816,7 +821,8 @@ To build and test HDF5 C++ examples:
 
    4. We provide a batch file named testcppExamples.bat in
       c:\MyHDFstuff\hdf5\c++\examples directory for you to test HDF5
-      C++ examples.
+      C++ examples. You should run InstallcppExamples.bat before
+      running testcppExamples.bat.
       
       testcppExamples.bat batch file has 4 options:
 
@@ -925,6 +931,7 @@ To use HDF5 static library
 
    1) Method One
 
+    Step 1: 
     To insert the path that specifies HDF5 and Zlib, Szip header files:
 
     1. Open your VC++ project in Microsoft Visual C++ and make sure it
@@ -957,6 +964,7 @@ To use HDF5 static library
 
           c:\MyHDFstuff\hdf5\hdf5lib\include
 
+    Step 2: 
     To link the HDF5 library with your application:
 
     1. Open your VC++ project in Microsoft Visual C++ and make sure it
@@ -980,7 +988,7 @@ To use HDF5 static library
     8. (optional) repeat 1-5, to select hdf5_fortran.lib to link with
        HDF5 Fortran static library.
 
-   2) Method Two
+   2)  Method Two
 
     1. Go to Tools->Options->Directories,
 
@@ -1189,23 +1197,42 @@ Warning: When you modify the H5pubconf.h file as described below,
 ************************************************************************
 
 
-Section VI: How to build HDF5 in VS 7.0(.NET)    
+Section VI: 
+How to build HDF5 in VS 7.0(.NET) and intel 8.x with .NET environment
+
 ========================================================================
 
-We just briefly introduce you how to build HDF5 in VS 7.0(.NET);
-
-1. Open the old workspace file with the "Open solution" option,
-   .NET will automatically convert the data space file to solution file.
-2. Then find  "Build" and go to "Configuration Manager"; choose
-   "release" or "debug", then choose "build all".
-3. If you want to change some project setting, select the project and
-   right click the button to choose Properties; find the similar menu
-   there as in 6.0.
-4. You need to specify the zlib and szip include header files and 
-   libraries under Tools->Options->Projects->VC++ Directories and choose
-   Include and libraries under the category of "show directories for" to
-   add the corresponding path if you want to use compression feature
-   inside HDF5.
+We just briefly introduce you how to build HDF5 in VS 7.0(.NET)
+and intel 8.x with .NET environment
+
+1. Build HDF5 in VS 7.x(.NET)
+
+
+1.1 You need to specify the zlib and szip include header files and 
+    libraries under Tools->Options->Projects->VC++ Directories and choose
+    Include and libraries under the category of "show directories for" to
+    add the corresponding path if you want to use compression feature
+    inside HDF5.
+1.2 Open the old workspace file with the "Open solution" option,
+    .NET will ask you whether you want to convert all VS 6.0 project files 
+    to .NET corresponding project files, choose <CONVERT ALL>,
+    .NET will automatically convert the data space file to solution file.
+1.3 Then find  "Build" and go to "Configuration Manager"; choose
+    "release" or "debug", if you don't want to build C++ or Fortran libraries,
+    you need to explicitly turn off project files in the "Configuration
+    Manager" and then choose "build all".
+   
+1.4 If you want to change some project setting, select the project and
+    right click the button to choose Properties; find the similar menu
+    there as in 6.0.
+
+2. Build HDF5 in Intel 8.x with .NET environment
+
+2.1 Repeat 1.1 - 1.2 of this section. You may need to install intel 8.x version of
+    szip library.
+2.2 Right click Solution "all" in the "Solution Explorer" window, choose
+    "Convert to use Intel C++ Project System",
+2.3 Repeat 1.3 - 1.4 of this section. 
 
 NOTE: Please read section V if you do not want to use compression
       feature inside HDF5.