[svn-r13710] Added Fortran dependencies to Windows project files, and updated documentation to reflect changes.

Tested:
Visual Studio 2005 on WinXP

3 files changed, 174 insertions, 140 deletions

diff --git a/release_docs/INSTALL_Windows.txt b/release_docs/INSTALL_Windows.txt
index 3ee44a5..f846226 100644
--- a/release_docs/INSTALL_Windows.txt
+++ b/release_docs/INSTALL_Windows.txt
@@ -1493,83 +1493,31 @@ Notes:  1. For Intel Compiler users, Intel fortran Compiler 9.1 is currently
 
        Do the same thing for hdf5_hl_fortran.
 
-      1.3 Change project dependencies
+      1.3 Add project dependencies
 
 
       To check the project dependencies:
       
-      Right click the selected project, you should see "Project Dependencies" on the menu,
-      click "Project Dependencies", You should see a "Project Dependencies" panel, with
-      the selected project and the projects it depends on checked under "Depends on" list.
+      Right click the selected project, you should see "Project Dependencies" 
+      on the menu, click "Project Dependencies", You should see a "Project 
+      Dependencies" panel, with the selected project and the projects it 
+      depends on checked under "Depends on" list.
 
-      Make sure all intel fortran projects have their corrsponding dependencies as follows:
-
-      hdf5_fortran:             hdf5,                 hdf5_f90cstub
-
-      hdf5_fortrandll:          hdf5dll,              hdf5_f90cstubdll
-
-      libtest_fortran:          libtest,              libtest_fotran_lib
-
-      libtest_fortrandll:       libtest_cstubdll,     libtestD
-
-      hdf5_hl_fortran:          hdf5,                 hdf5_f90cstub,
-                                hdf5_fortran,         hdf5_hl,
-                                hdf5_hl_fortran_lib
-
-      hdf5_hl_fortrandll:       hdf5dll,              hdf5_hldll,
-                                hdf5_hl_f90cstubdll,  hdf5_fortrandll,
-                                hdf5_f90cstubdll
-
-
-      flush1_fortran:           hdf5,                 hdf5_f90cstub,
-                                hdf5_fortran,         libtest,
-                                libtest_fortran,      libtest_fortran_lib
-                                
-      flush1_fortrandll:        hdf5_f90cstubdll,     hdf5_fortrandll,
-                                hdf5dll,              libtest_fortrandll
-                                libtest_cstubdll,     libtestD
-
-      flush2_fortran:           hdf5,                 hdf5_f90cstub,
-                                hdf5_fortran,         libtest,
-                                libtest_fortran,      libtest_fortran_lib
-
-      flush2_fortrandll:        hdf5_f90cstubdll,     hdf5_fortrandll,
-                                hdf5dll,              libtest_fortrandll
-                                libtest_cstubdll,     libtestD
-                                
-      testhdf5_fortran:         hdf5,                 hdf5_f90cstub,
-                                hdf5_fortran,         libtest,
-                                libtest_fortran,      libtest_fortran_lib
-
-      testhdf5_fortrandll:      hdf5_f90cstubdll,     hdf5_fortrandll,
-                                hdf5dll,              libtest_fortrandll
-                                libtest_cstubdll,     libtestD
-
-
-
-      hl_test_image_fortran:    hdf5,                 hdf5_f90cstub,
-                                hdf5_fortran,         hdf5_hl,
-                                hdf5_hl_fortran,      hdf5_hl_fortran_lib
-
-      hl_test_image_fortrandll: hdf5dll,              hdf5_hldll,
-                                hdf5_f90cstubdll,     hdf5_fortrandll,
-                                hdf5_hl_f90cstubdll,  hdf5_hl_fortrandll
+      Each of the following projects will need libtest_fortran_lib added
+      to its list of dependencies:
       
-      hl_test_lite_fortran:     hdf5,                 hdf5_f90cstub,
-                                hdf5_fortran,         hdf5_hl,
-                                hdf5_hl_fortran,      hdf5_hl_fortran_lib
-
-      hl_test_lite_fortrandll:  hdf5dll,              hdf5_hldll,
-                                hdf5_f90cstubdll,     hdf5_fortrandll,
-                                hdf5_hl_f90cstubdll,  hdf5_hl_fortrandll
-
-      hl_test_table_fortran:    hdf5,                 hdf5_f90cstub,
-                                hdf5_fortran,         hdf5_hl,
-                                hdf5_hl_fortran,      hdf5_hl_fortran_lib
+            libtest_fortran
+            flush1_fortran
+            flush2_fortran
+            testhdf5_fortran
+            
+      Each of the following projects will need hdf5_hl_fortran_lib added
+      to its list of dependencies:
       
-      hl_test_table_fortrandll:hdf5dll,               hdf5_hldll,
-                               hdf5_f90cstubdll,      hdf5_fortrandll,
-                               hdf5_hl_f90cstubdll,   hdf5_hl_fortrandll
+            hdf5_hl_fortran
+            hl_test_image_fortran
+            hl_test_lite_fortran
+            hl_test_table_fortran
 
 
 
diff --git a/release_docs/INSTALL_Windows_Short_INTEL.TXT b/release_docs/INSTALL_Windows_Short_INTEL.TXT
index d40f436..5a53f0a 100755
--- a/release_docs/INSTALL_Windows_Short_INTEL.TXT
+++ b/release_docs/INSTALL_Windows_Short_INTEL.TXT
@@ -117,83 +117,31 @@ WARNINGS:
 
        Do the same thing for hdf5_hl_fortran.
 
-      1.3 Change project dependencies
+      1.3 Add project dependencies
 
 
       To check the project dependencies:
       
-      Right click the selected project, you should see "Project Dependencies" on the menu,
-      click "Project Dependencies", You should see a "Project Dependencies" panel, with
-      the selected project and the projects it depends on checked under "Depends on" list.
+      Right click the selected project, you should see "Project Dependencies" 
+      on the menu, click "Project Dependencies", You should see a "Project 
+      Dependencies" panel, with the selected project and the projects it 
+      depends on checked under "Depends on" list.
 
-      Make sure all intel fortran projects have their corrsponding dependencies as follows:
-
-      hdf5_fortran:             hdf5,                 hdf5_f90cstub
-
-      hdf5_fortrandll:          hdf5dll,              hdf5_f90cstubdll
-
-      libtest_fortran:          libtest,              libtest_fotran_lib
-
-      libtest_fortrandll:       libtest_cstubdll,     libtestD
-
-      hdf5_hl_fortran:          hdf5,                 hdf5_f90cstub,
-                                hdf5_fortran,         hdf5_hl,
-                                hdf5_hl_fortran_lib
-
-      hdf5_hl_fortrandll:       hdf5dll,              hdf5_hldll,
-                                hdf5_hl_f90cstubdll,  hdf5_fortrandll,
-                                hdf5_f90cstubdll
-
-
-      flush1_fortran:           hdf5,                 hdf5_f90cstub,
-                                hdf5_fortran,         libtest,
-                                libtest_fortran,      libtest_fortran_lib
-                                
-      flush1_fortrandll:        hdf5_f90cstubdll,     hdf5_fortrandll,
-                                hdf5dll,              libtest_fortrandll
-                                libtest_cstubdll,     libtestD
-
-      flush2_fortran:           hdf5,                 hdf5_f90cstub,
-                                hdf5_fortran,         libtest,
-                                libtest_fortran,      libtest_fortran_lib
-
-      flush2_fortrandll:        hdf5_f90cstubdll,     hdf5_fortrandll,
-                                hdf5dll,              libtest_fortrandll
-                                libtest_cstubdll,     libtestD
-                                
-      testhdf5_fortran:         hdf5,                 hdf5_f90cstub,
-                                hdf5_fortran,         libtest,
-                                libtest_fortran,      libtest_fortran_lib
-
-      testhdf5_fortrandll:      hdf5_f90cstubdll,     hdf5_fortrandll,
-                                hdf5dll,              libtest_fortrandll
-                                libtest_cstubdll,     libtestD
-
-
-
-      hl_test_image_fortran:    hdf5,                 hdf5_f90cstub,
-                                hdf5_fortran,         hdf5_hl,
-                                hdf5_hl_fortran,      hdf5_hl_fortran_lib
-
-      hl_test_image_fortrandll: hdf5dll,              hdf5_hldll,
-                                hdf5_f90cstubdll,     hdf5_fortrandll,
-                                hdf5_hl_f90cstubdll,  hdf5_hl_fortrandll
+      Each of the following projects will need libtest_fortran_lib added
+      to its list of dependencies:
       
-      hl_test_lite_fortran:     hdf5,                 hdf5_f90cstub,
-                                hdf5_fortran,         hdf5_hl,
-                                hdf5_hl_fortran,      hdf5_hl_fortran_lib
-
-      hl_test_lite_fortrandll:  hdf5dll,              hdf5_hldll,
-                                hdf5_f90cstubdll,     hdf5_fortrandll,
-                                hdf5_hl_f90cstubdll,  hdf5_hl_fortrandll
-
-      hl_test_table_fortran:    hdf5,                 hdf5_f90cstub,
-                                hdf5_fortran,         hdf5_hl,
-                                hdf5_hl_fortran,      hdf5_hl_fortran_lib
+            libtest_fortran
+            flush1_fortran
+            flush2_fortran
+            testhdf5_fortran
+            
+      Each of the following projects will need hdf5_hl_fortran_lib added
+      to its list of dependencies:
       
-      hl_test_table_fortrandll:hdf5dll,               hdf5_hldll,
-                               hdf5_f90cstubdll,      hdf5_fortrandll,
-                               hdf5_hl_f90cstubdll,   hdf5_hl_fortrandll
+            hdf5_hl_fortran
+            hl_test_image_fortran
+            hl_test_lite_fortran
+            hl_test_table_fortran
 
 
 
diff --git a/windows/proj/all/all.dsw b/windows/proj/all/all.dsw
index 61a8d05..d3a8c26 100755
--- a/windows/proj/all/all.dsw
+++ b/windows/proj/all/all.dsw
@@ -1256,6 +1256,15 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name libtest_fortran

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5_f90cstub

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name libtest

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -1277,6 +1286,15 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name libtest_fortrandll

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5dll

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name libtest_cstubdll

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name libtestD

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -1331,6 +1349,15 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name hdf5_fortran

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5_f90cstub

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name libtest

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -1352,6 +1379,15 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name libtest_fortrandll

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5dll

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name libtest_cstubdll

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name libtestD

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -2087,6 +2123,9 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name hdf5_f90cstub

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -2102,6 +2141,9 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name hdf5_f90cstubdll

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5dll

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -2186,6 +2228,12 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name hdf5_fortran

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5_f90cstub

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -2207,6 +2255,12 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name hdf5_fortrandll

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5_f90cstubdll

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5_hldll

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -2315,6 +2369,15 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name hdf5_hl_fortran

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5_f90cstub

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5_hl

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -2333,6 +2396,18 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name hdf5_hl_fortrandll

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5_f90cstubdll

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5_hl_f90cstubdll

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5_hldll

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5dll

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -2393,6 +2468,15 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name hdf5_fortran

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5_f90cstub

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5_hl

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -2411,6 +2495,18 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name hdf5_hl_fortrandll

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5_f90cstubdll

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5_hl_f90cstubdll

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5_hldll

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5dll

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -2552,6 +2648,15 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name hdf5_hl_fortran

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5_f90cstub

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5_hl

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -2570,6 +2675,18 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name hdf5_hl_fortrandll

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5_f90cstubdll

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5_hl_f90cstubdll

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5_hldll

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5dll

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -2798,6 +2915,9 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name libtest_cstubdll

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name libtestD

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -3350,6 +3470,15 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name libtest_fortran

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5_f90cstub

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name libtest

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -3371,6 +3500,15 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name libtest_fortrandll

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name hdf5dll

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name libtest_cstubdll

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name libtestD

+    End Project Dependency

 }}}

 

 ###############################################################################