[svn-r14432] Purpose: Update Windows documentation concerning VS6

Details:
We no longer support Visual Studio 6.0, so we note it in the documentation.  Also, updated the path references in VS.NET documentation

4 files changed, 7 insertions, 173 deletions

diff --git a/MANIFEST b/MANIFEST
index 6c86064..4760323 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -391,7 +391,6 @@
 ./release_docs/INSTALL_VMS.txt
 ./release_docs/INSTALL_Windows.txt
 ./release_docs/INSTALL_Windows_From_Command_Line.txt
-./release_docs/INSTALL_Windows_Short_MSVS6.0.TXT
 ./release_docs/INSTALL_Windows_Short_NET.TXT
 ./release_docs/INSTALL_Windows_Short_VS2005.TXT
 ./release_docs/INSTALL_parallel
diff --git a/release_docs/INSTALL_Windows.txt b/release_docs/INSTALL_Windows.txt
index 703d2a8..ee0d033 100644
--- a/release_docs/INSTALL_Windows.txt
+++ b/release_docs/INSTALL_Windows.txt
@@ -16,7 +16,7 @@ Contents:
    Section I     :  What do we build and install
    Section II    :  How to build and test HDF5 libraries and tools
    Section III   :  How to build examples (optional)
-   Section IV    :  How to build an application using the HDF5 library  or DLL
+   Section IV    :  How to build an application using the HDF5 library or DLL
    Section V     :  How to disable Gzip(Zlib)/Szip compression
    Section VI    :  How to build HDF5 with Fortran Support
    Section VII   :  How to build Multi-threaded version of HDF5 library
@@ -151,9 +151,8 @@ Notes:
       directory, run copy_hdf.bat first and then open all.dsw under 
       hdf5/windows/proj/all to start building process.
 
-   2. Users who prefer to use Visual Studio 6.0 can follow instructions in 
-      INSTALL_Windows_Short_MSVS6.0.txt.  Note, however, that Visual Studio
-      6.0 will not be supported in future versions of HDF5.
+   2. Visual Studio 6.0 is no longer supported.  If you were previously using
+      Visual Studio 6.0, please upgrade to Visual Studio .NET or 2005.
 
    2. Users who prefer to use Visual Studio .NET can follow instructions in 
       INSTALL_Windows_Short_Net.txt.  Note, however, that Visual Studio
@@ -1372,7 +1371,7 @@ Notes: In Visual Studio 2005, the Single-threaded runtime libraries have been
        those two sections carefully before go to the following part.
 
        
-In Visual Studio 6.0 and .Net, users have the option of building multi-threaded
+In Visual Studio .NET, users have the option of building multi-threaded
 libraries by manipulating the project settings.  Otherwise, the build process
 is very much the same.  Therefore, follow the instructions below, and refer
 to the earlier sections of this document for details on building and testing.
diff --git a/release_docs/INSTALL_Windows_Short_MSVS6.0.TXT b/release_docs/INSTALL_Windows_Short_MSVS6.0.TXT
deleted file mode 100755
index 0f5aa64..0000000
--- a/release_docs/INSTALL_Windows_Short_MSVS6.0.TXT
+++ /dev/null
@@ -1,127 +0,0 @@
-************************************************************************
-*  HDF5 Build and Install Instructions for Windows XP with MSVS 6.0    *
-*                       (Short Version)                                *
-************************************************************************
-
-Notes: To ease the building process for current versions of Visual
-      Studio, 6.0 is set to be depreciated in future releases.  This
-      means that project files are being converted to .Net format, and
-      will not be backwards-compatible with Visual Studio 6.0.  
-      
-      Users who wish to continue to use Visual Studio 6.0 may choose
-      not to upgrade to future versions of HDF5.  However, it is
-      recommended that all users consider making the switch to a
-      more current version of Visual Studio.  An express version of
-      Visual Studio 2005 is available free from Microsoft, and is
-      full compatible with HDF5.
-      
-      
-
-      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 6.0 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.
-        
-WARNINGS:
-
-Please read CAREFULLY about HDF5 build and install preconditions and 
-notes in INSTALL_Windows.txt before starting below procedures.
-
-========================================================================
-               STEP 1: Building HDF5 Libraries and Tools
-========================================================================
-    
-1. Run batch file copy_hdf.bat.
- 
-   Go to  c:\MyHDFstuff\hdf5\windows and run copy_hdf.bat. 
-
-2. Open all.dsw workspace
-     
-   Open the c:\MyHDFstuff\hdf5\windows_vs6\proj\all\all.dsw workspace. 
-
-3. (Optional) Disable C++ related projects
-    
-       Remove the following projects from project "all" dependencies 
-       ONLY if you prefer not to build HDF5 C++ libraries
-        
-          dsets_cpp
-          dsets_cppdll
-          hdf5_cpp
-          hdf5_cppdll
-          testhdf5_cpp
-          testhdf5_cppdll
-          hdf5_hl_cpp
-          hdf5_hl_cppdll
-          hl_test_table_cpp
-          hl_test_table_cppdll
-        
-4. Select "Build", then Select "Set Active Configuration".
-
-   In "Project configurations", select the active configuration
-
-	    "all -- Win32 Debug"
-               
-               or
-
-	    "all -- Win32 Release"
-	        
-   Then build project "all".
-
-
-========================================================================
-               STEP 2: Testing HDF5 Libraries and Tools 
-========================================================================
-
-HDF5 libraries and tools should be tested to make sure that they were
-built correctly.
-
-HDF5 libraries and tools can be tested with hdf5check.bat batch file 
-in c:\MyHDFstuff\hdf5 directory.
-
-hdf5check.bat has four options:
-   
-   hdf5check                     test HDF5 C library and tools only
-      
-   hdf5check enablecpp           test HDF5 C/C++ libraries and tools
-         
-   
-
-Invoke a command prompt and run hdf5check with appropriate
-options.
-
-Test results are saved in two files:
-
-   c:\MyHDFstuff\hdf5\tests_results.txt   
-
-   c:\MyHDFstuff\hdf5\check_results.txt.
-
-In general, you only need to check tests_results.txt.  If all the
-tests passed, then you do not have to check check_results.txt.  
-If some tests failed, check check_results.txt can help you
-figure out what was wrong.
-
-========================================================================
-                 STEP 3: Installing HDF5 Libraries
-========================================================================
-
-Run the batch file c:\MyHDFstuff\hdf5\installhdf5lib.bat to install 
-all HDF5 libraries and tools into c:\MyHDFstuff\hdf5\hdf5lib directory.
-
-========================================================================
-               STEP 4: Building HDF5 Examples (Optional)
-========================================================================
-
-Please read about building examples in the main document, INSTALL_Windows.txt.
-Note that these instructions use Visual Studio .Net project files.  However,
-similar 6.0 project files exist in the "windows_vs6" directory.
-
-************************************************************************
-Please send email to help@hdfgroup.org for further assistance
diff --git a/release_docs/INSTALL_Windows_Short_NET.TXT b/release_docs/INSTALL_Windows_Short_NET.TXT
index 8e6252e..4b5855a 100755
--- a/release_docs/INSTALL_Windows_Short_NET.TXT
+++ b/release_docs/INSTALL_Windows_Short_NET.TXT
@@ -66,49 +66,12 @@ notes in INSTALL_Windows.txt before starting below procedures.
 
       Invoke Microsoft Visual Studio.  From the main menu, go to "File" and 
       select the "Open Solution" option. Then open the
-      c:\MyHDFstuff\hdf5\windows_vs6\proj\all\all.dsw workspace.  When prompted
-      to convert project files to Visual Studio .NET format, select "Yes to All".
+      c:\MyHDFstuff\hdf5\windows_vnet\proj\all\all.dsw workspace.
 
       You should find Windows project files listed as "all", "big", etc. on the
       left.
 
-   3. Disable Projects
-   
-      In Visual Studio .NET, we do not support building Fortran libraries.  If
-      you would like to build Fortran libraries, please read about Visual Studio
-      2005 with Intel Fortran 9.1 in the Install_Windows.txt document.
-      
-      The following projects must be disabled.  Go to "Build", "Configuration 
-      Manager", and uncheck the following for both Release and Debug builds:
-      
-        flush1_fortran
-        flush1_fortrandll
-        flush2_fortran
-        flush2_fortrandll
-        hdf5_f90cstub
-        hdf5_f90cstubdll
-        hdf5_fortran
-        hdf5_fortrandll
-        hdf5_hl_f90cstubdll
-        hdf5_hl_fortran
-        hdf5_hl_fortrandll
-        hl_test_image_fortran
-        hl_test_image_fortrandll
-        hl_test_lite_fortran
-        hl_test_lite_fortrandll
-        hl_test_table_fortran
-        hl_test_table_fortrandll
-        libtest_cstubdll
-        libtest_fortran
-        libtest_fortrandll
-        testhdf5_fortran
-        testhdf5_fortrandll
-        
-        If you don't plan on building threadsafe HDF5, disable project
-        "ttsafedll" as well.  If you would like to build threadsafe HDF5, please
-        see Install_Windows.txt.
-        
-   4. (Optional) Disable HDF5 C++ and High level C++
+   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.
@@ -147,7 +110,7 @@ notes in INSTALL_Windows.txt before starting below procedures.
    Libraries.                                                                                           
              
 
-   5. Select "Build", then Select "Configuration Manager".
+   4. Select "Build", then Select "Configuration Manager".
 
       5.1 To build debug static libraries, debug multithreaded DLLs, and tests: