[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

3 files changed, 47 insertions, 235 deletions

diff --git a/release_docs/INSTALL_Windows.txt b/release_docs/INSTALL_Windows.txt
index a24e1d5..de31747 100644
--- a/release_docs/INSTALL_Windows.txt
+++ b/release_docs/INSTALL_Windows.txt
@@ -35,11 +35,10 @@ Contents:
 Preconditions:
 
    1. Installed Microsoft Visual Studio.  This document is written for Visual
-      Studio 2005, although we also support Visual Studio 2008 as well.  Most 
-	  of the instructions are the same. We no longer support building HDF5 
-	  using Microsoft Visual Studio .NET 2003.
+      Studio 2008.  We no longer support building HDF5 
+	  using Microsoft Visual Studio .NET 2003, or Visual Studio 2005.
    
-   2. (Optional) Installed Intel Compiler 9.1 or 10.1 if you want to build HDF5 
+   2. (Optional) Installed Intel Compiler 10.1 or 11.1 if you want to build HDF5 
       Fortran libraries.
       
    3. Install Winzip or 7-zip for extracting source tarball.
@@ -67,24 +66,24 @@ Preconditions:
             c:\                              (any drive)
             MyHDFstuff\                      (any folder name)
 
-   5. Download the hdf5-1.8.x source code package and use 7zip or WinZip to
+   5. Download the hdf5-1.9.x source code package and use 7zip or WinZip to
       extract the HDF5 package into c:\MyHDFstuff.  This creates a directory 
-      called 'hdf5-1.8.x' under MyHDFstuff which contains several files and 
-      directories.  Rename "hdf5-1.8.x" to "hdf5".
+      called 'hdf5-1.9.x' under MyHDFstuff which contains several files and 
+      directories.  Rename "hdf5-1.9.x" to "hdf5".
 
    6. HDF5 provide options to do in-memory compression  within HDF5 library.  
       Currently, two external compression libraries Zlib and Szip can be used 
       with HDF5.
 
       6.1 HDF5 uses Zlib version 1.2.3 for compression and Zlib is NOT
-          distributed with HDF5 library in 1.8.x release. To use Zlib library, 
+          distributed with HDF5 library in 1.9.x release. To use Zlib library, 
           you have to install your own Zlib DLL library or go to 
           ftp://ftp.hdfgroup.org/lib-external/zlib/1.2/bin/windows
           to download the Zlib library.
 
 
       6.2 HDF5 uses Szip version 2.1 for compression and Szip compression 
-          software is provided with HDF5 products in 1.8.1 release.  To use 
+          software is provided with HDF5 products in 1.9.x release.  To use 
           Szip 2.1 library, you can download Szip source codes and binaries from
           ftp://ftp.hdfgroup.org/lib-external/szip/2.1/bin/windows
 
@@ -159,12 +158,12 @@ Preconditions:
 
 Notes:
 
-   1. As of 1.8.0, all.zip is deprecated. Users should go to hdf5/windows 
-      directory, run copy_hdf.bat first and then open all.sln under 
-      hdf5/windows/proj/all to start building process.
+   1. Users should go to hdf5/windows directory, run copy_hdf.bat first and then 
+      open all.sln under hdf5/windows/proj/all to start building process.
 
    2. Visual Studio 6.0 is no longer supported in HDF5 1.8 or later releases.
       Visual Studio .NET is no longer support in HDF5 1.8.4 or later releases.
+      Visual Studio 2005 is no longer support in HDF5 1.8.5 or later releases.
 
    3. For users who want to quickly build HDF5 library or do not want to know 
       HDF5 building and installation details, please read the 
@@ -177,14 +176,14 @@ 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 and 10.1 is currently 
-      supported-- please see Section VI.  Intel Compiler verion 7.x and 8.x are 
+   6. For Fortran users, Intel fortran Compiler 10.1 and 11.1 is currently 
+      supported-- please see Section VI.  Intel Compiler verion 9.x or earlier are 
       no longer supported.
 
    7. For users who would like to build Muti-threaded version of HDF5 library, 
       please read Section VII.
       
-   8. To build HDF5 in Visual Studio 2008, be sure to read the instructions in
+   8. To build HDF5 in Visual Studio 2010, be sure to read the instructions in
       Section XI.
       
 
@@ -255,7 +254,7 @@ STEP 1: Building HDF5 Libraries and Tools
 
    3. (Optional) Disable HDF5 C++ and High level C++
    
-      In HDF5 1.8, C++ and HL C++ libraries are built by default.  To opt-out,
+      In HDF5 1.9, C++ and HL C++ libraries are built by default.  To opt-out,
       you must explicitly disable them.
 
       3.1 Skip this step if you do want to build HDF5 High-Level C++ libraries
@@ -1112,16 +1111,13 @@ 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 and 10.1 are 
-        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 10.1 and 11.1 are 
+        currently supported-- please see below.  Intel Compiler verion 9.x and 
+        earlier are no longer supported.
 
-        2. The Compaq Fortran Compiler is no longer supported for HDF5 1.8.
+        2. The Compaq Fortran Compiler is no longer supported for HDF5 1.9.
 
-        3. Intel Fortran 9.1 works only under Visual Studio 2005 environments.
-           Visual Studio 2008 is supported only with Intel Fortran 10.1.
-        
-        4. Parallel builds should be disabled.  To do so: Go to  Tools > 
+        3. Parallel builds should be disabled.  To do so: Go to  Tools > 
            Options > Projects and Solutions > Build and Run. Set "Maximum Number
            of Parallel Project Builds" to 1.
         
@@ -1143,7 +1139,7 @@ Notes:  1. For Intel Compiler users, Intel fortran Compiler 9.1 and 10.1 are
       You have to read this part even if you want to use only Zlib
       or Szip.  You also need to read Section V.
 
-        1) Invoke Microsoft Visual Studio 2005 or 2008.
+        1) Invoke Microsoft Visual Studio.
         
         2) From the main menu, Go to Tools > Options > Intel(R) Fortran. In the 
            right panel, make sure your "Selected Compiler" is Intel Fortran.
@@ -1157,11 +1153,11 @@ Notes:  1. For Intel Compiler users, Intel fortran Compiler 9.1 and 10.1 are
         5) Then click "OK".
 
       
-1. Build with Intel Fortran Compiler 9.1 or 10.1 under Visual Studio 2005 or 2008
+1. Build with Intel Fortran Compiler 10.1 or 11.1 under Visual Studio 2008
 
   Note: This step will build HDF5 Static and DLL C and C++ Library using
         Visual Studio compiler as well as HDF5 Static and High Level 
-        Fortran Library using Intel Fortran 9.1 or 10.1 Compiler.
+        Fortran Library using Intel Fortran Compiler.
 
   1.1 Open all_fortran.sln
 
@@ -1385,10 +1381,9 @@ Notes:  1. For Intel Compiler users, Intel fortran Compiler 9.1 and 10.1 are
    Section VII : How to build Multi-threaded version of HDF5 library
 ========================================================================
 
-Notes: In Visual Studio 2005, the Single-threaded runtime libraries have been
-       depreciated, and Multi-threaded is built by default.  Therefore, no extra
+Notes: In Visual Studio 2008 Multi-threaded is built by default.  Therefore, no extra
        work needs to be done to build Multi-threaded libraries in Visual Studio
-       2005.  
+       2008.  
     
     
 ========================================================================
@@ -1571,7 +1566,7 @@ Notes: In Visual Studio 2005, the Single-threaded runtime libraries have been
             Section IX: How to build HDF5 for 64-bit Windows
 ========================================================================
 
-HDF5 can be built for 64-bit Windows in Visual Studio 2005 or 2008.  
+HDF5 can be built for 64-bit Windows in Visual Studio 2008.  
 
 Notes:
   
@@ -1584,7 +1579,7 @@ Prerequisites:
 
     1. A 64-bit Windows machine.  Either AMD64 and Itanium is supported.
     
-    2. Microsoft Visual Studio 2005 or 2008 installed with x64 Extensions.
+    2. Microsoft Visual Studio 2008 installed with x64 Extensions.
            
 
 Building:
@@ -1627,8 +1622,7 @@ Building on Windows Vista is very similar to building on Windows XP, with
 some minor changes.  Therefore, follow the build instructions above, with the
 following considerations:
 
-    1. Only Visual Studio 2005 and 2008 is currently supported on Windows Vista.
-       This is because Microsoft has ended their support for .NET.
+    1. Only Visual Studio 2008 is currently supported on Windows Vista.
        
     2. Elevated security permissions are required to test the HDF5 libraries.
        This is because DLLs are installed in the system directory.  To enable
@@ -1644,17 +1638,17 @@ following considerations:
 
 
 ========================================================================
-            Section XI: How to build HDF5 using Visual Studio 2008
+            Section XI: How to build HDF5 using Visual Studio 2010
 ========================================================================
-Building with Visual Studio 2008 is very similar to building with Visual Studio
-2005, with some minor changes.  Therefore, follow the build instructions above, 
+Building with Visual Studio 2010 is very similar to building with Visual Studio
+2008, with some minor changes.  Therefore, follow the build instructions above, 
 with the following considerations:
 
-    1. Visual Studio 2008 uses a new format for project files, but Visual Studio
-       2005 project files can be easily converted.  The HDF5 project files
+    1. Visual Studio 2010 uses a new format for project files, but Visual Studio
+       2008 project files can be easily converted.  The HDF5 project files
        will need to be converted on first use.  To do so:
        
-       1.1. Open the HDF5 Visual Studio 2005 solution file as in Section II
+       1.1. Open the HDF5 Visual Studio 2008 solution file as in Section II
             (either all.sln or all_fortran.sln if building Fortran.)
             
        1.2. You will be prompted with an automatic conversion wizard.  Click
diff --git a/release_docs/INSTALL_Windows_From_Command_Line.txt b/release_docs/INSTALL_Windows_From_Command_Line.txt
index c35fdbf..771bcf0 100755
--- a/release_docs/INSTALL_Windows_From_Command_Line.txt
+++ b/release_docs/INSTALL_Windows_From_Command_Line.txt
@@ -5,12 +5,12 @@
 Note: This instruction is written for users who would like to build HDF5
       libraries and tools from the HDF5 source code package on command
       line. We no longer support building HDF5 using Microsoft Visual 
-	  Studio .NET 2003.
+	  Studio 2005.
          
       Currently, we support:
       
       1. Building and testing HDF5 C/C++/Fortran libraries on command line with 
-         Microsoft Visual Studio 2005 or 2008 for 32- or 64-bit Windows.
+         Microsoft Visual Studio 2008 for 32- or 64-bit Windows.
       
       For all other Windows development tools, HDF5 should be built in
       the development environment.  Please refer to INSTALL_Windows.txt
@@ -37,14 +37,12 @@ notes in INSTALL_Windows.txt before starting below procedures.
    Studio.  These are generally setup when Visual Studio is installed, but you
    can verify by running the command:
         
-        echo %vs80comntools%
+        echo %vs90comntools%
         
     This should output a path similar to:
     
-        C:\Program Files\Microsoft Visual Studio 8\Common7\Tools\
-        
-    If you are using Visual Studio 2008, use "vs90comntools"
-      
+        C:\Program Files\Microsoft Visual Studio 9\Common7\Tools\
+             
    1.2 Run batch file copy_hdf.bat.
 
    Go to  c:\MyHDFstuff\hdf5\windows and run copy_hdf.bat.
@@ -81,12 +79,10 @@ notes in INSTALL_Windows.txt before starting below procedures.
          from command line.
 
         hdf5bt file takes the following options:
-              /vs8              Build HDF5 using Visual Studio 2005
               /vs9              Build HDF5 using Visual Studio 2008
-                                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
+              /ivf111           Build HDF5 Fortran using Intel Visual Fortran 11.1
               /useenv           Build HDF5 using compiler settings defined
                                 in the environment, rather than the IDE.
               /?                Help information
@@ -110,13 +106,12 @@ notes in INSTALL_Windows.txt before starting below procedures.
             directory is provided for users to build HDF5 library and 
             tools from command line.
 
-        hdf55build takes the following options:
-              /vs8              Build HDF5 using Visual Studio 2005
+        hdf5build takes the following options:
               /vs9              Build HDF5 using Visual Studio 2008
-                                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
+              /ivf111           Build HDF5 Fortran using Intel Visual Fortran 11.1
+              /nodebug          Build HDF5 release versions only
               /useenv           Build HDF5 using compiler settings defined
                                 in the environment, rather than the IDE.
               /?                Help information
@@ -148,6 +143,9 @@ notes in INSTALL_Windows.txt before starting below procedures.
                                          tools.  To use this option, HDF5 
                                          Fortran libraries must have been built.
 
+			  nodebug option can be added to any of the above options to only
+			  test the release versions.
+			  
             Invoke a command prompt window and run hdf5check with appropriate 
             option.  Users are encouraged to pipe the test output into a file.  
             You should find no "*FAILED*" marks.
diff --git a/release_docs/INSTALL_Windows_Short_VS2005.TXT b/release_docs/INSTALL_Windows_Short_VS2005.TXT
index b668581..9ed15b4 100755
--- a/release_docs/INSTALL_Windows_Short_VS2005.TXT
+++ b/release_docs/INSTALL_Windows_Short_VS2005.TXT
@@ -3,187 +3,7 @@
 *                     with Windows XP (Short Version)                  *
 ************************************************************************
 
-Notes: This short instruction is written for users who want to quickly build 
-       HDF5 library and tools from the HDF5 source code package with Microsoft 
-       Visual Studio 2005 but do not want to know HDF5 building and installation 
-       details on Windows XP.
-         
-       For detailed HDF5 build and install information, or if you have trouble 
-       following any steps in the instructions, please refer to 
-       INSTALL_Windows.txt for further information.
-      
-       For users who would like to build and test HDF5 package from the
-       command line, please refer to INSATLL_Windows_From_Command_Line.txt.
-       
-       Notes:
-       
-         1. HDF5 1.8 can also be built using Visual Studio 2005 on Windows
-            Vista.  For details, please see Section X of INSTALL_Windows.txt.
-            
-         2. 64-bit builds are also supported in Visual STudio 2005.  For details
-            please see Section IX of INSTALL_Windows.txt.
-            
-         3. Fortran libraries can be built with Visual Studio 2005 and Intel
-            Fortran 9.1.  For details, see Section VI of INSTALL_Windows.txt.
-
-WARNINGS:
-
-Please read CAREFULLY about HDF5 build and install preconditions and 
-notes in INSTALL_Windows.txt before starting below procedures.
-
-
-========================================================================
-                            Preconditions                                                           
-========================================================================                          
-
-   1. Set up path for external libraries and headers                     
-                                                                         
-      Skip this part if you don't want to use ANY compression features provided 
-      by HDF5.  Please do read Section V in INSTALL_Windows.txt.                         
-                                                                         
-      You have to read this part even if you want to only use Zlib or Szip.  You 
-      also need to read Section V in INSTALL_Windows.txt.                           
-                                                                         
-      Invoke Microsoft Visual Studio and go to "Tools" and select "Options". In 
-      the left pane of  "Option" window poped up, choose and expand "Projects", 
-      Click on "VC++ Directories".  In the right pane, Find the box "Show 
-      directories for", choose "Include files", if you can not find your Zlib 
-      and Szip header path (for example, c:\zlib123\include, c:\szip\include)
-      from the directory list, add the header path (c:\zlib123\include, 
-      c:\szip\include) to the included directories.                                                
-                                                                         
-      Find the box "Show directories for", choose "Library files", If you cannot 
-      find your Zlib and Szip library path (for example, c:\zlib123\dll, 
-      c:\szip\dll) from the directory list, add the library path 
-      (c:\zlib123\dll, c:\szip\dll) to the library directories.            
-
-========================================================================
-          Building HDF5 C/C++ Libraries with Visual Studio 2005
-========================================================================
-
-   1. Run batch file copy_hdf.bat
-
-      Go to  c:\MyHDFstuff\hdf5\windows and run copy_hdf.bat. This process will 
-      copy all the necessary batch files, windows specific source codes and 
-      text files saved under c:\MyHDFstuff\hdf5\windows directory to the 
-      corresponding directories under hdf5.
-
-   2. Invoke Microsoft Visual Studio compiler
-
-      Invoke Microsoft Visual Studio.  From the main menu, go to "File" and 
-      select the "Open Solution" option. Then open the
-      c:\MyHDFstuff\hdf5\windows\proj\all\all.sln solution if you are building
-      without Fortran libraries, or 
-      c:\MyHDFstuff\hdf5\windows\proj\all_fortran\all_fortran.sln if you would
-      like to use Fortran.
-
-      You should find Windows project files listed as "all", "big", etc. on the
-      left.
-
-
-   3. (Optional) Disable HDF5 C++ and High level C++
-   
-      In HDF5 1.8, C++ and HL C++ libraries are built by default.  To opt-out,
-      you must explicitly disable them.
-
-      3.1 Skip this step if you do want to build HDF5 High-Level C++ libraries
-
-          Go to "Project" and select "Project Dependencies".  Select "all", and 
-          disable all of the following projects:
-
-            hdf5_hl_cpp
-            hdf5_hl_cppdll
-            hl_test_table_cpp
-            hl_test_table_cppdll
-      
-      3.2 Skip this step if you do want to build HDF5 High-Level libraries
-
-          Go to "Project" and select "Project Dependencies".  Select "all", and 
-          disable all of the project files listed in the previous step, as well
-          as the following projects:
-
-             hdf5_hl
-             hdf5_hldll
-             hl_test_image
-             hl_test_imagedll
-             hl_test_lite
-             hl_test_litedll
-             hl_test_table
-             hl_test_tabledll
-             hl_test_ds
-             hl_test_dsdll
-             hl_test_packet
-             hl_test_packetdll
-   
-   Click on "OK", From the main menu, choose "Build"-> "Build" or  
-   "Rebuild ALL" to build both release and debug version of HDF5   
-   Libraries.                                                                                           
-             
-
-   4. Select "Build", then Select "Configuration Manager".
-
-      4.1 To build debug static libraries, debug multithreaded DLLs, and tests:
-
-      In "Active Solution Configuration", select "Debug". Select "Close". 
-      Select "Build" -> "Build Solution" or "Rebuild Solution" to build debug 
-      version of project "all".
-
-      4.2 To build release static libraries, multithreaded DLLs and tests:
-
-      In "Active Solution Configuration", select "Release". Select "Close". 
-      Select "Build" -> "Build Solution" or "Rebuild Solution" to build release 
-      version of project "all".
-
-      Both debug and release versions must be built.
-
-      Warning messages can be ignored.
-             
-========================================================================
-               Testing HDF5 C/C++ Libraries with VS .NET
-========================================================================
-
-HDF5 libraries and tools should be tested to make sure that they were
-built correctly. c:\MyHDFstuff\hdf5\hdf5check.bat was provided to test
-HDF5 libraries and tools.
-
-hdf5check.bat has four options:
-   
-   hdf5check                     test HDF5 C library and tools only
-      
-   hdf5check enablecpp           test HDF5 C/C++ libraries and tools
-         
-   hdf5check enablefortran       test HDF5 C/Fortran libraries and tools
-         
-   hdf5check enableall           test HDF5 C/C++/Fortran libraries and tools
-   
-
-Notes: Users who only build HDF5 C/C++ libraries ONLY have the first 
-       two options.
-
-Invoke a command prompt window and run hdf5check with appropriate option.
-Users are encouraged to pipe the test output into a file.  You should find
-no "*FAILED*" marks.
-
-If you want to test HDF5 libraries and tools one by one, please refer to
-Section II, step 2 in INSTALL_Windows.txt.
-
-
-========================================================================
-                    Installing HDF5 C/C++ Libraries
-========================================================================
-
-Run the batch file c:\MyHDFstuff\hdf5\installhdf5lib.bat to install 
-all HDF5 libraries and tools into c:\MyHDFstuff\hdf5\hdf5lib directory.
-
-========================================================================
-               Building HDF5 Examples and Applications
-========================================================================
-
-Building HDF5 Examples is Optional. Please read Section II, step 4 and 
-the following part in INSTALL_Windows.txt for detailed information.
-
-
-
+Notes: We no longer support building HDF5 using Microsoft Visual Studio 2005.
 ************************************************************************
 
 Need further assistance, send email to help@hdfgroup.org