From 475ce84ae6e136111b9f47629ba8b0bd39bf40fd Mon Sep 17 00:00:00 2001 From: Scott Wegner Date: Mon, 12 May 2008 16:31:45 -0500 Subject: [svn-r14986] Purpose: Add Windows fixes for new Fortran code. Description: There were a number of small tweaks we needed to make to add the new fortran_1_8 code on Windows. We create new project files, add new source to them, add the test to our test suite, and fix a few typos in the Windows-specific source code. Tested: VS2005 on WinXP --- MANIFEST | 2 + fortran/src/H5Lff.f90 | 2 +- fortran/src/H5Pff.f90 | 2 +- fortran/test/tf.f90 | 2 +- windows/fortran/test/checkfortrantests.bat | 2 + .../testhdf5_fortran_1_8.vfproj | 52 ++++++++++++++++++++++ .../testhdf5_fortran_1_8dll.vfproj | 52 ++++++++++++++++++++++ windows/proj/all_fortran/all_fortran.sln | 34 ++++++++++++++ windows/proj/hdf5_f90cstub/hdf5_f90cstub.vcproj | 8 ++++ .../proj/hdf5_f90cstubdll/hdf5_f90cstubdll.vcproj | 8 ++++ windows/proj/hdf5_fortran/hdf5_fortran.vfproj | 2 + .../proj/hdf5_fortrandll/hdf5_fortrandll.vfproj | 2 + 12 files changed, 165 insertions(+), 3 deletions(-) create mode 100644 windows/fortran/test/testhdf5_fortran_1_8/testhdf5_fortran_1_8.vfproj create mode 100644 windows/fortran/test/testhdf5_fortran_1_8dll/testhdf5_fortran_1_8dll.vfproj diff --git a/MANIFEST b/MANIFEST index 22aafe3..3c677a9 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1783,6 +1783,8 @@ ./windows/fortran/test/libtest_fortran/libtest_fortran.vfproj ./windows/fortran/test/libtest_fortrandll/libtest_fortrandll.vfproj ./windows/fortran/test/testhdf5_fortran/testhdf5_fortran.vfproj +./windows/fortran/test/testhdf5_fortran_1_8/testhdf5_fortran_1_8.vfproj +./windows/fortran/test/testhdf5_fortran_1_8dll/testhdf5_fortran_1_8dll.vfproj ./windows/fortran/test/testhdf5_fortrandll/testhdf5_fortrandll.vfproj # High-Leve C++ Tests diff --git a/fortran/src/H5Lff.f90 b/fortran/src/H5Lff.f90 index 1f7bceb..98d7729 100644 --- a/fortran/src/H5Lff.f90 +++ b/fortran/src/H5Lff.f90 @@ -55,7 +55,7 @@ CONTAINS ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) -!DEC$attributes dllexport :: h5lcopy +!DEC$attributes dllexport :: h5lcopy_f !DEC$endif ! IMPLICIT NONE diff --git a/fortran/src/H5Pff.f90 b/fortran/src/H5Pff.f90 index 8e5c420..d24f79d 100644 --- a/fortran/src/H5Pff.f90 +++ b/fortran/src/H5Pff.f90 @@ -7120,7 +7120,7 @@ ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) -!DEC$attributes dllexport :: h5pset_attr_creation_order_f +!DEC$attributes dllexport :: h5pset_char_encoding_f !DEC$endif ! IMPLICIT NONE diff --git a/fortran/test/tf.f90 b/fortran/test/tf.f90 index eb033b6..1cbac24 100644 --- a/fortran/test/tf.f90 +++ b/fortran/test/tf.f90 @@ -64,7 +64,7 @@ END SUBROUTINE verifyLogical !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) -!DEC$attributes dllexport :: verifyLogical +!DEC$attributes dllexport :: verifyString !DEC$endif SUBROUTINE verifyString(string, value,correct_value,total_error) CHARACTER(LEN=*) :: string diff --git a/windows/fortran/test/checkfortrantests.bat b/windows/fortran/test/checkfortrantests.bat index db17437..2b970f6 100644 --- a/windows/fortran/test/checkfortrantests.bat +++ b/windows/fortran/test/checkfortrantests.bat @@ -79,6 +79,8 @@ rem on it for sending parameters. --SJW 9/6/07 call :add_test testhdf5_fortran%2 .\testhdf5_fortran%2\%1 call :add_test flush1_fortran%2 .\flush1_fortran%2\%1 call :add_test flush2_fortran%2 .\flush2_fortran%2\%1 + call :add_test testhdf5_fortran_1_8%2 .\testhdf5_fortran_1_8%2\%1 + rem Run the tests, passing in which version to run diff --git a/windows/fortran/test/testhdf5_fortran_1_8/testhdf5_fortran_1_8.vfproj b/windows/fortran/test/testhdf5_fortran_1_8/testhdf5_fortran_1_8.vfproj new file mode 100644 index 0000000..52bf6fd --- /dev/null +++ b/windows/fortran/test/testhdf5_fortran_1_8/testhdf5_fortran_1_8.vfproj @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windows/fortran/test/testhdf5_fortran_1_8dll/testhdf5_fortran_1_8dll.vfproj b/windows/fortran/test/testhdf5_fortran_1_8dll/testhdf5_fortran_1_8dll.vfproj new file mode 100644 index 0000000..441e17d --- /dev/null +++ b/windows/fortran/test/testhdf5_fortran_1_8dll/testhdf5_fortran_1_8dll.vfproj @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windows/proj/all_fortran/all_fortran.sln b/windows/proj/all_fortran/all_fortran.sln index e7712e2..2ab5036 100644 --- a/windows/proj/all_fortran/all_fortran.sln +++ b/windows/proj/all_fortran/all_fortran.sln @@ -1261,6 +1261,24 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "H5match_types", "..\..\misc {4D3CE514-F22D-4FBC-82FF-7A3BE15DAE10} = {4D3CE514-F22D-4FBC-82FF-7A3BE15DAE10} EndProjectSection EndProject +Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "testhdf5_fortran_1_8", "..\..\fortran\test\testhdf5_fortran_1_8\testhdf5_fortran_1_8.vfproj", "{04B72E84-6A91-4AF1-BFCD-110CD4F67E2C}" + ProjectSection(ProjectDependencies) = postProject + {CF055FEA-4433-439A-9688-BFD73D260706} = {CF055FEA-4433-439A-9688-BFD73D260706} + {26F2FDA4-17DC-4E1A-B9AC-124C460A4391} = {26F2FDA4-17DC-4E1A-B9AC-124C460A4391} + {2B93688D-D766-4295-ABFA-003CF905F8D8} = {2B93688D-D766-4295-ABFA-003CF905F8D8} + {84571A5E-D9A6-4672-9F86-3F8E32C93FDF} = {84571A5E-D9A6-4672-9F86-3F8E32C93FDF} + {26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7} + EndProjectSection +EndProject +Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "testhdf5_fortran_1_8dll", "..\..\fortran\test\testhdf5_fortran_1_8dll\testhdf5_fortran_1_8dll.vfproj", "{531839A0-AFE6-482A-BF60-29890B89D4BF}" + ProjectSection(ProjectDependencies) = postProject + {71C6994C-3102-4A2A-B0AE-88A590CB36CE} = {71C6994C-3102-4A2A-B0AE-88A590CB36CE} + {1063E387-0167-411C-85B9-96B043C4BDB3} = {1063E387-0167-411C-85B9-96B043C4BDB3} + {668327AB-1F82-46EE-A157-CD79AB8BF323} = {668327AB-1F82-46EE-A157-CD79AB8BF323} + {C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF} + {1BFA0FE4-B924-4325-9EA1-3CB26BBAE31C} = {1BFA0FE4-B924-4325-9EA1-3CB26BBAE31C} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -2705,6 +2723,22 @@ Global {B6430FB3-3BEF-48C3-84DD-98106C6F6113}.Release|Win32.Build.0 = Release|Win32 {B6430FB3-3BEF-48C3-84DD-98106C6F6113}.Release|x64.ActiveCfg = Release|x64 {B6430FB3-3BEF-48C3-84DD-98106C6F6113}.Release|x64.Build.0 = Release|x64 + {04B72E84-6A91-4AF1-BFCD-110CD4F67E2C}.Debug|Win32.ActiveCfg = Debug|Win32 + {04B72E84-6A91-4AF1-BFCD-110CD4F67E2C}.Debug|Win32.Build.0 = Debug|Win32 + {04B72E84-6A91-4AF1-BFCD-110CD4F67E2C}.Debug|x64.ActiveCfg = Debug|x64 + {04B72E84-6A91-4AF1-BFCD-110CD4F67E2C}.Debug|x64.Build.0 = Debug|x64 + {04B72E84-6A91-4AF1-BFCD-110CD4F67E2C}.Release|Win32.ActiveCfg = Release|Win32 + {04B72E84-6A91-4AF1-BFCD-110CD4F67E2C}.Release|Win32.Build.0 = Release|Win32 + {04B72E84-6A91-4AF1-BFCD-110CD4F67E2C}.Release|x64.ActiveCfg = Release|x64 + {04B72E84-6A91-4AF1-BFCD-110CD4F67E2C}.Release|x64.Build.0 = Release|x64 + {531839A0-AFE6-482A-BF60-29890B89D4BF}.Debug|Win32.ActiveCfg = Debug|Win32 + {531839A0-AFE6-482A-BF60-29890B89D4BF}.Debug|Win32.Build.0 = Debug|Win32 + {531839A0-AFE6-482A-BF60-29890B89D4BF}.Debug|x64.ActiveCfg = Debug|x64 + {531839A0-AFE6-482A-BF60-29890B89D4BF}.Debug|x64.Build.0 = Debug|x64 + {531839A0-AFE6-482A-BF60-29890B89D4BF}.Release|Win32.ActiveCfg = Release|Win32 + {531839A0-AFE6-482A-BF60-29890B89D4BF}.Release|Win32.Build.0 = Release|Win32 + {531839A0-AFE6-482A-BF60-29890B89D4BF}.Release|x64.ActiveCfg = Release|x64 + {531839A0-AFE6-482A-BF60-29890B89D4BF}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/windows/proj/hdf5_f90cstub/hdf5_f90cstub.vcproj b/windows/proj/hdf5_f90cstub/hdf5_f90cstub.vcproj index 38473f9..d9e9656 100644 --- a/windows/proj/hdf5_f90cstub/hdf5_f90cstub.vcproj +++ b/windows/proj/hdf5_f90cstub/hdf5_f90cstub.vcproj @@ -693,6 +693,14 @@ + + + + + + + + + + diff --git a/windows/proj/hdf5_fortrandll/hdf5_fortrandll.vfproj b/windows/proj/hdf5_fortrandll/hdf5_fortrandll.vfproj index 2a1915f..598d8e3 100644 --- a/windows/proj/hdf5_fortrandll/hdf5_fortrandll.vfproj +++ b/windows/proj/hdf5_fortrandll/hdf5_fortrandll.vfproj @@ -52,6 +52,8 @@ + + -- cgit v0.12