[svn-r13799] Applying Windows Fortran-specific patches suggested in Bug #879. This checkin takes care of the first two, I will look at the last one today.

Tested:
Visual Studio 2005 on WinXP

5 files changed, 17 insertions, 18 deletions

diff --git a/fortran/src/H5Dff.f90 b/fortran/src/H5Dff.f90
index 884a93e..66d2198 100644
--- a/fortran/src/H5Dff.f90
+++ b/fortran/src/H5Dff.f90
@@ -5559,7 +5559,7 @@
           SUBROUTINE h5dfill_char(fill_value, space_id, buf,  hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5dfill_integer
+!DEC$attributes dllexport :: h5dfill_char
 !DEC$endif
 
             IMPLICIT NONE
diff --git a/fortran/src/H5Pff.f90 b/fortran/src/H5Pff.f90
index fcbec7c..634c511 100644
--- a/fortran/src/H5Pff.f90
+++ b/fortran/src/H5Pff.f90
@@ -3629,7 +3629,7 @@
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5pset_fill_time_f
+!DEC$attributes dllexport :: h5pget_fill_time_f
 !DEC$endif
 !
             IMPLICIT NONE
@@ -3825,7 +3825,7 @@
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5pset_sieve_buf_size_f
+!DEC$attributes dllexport :: h5pget_sieve_buf_size_f
 !DEC$endif
 !
             IMPLICIT NONE
diff --git a/windows/installhdf5lib.bat b/windows/installhdf5lib.bat
index 3b89496..5e73159 100755
--- a/windows/installhdf5lib.bat
+++ b/windows/installhdf5lib.bat
@@ -24,6 +24,7 @@ mkdir bindll
 mkdir dll

 mkdir lib

 mkdir include

+mkdir modsdll

 cd ..

 mkdir release

 cd release

@@ -31,7 +32,8 @@ mkdir bin
 mkdir bindll

 mkdir dll

 mkdir lib

-mkdir include 

+mkdir include

+mkdir modsdll

 cd ..

 cd ..

 

@@ -97,13 +99,14 @@ copy tools\h5repartdll\release\h5repartdll.exe hdf5lib\release\bindll
 copy hl\src\*.h hdf5lib\debug\include

 copy "hl\c++\src\*.h" hdf5lib\debug\include

 copy proj\hdf5_hl_fortran\debug\*.mod  hdf5lib\debug\include

-copy proj\hdf5_hl_fortrandll\debug\*.mod  hdf5lib\debug\include

+copy proj\hdf5_hl_fortrandll\debug\*.mod  hdf5lib\debug\modsdll

 

 

 copy proj\hdf5_hl\debug\hdf5_hld.lib hdf5lib\debug\lib

 copy proj\hdf5_hl_cpp\debug\hdf5_hl_cppd.lib hdf5lib\debug\lib

 copy proj\hdf5_hl_fortran\debug\hdf5_hl_fortrand.lib hdf5lib\debug\lib

-copy proj\hdf5_hl_fortran\debug\hdf5_hl_fortran.lib hdf5lib\debug\lib

+copy proj\hdf5_hl_fortran\debug\hdf5_hl_fortran_libd.lib hdf5lib\debug\lib

+

 

 copy proj\hdf5_hldll\debug\hdf5_hldlld.lib hdf5lib\debug\dll

 copy proj\hdf5_hldll\debug\hdf5_hldlld.dll hdf5lib\debug\dll

@@ -120,12 +123,12 @@ copy proj\hdf5_hl_f90cstubdll\debug\hdf5_hl_f90cstubdlld.dll hdf5lib\debug\dll
 copy hl\src\*.h hdf5lib\release\include

 copy "hl\c++\src\*.h" hdf5lib\release\include

 copy proj\hdf5_hl_fortran\release\*.mod  hdf5lib\release\include

-copy proj\hdf5_hl_fortrandll\release\*.mod  hdf5lib\release\include

+copy proj\hdf5_hl_fortrandll\release\*.mod  hdf5lib\release\modsdll

 

 copy proj\hdf5_hl\release\hdf5_hl.lib hdf5lib\release\lib

 copy proj\hdf5_hl_cpp\release\hdf5_hl_cpp.lib hdf5lib\release\lib

-copy proj\hdf5_hl_fortran\release\hdf5_hl_fortranr.lib hdf5lib\release\lib

 copy proj\hdf5_hl_fortran\release\hdf5_hl_fortran.lib hdf5lib\release\lib

+copy proj\hdf5_hl_fortran\release\hdf5_hl_fortran_lib.lib hdf5lib\release\lib

 

 copy proj\hdf5_hldll\release\hdf5_hldll.lib hdf5lib\release\dll

 copy proj\hdf5_hldll\release\hdf5_hldll.dll hdf5lib\release\dll

@@ -158,7 +161,8 @@ rename cpp c++
 @REM Install Fortran libraries and tools

 copy proj\hdf5_fortran\debug\*.mod hdf5lib\debug\include

 copy proj\hdf5_fortran\debug\hdf5_fortrand.lib hdf5lib\debug\lib

-copy proj\hdf5_fortrandll\debug\*.mod hdf5lib\debug\include

+copy proj\hdf5_f90cstub\debug\hdf5_f90cstubd.lib hdf5lib\debug\lib

+copy proj\hdf5_fortrandll\debug\*.mod hdf5lib\debug\modsdll

 copy proj\hdf5_fortrandll\debug\hdf5_fortranddll.lib hdf5lib\debug\dll

 copy proj\hdf5_fortrandll\debug\hdf5_fortranddll.dll hdf5lib\debug\dll

 copy proj\hdf5_f90cstubdll\debug\hdf5_f90cstubddll.lib hdf5lib\debug\dll

@@ -166,8 +170,9 @@ copy proj\hdf5_f90cstubdll\debug\hdf5_f90cstubddll.dll hdf5lib\debug\dll
 

 copy proj\hdf5_fortran\release\*.mod hdf5lib\release\include

 copy proj\hdf5_fortran\release\hdf5_fortran.lib hdf5lib\release\lib

-copy proj\hdf5_fortrandll\release\*.mod hdf5lib\release\include

+copy proj\hdf5_f90cstub\release\hdf5_f90cstub.lib hdf5lib\release\lib

+copy proj\hdf5_fortrandll\release\*.mod hdf5lib\release\modsdll

 copy proj\hdf5_fortrandll\release\hdf5_fortrandll.lib hdf5lib\release\dll

 copy proj\hdf5_fortrandll\release\hdf5_fortrandll.dll hdf5lib\release\dll

 copy proj\hdf5_f90cstubdll\release\hdf5_f90cstubdll.lib hdf5lib\release\dll

-copy proj\hdf5_f90cstubdll\release\hdf5_f90cstubdll.dll hdf5lib\release\dll
\ No newline at end of file
+copy proj\hdf5_f90cstubdll\release\hdf5_f90cstubdll.dll hdf5lib\release\dll

diff --git a/windows/proj/all/all.dsw b/windows/proj/all/all.dsw
index ed057b8..c7a186b 100755
--- a/windows/proj/all/all.dsw
+++ b/windows/proj/all/all.dsw
@@ -2231,12 +2231,6 @@ 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

 }}}

 

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

diff --git a/windows/proj/hdf5_hl_fortran/hdf5_hl_fortran.dsp b/windows/proj/hdf5_hl_fortran/hdf5_hl_fortran.dsp
index 517a98c..3d7eac7 100755
--- a/windows/proj/hdf5_hl_fortran/hdf5_hl_fortran.dsp
+++ b/windows/proj/hdf5_hl_fortran/hdf5_hl_fortran.dsp
@@ -52,7 +52,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"..\..\..\proj\hdf5_hl_fortran\Release\hdf5_hl_fortranr.lib"

++# ADD LIB32 /nologo /out:"..\..\..\proj\hdf5_hl_fortran\Release\hdf5_hl_fortran.lib"

 

 !ELSEIF  "$(CFG)" == "hdf5_hl_fortran - Win32 Debug"