[svn-r15659] Purpose: Fix Windows Fortran DLL definitions file

Description:
We recently moved the Windows-specific fortran source code into a separate file for specifying DLL exports.  However there were a couple definitions missing in the port from 1.8 to the trunk branch.  This checkin correctly includes the .def file into our Windows project, and adds the missing definitions to hdf5_fortrandll.def.

Tested:
VS2005 on WinXP

2 files changed, 45 insertions, 44 deletions

diff --git a/fortran/src/hdf5_fortrandll.def b/fortran/src/hdf5_fortrandll.def
index 4f8b7bb..501570b 100644
--- a/fortran/src/hdf5_fortrandll.def
+++ b/fortran/src/hdf5_fortrandll.def
@@ -1,11 +1,51 @@
 EXPORTS

 ; H5LIB

 H5LIB_mp_H5OPEN_F

-H5LIB_mp_H5CLOSE_F   

+H5LIB_mp_H5CLOSE_F

 H5LIB_mp_H5GET_LIBVERSION_F

 H5LIB_mp_H5CHECK_VERSION_F

 H5LIB_mp_H5GARBAGE_COLLECT_F

 H5LIB_mp_H5DONT_ATEXIT_F

+; H5_DBLE_INTERFACE

+H5_DBLE_INTERFACE_mp_H5AREAD_DOUBLE_SCALAR

+H5_DBLE_INTERFACE_mp_H5AREAD_DOUBLE_1

+H5_DBLE_INTERFACE_mp_H5AREAD_DOUBLE_2

+H5_DBLE_INTERFACE_mp_H5AREAD_DOUBLE_3

+H5_DBLE_INTERFACE_mp_H5AREAD_DOUBLE_4

+H5_DBLE_INTERFACE_mp_H5AREAD_DOUBLE_5

+H5_DBLE_INTERFACE_mp_H5AREAD_DOUBLE_6

+H5_DBLE_INTERFACE_mp_H5AREAD_DOUBLE_7

+H5_DBLE_INTERFACE_mp_H5AWRITE_DOUBLE_SCALAR

+H5_DBLE_INTERFACE_mp_H5AWRITE_DOUBLE_1

+H5_DBLE_INTERFACE_mp_H5AWRITE_DOUBLE_2

+H5_DBLE_INTERFACE_mp_H5AWRITE_DOUBLE_3

+H5_DBLE_INTERFACE_mp_H5AWRITE_DOUBLE_4

+H5_DBLE_INTERFACE_mp_H5AWRITE_DOUBLE_5

+H5_DBLE_INTERFACE_mp_H5AWRITE_DOUBLE_6

+H5_DBLE_INTERFACE_mp_H5AWRITE_DOUBLE_7

+H5_DBLE_INTERFACE_mp_H5DFILL_DOUBLE

+H5_DBLE_INTERFACE_mp_H5DREAD_DOUBLE_SCALAR

+H5_DBLE_INTERFACE_mp_H5DREAD_DOUBLE_1

+H5_DBLE_INTERFACE_mp_H5DREAD_DOUBLE_2

+H5_DBLE_INTERFACE_mp_H5DREAD_DOUBLE_3

+H5_DBLE_INTERFACE_mp_H5DREAD_DOUBLE_4

+H5_DBLE_INTERFACE_mp_H5DREAD_DOUBLE_5

+H5_DBLE_INTERFACE_mp_H5DREAD_DOUBLE_6

+H5_DBLE_INTERFACE_mp_H5DREAD_DOUBLE_7

+H5_DBLE_INTERFACE_mp_H5DWRITE_DOUBLE_SCALAR

+H5_DBLE_INTERFACE_mp_H5DWRITE_DOUBLE_1

+H5_DBLE_INTERFACE_mp_H5DWRITE_DOUBLE_2

+H5_DBLE_INTERFACE_mp_H5DWRITE_DOUBLE_3

+H5_DBLE_INTERFACE_mp_H5DWRITE_DOUBLE_4

+H5_DBLE_INTERFACE_mp_H5DWRITE_DOUBLE_5

+H5_DBLE_INTERFACE_mp_H5DWRITE_DOUBLE_6

+H5_DBLE_INTERFACE_mp_H5DWRITE_DOUBLE_7

+H5_DBLE_INTERFACE_mp_H5PGET_DOUBLE

+H5_DBLE_INTERFACE_mp_H5PSET_DOUBLE

+H5_DBLE_INTERFACE_mp_H5PSET_FILL_VALUE_DOUBLE

+H5_DBLE_INTERFACE_mp_H5PGET_FILL_VALUE_DOUBLE

+H5_DBLE_INTERFACE_mp_H5PINSERT_DOUBLE

+H5_DBLE_INTERFACE_mp_H5PREGISTER_DOUBLE

 ; H5A

 H5A_mp_H5ACREATE_F

 H5A_mp_H5AOPEN_NAME_F

@@ -26,14 +66,6 @@ H5A_mp_H5AWRITE_REAL_4
 H5A_mp_H5AWRITE_REAL_5

 H5A_mp_H5AWRITE_REAL_6

 H5A_mp_H5AWRITE_REAL_7

-H5A_mp_H5AWRITE_DOUBLE_SCALAR

-H5A_mp_H5AWRITE_DOUBLE_1

-H5A_mp_H5AWRITE_DOUBLE_2

-H5A_mp_H5AWRITE_DOUBLE_3

-H5A_mp_H5AWRITE_DOUBLE_4

-H5A_mp_H5AWRITE_DOUBLE_5

-H5A_mp_H5AWRITE_DOUBLE_6

-H5A_mp_H5AWRITE_DOUBLE_7

 H5A_mp_H5AWRITE_CHAR_SCALAR

 H5A_mp_H5AWRITE_CHAR_1

 H5A_mp_H5AWRITE_CHAR_2

@@ -58,14 +90,6 @@ H5A_mp_H5AREAD_REAL_4
 H5A_mp_H5AREAD_REAL_5

 H5A_mp_H5AREAD_REAL_6

 H5A_mp_H5AREAD_REAL_7

-H5A_mp_H5AREAD_DOUBLE_SCALAR

-H5A_mp_H5AREAD_DOUBLE_1

-H5A_mp_H5AREAD_DOUBLE_2

-H5A_mp_H5AREAD_DOUBLE_3

-H5A_mp_H5AREAD_DOUBLE_4

-H5A_mp_H5AREAD_DOUBLE_5

-H5A_mp_H5AREAD_DOUBLE_6

-H5A_mp_H5AREAD_DOUBLE_7

 H5A_mp_H5AREAD_CHAR_SCALAR

 H5A_mp_H5AREAD_CHAR_1

 H5A_mp_H5AREAD_CHAR_2

@@ -126,14 +150,6 @@ H5D_mp_H5DWRITE_REAL_4
 H5D_mp_H5DWRITE_REAL_5

 H5D_mp_H5DWRITE_REAL_6

 H5D_mp_H5DWRITE_REAL_7

-H5D_mp_H5DWRITE_DOUBLE_SCALAR

-H5D_mp_H5DWRITE_DOUBLE_1

-H5D_mp_H5DWRITE_DOUBLE_2

-H5D_mp_H5DWRITE_DOUBLE_3

-H5D_mp_H5DWRITE_DOUBLE_4

-H5D_mp_H5DWRITE_DOUBLE_5

-H5D_mp_H5DWRITE_DOUBLE_6

-H5D_mp_H5DWRITE_DOUBLE_7

 H5D_mp_H5DREAD_REFERENCE_OBJ

 H5D_mp_H5DREAD_REFERENCE_DSETREG

 H5D_mp_H5DREAD_INTEGER_SCALAR

@@ -160,14 +176,6 @@ H5D_mp_H5DREAD_REAL_4
 H5D_mp_H5DREAD_REAL_5

 H5D_mp_H5DREAD_REAL_6

 H5D_mp_H5DREAD_REAL_7

-H5D_mp_H5DREAD_DOUBLE_SCALAR

-H5D_mp_H5DREAD_DOUBLE_1

-H5D_mp_H5DREAD_DOUBLE_2

-H5D_mp_H5DREAD_DOUBLE_3

-H5D_mp_H5DREAD_DOUBLE_4

-H5D_mp_H5DREAD_DOUBLE_5

-H5D_mp_H5DREAD_DOUBLE_6

-H5D_mp_H5DREAD_DOUBLE_7

 H5D_mp_H5DGET_SPACE_F

 H5D_mp_H5DGET_TYPE_F

 H5D_mp_H5DSET_EXTENT_F

@@ -182,7 +190,6 @@ H5D_mp_H5DWRITE_VL_STRING
 H5D_mp_H5DREAD_VL_STRING

 H5D_mp_H5DFILL_INTEGER

 H5D_mp_H5DFILL_REAL

-H5D_mp_H5DFILL_DOUBLE

 H5D_mp_H5DFILL_CHAR

 H5D_mp_H5DGET_SPACE_STATUS_F

 H5D_mp_H5DCREATE_ANON_F

@@ -291,8 +298,6 @@ H5P_mp_H5PSET_FILL_VALUE_INTEGER
 H5P_mp_H5PGET_FILL_VALUE_INTEGER

 H5P_mp_H5PSET_FILL_VALUE_REAL

 H5P_mp_H5PGET_FILL_VALUE_REAL

-H5P_mp_H5PSET_FILL_VALUE_DOUBLE

-H5P_mp_H5PGET_FILL_VALUE_DOUBLE

 H5P_mp_H5PSET_FILL_VALUE_CHAR

 H5P_mp_H5PGET_FILL_VALUE_CHAR

 H5P_mp_H5PGET_VERSION_F

@@ -348,11 +353,9 @@ H5P_mp_H5PSET_HYPER_VECTOR_SIZE_F
 H5P_mp_H5PGET_HYPER_VECTOR_SIZE_F

 H5P_mp_H5PSET_INTEGER

 H5P_mp_H5PSET_REAL

-H5P_mp_H5PSET_DOUBLE

 H5P_mp_H5PSET_CHAR

 H5P_mp_H5PGET_INTEGER

 H5P_mp_H5PGET_REAL

-H5P_mp_H5PGET_DOUBLE

 H5P_mp_H5PGET_CHAR

 H5P_mp_H5PEXIST_F

 H5P_mp_H5PGET_SIZE_F

@@ -367,11 +370,9 @@ H5P_mp_H5PCLOSE_CLASS_F
 H5P_mp_H5PCREATE_CLASS_F

 H5P_mp_H5PREGISTER_INTEGER

 H5P_mp_H5PREGISTER_REAL

-H5P_mp_H5PREGISTER_DOUBLE

 H5P_mp_H5PREGISTER_CHAR

 H5P_mp_H5PINSERT_INTEGER

 H5P_mp_H5PINSERT_REAL

-H5P_mp_H5PINSERT_DOUBLE

 H5P_mp_H5PINSERT_CHAR

 H5P_mp_H5PSET_SHUFFLE_F

 H5P_mp_H5PSET_EDC_CHECK_F

diff --git a/windows/proj/hdf5_fortrandll/hdf5_fortrandll.vfproj b/windows/proj/hdf5_fortrandll/hdf5_fortrandll.vfproj
index 9cdc436..0fc6a05 100644
--- a/windows/proj/hdf5_fortrandll/hdf5_fortrandll.vfproj
+++ b/windows/proj/hdf5_fortrandll/hdf5_fortrandll.vfproj
@@ -10,7 +10,7 @@
 				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" AdditionalOptions="/dll" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS,BUILD_HDF5_DLL" FPS4Symbols="true" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\hdf5_fortranddll.dll" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(TargetDir)$(TargetName).lib" LinkDLL="true" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\hdf5_fortranddll.dll" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" ModuleDefinitionFile="..\..\..\fortran\src\hdf5_fortrandll.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(TargetDir)$(TargetName).lib" LinkDLL="true" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

 				<Tool Name="VFPreLinkEventTool"/>

 				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeDynamicLibrary" MustRebuild="true" Command="$(TargetPath)">

@@ -19,7 +19,7 @@
 				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" AdditionalOptions="/dll" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/" PreprocessorDefinitions="HDF5F90_WINDOWS,BUILD_HDF5_DLL" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\hdf5_fortrandll.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" SubSystem="subSystemWindows" ImportLibrary="$(TargetDir)$(TargetName).lib" LinkDLL="true" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\hdf5_fortrandll.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="..\..\..\fortran\src\hdf5_fortrandll.def" SubSystem="subSystemWindows" ImportLibrary="$(TargetDir)$(TargetName).lib" LinkDLL="true" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

 				<Tool Name="VFPreLinkEventTool"/>

 				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeDynamicLibrary" MustRebuild="true" Command="$(TargetPath)">

@@ -28,7 +28,7 @@
 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" AdditionalOptions="/dll" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS,BUILD_HDF5_DLL" FPS4Symbols="true" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\hdf5_fortranddll.dll" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(TargetDir)$(TargetName).lib" LinkDLL="true" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\hdf5_fortranddll.dll" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" ModuleDefinitionFile="..\..\..\fortran\src\hdf5_fortrandll.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(TargetDir)$(TargetName).lib" LinkDLL="true" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

 				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

 				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeDynamicLibrary" MustRebuild="true" Command="$(TargetPath)">

@@ -37,7 +37,7 @@
 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" AdditionalOptions="/dll" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/" PreprocessorDefinitions="HDF5F90_WINDOWS,BUILD_HDF5_DLL" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\hdf5_fortrandll.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" SubSystem="subSystemWindows" ImportLibrary="$(TargetDir)$(TargetName).lib" LinkDLL="true" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\hdf5_fortrandll.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="..\..\..\fortran\src\hdf5_fortrandll.def" SubSystem="subSystemWindows" ImportLibrary="$(TargetDir)$(TargetName).lib" LinkDLL="true" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

 				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

 				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>