From e2477c8d0b76325590f43be8926634f16da5f849 Mon Sep 17 00:00:00 2001 From: Scott Wegner Date: Fri, 3 Aug 2007 09:44:44 -0500 Subject: [svn-r14036] Purpose: Fix Windows debug DLL naming scheme Description: At a previous seminar, it was brought up that the naming scheme for Windows debug DLL is inconsistent. Specifically, some use *ddll, while others use *dlld. *dlld is more widely-used, so we decided this is "correct". This changes others to use this scheme, and adapts other projects / install scripts / documentation. Tested: Visual Studio .NET on WinXP --- release_docs/INSTALL_Windows.txt | 20 ++++++++++---------- windows/hl/examples/ex_dsdll/ex_dsdll.vcproj | 2 +- windows/hl/examples/ex_imagesdll/ex_imagesdll.vcproj | 2 +- windows/hl/examples/ex_litedll/ex_litedll.vcproj | 2 +- windows/hl/examples/ex_packetdll/ex_packetdll.vcproj | 2 +- windows/hl/examples/ex_tabledll/ex_tabledll.vcproj | 2 +- .../hl/fortran/examples/ex_litedll/ex_litedll.vfproj | 2 +- windows/hl/test/hl_test_dsdll/hl_test_dsdll.vcproj | 2 +- windows/install_hlcppdll.BAT | 2 +- windows/install_hldll.BAT | 2 +- windows/install_hlf90dll.bat | 4 ++-- windows/installhdf5lib.bat | 16 ++++++++-------- windows/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj | 6 +++--- .../hdf5_hl_f90cstubdll/hdf5_hl_f90cstubdll.vcproj | 6 +++--- .../hdf5_hl_fortrandll/hdf5_hl_fortrandll.vfproj | 2 +- windows/proj/hdf5_hldll/hdf5_hldll.vcproj | 6 +++--- windows_vs6/hl/examples/ex_dsdll/ex_dsdll.dsp | 2 +- .../hl/examples/ex_imagesdll/ex_imagesdll.dsp | 2 +- windows_vs6/hl/examples/ex_litedll/ex_litedll.dsp | 2 +- .../hl/examples/ex_packetdll/ex_packetdll.dsp | 2 +- windows_vs6/hl/examples/ex_tabledll/ex_tabledll.dsp | 2 +- .../hl/fortran/examples/ex_litedll/ex_litedll.dsp | 2 +- windows_vs6/hl/test/hl_test_dsdll/hl_test_dsdll.dsp | 2 +- windows_vs6/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.dsp | 2 +- .../proj/hdf5_hl_f90cstubdll/hdf5_hl_f90cstubdll.dsp | 2 +- .../proj/hdf5_hl_fortrandll/hdf5_hl_fortrandll.dsp | 2 +- windows_vs6/proj/hdf5_hldll/hdf5_hldll.dsp | 2 +- 27 files changed, 50 insertions(+), 50 deletions(-) diff --git a/release_docs/INSTALL_Windows.txt b/release_docs/INSTALL_Windows.txt index 466a5fe..5994cb2 100644 --- a/release_docs/INSTALL_Windows.txt +++ b/release_docs/INSTALL_Windows.txt @@ -361,8 +361,8 @@ STEP 1: Building HDF5 Libraries and Tools c:\MyHDFstuff\hdf5\proj\hdf5_cppdll\debug - - hdf5_cppdlld.dll- the HDF5 C++ API DLL - hdf5_cppdlld.lib - the C++ API export library + hdf5_cppddll.dll- the HDF5 C++ API DLL + hdf5_cppddll.lib - the C++ API export library and c:\MyHDFstuff\hdf5\proj\hdf5_cppdll\release - @@ -386,8 +386,8 @@ STEP 1: Building HDF5 Libraries and Tools and c:\MyHDFstuff\hdf5\proj\hdf5_hldll\Debug - - hdf5_hldlld.dll - HDF5 High Level DLL - hdf5_hldlld.lib - HDF5 High Level export Library + hdf5_hlddll.dll - HDF5 High Level DLL + hdf5_hlddll.lib - HDF5 High Level export Library The directories listed below will contain the following files ONLY when you choose to build HDF5 High Level C++ libraries: @@ -403,8 +403,8 @@ STEP 1: Building HDF5 Libraries and Tools c:\MyHDFstuff\hdf5\proj\hdf5_hl_cppdll\Release - and c:\MyHDFstuff\hdf5\proj\hdf5_hl_cppdll\Debug - - hdf5_hl_cppdlld.dll - HDF5 High Level C++ DLL - hdf5_hl_cppdlld.lib - HDF5 High Level C++ export Library + hdf5_hl_cppddll.dll - HDF5 High Level C++ DLL + hdf5_hl_cppddll.lib - HDF5 High Level C++ export Library STEP 2: Testing HDF5 Libraries and Tools @@ -611,7 +611,7 @@ We provide 2 options for users to test HDF5 libraries and tools. be copied to the system directory. c:\MyHDFstuff\hdf5\proj\hdf5_hldll\Release\hdf5_hldll.dll - c:\MyHDFstuff\hdf5\proj\hdf5_hldll\Debug\hdf5_hldlld.dll + c:\MyHDFstuff\hdf5\proj\hdf5_hldll\Debug\hdf5_hlddll.dll Run test_hdf5_hl.bat in the hdf5\hl\test directory at the command prompt as below: @@ -642,7 +642,7 @@ We provide 2 options for users to test HDF5 libraries and tools. will be copied to the system directory. c:\MyHDFstuff\hdf5\proj\hdf5_hlcppdll\Release\hdf5_hlcppdll.dll - c:\MyHDFstuff\hdf5\proj\hdf5_hlcppdll\Debug\hdf5_hlcppdlld.dll + c:\MyHDFstuff\hdf5\proj\hdf5_hlcppdll\Debug\hdf5_hlcppddll.dll Run test_hdf5_hl_cpp.bat in the hdf5\hl\c++\test directory at the command prompt as below: @@ -673,9 +673,9 @@ We provide 2 options for users to test HDF5 libraries and tools. DLLs will be copied to the system directory. c:\MyHDFstuff\hdf5\proj\hdf5_hl_f90cstubdll\Release\hdf5_hl_f90cstubdll.dll - c:\MyHDFstuff\hdf5\proj\hdf5_hl_f90cstubdll\Debug\hdf5_hl_f90cstubdlld.dll + c:\MyHDFstuff\hdf5\proj\hdf5_hl_f90cstubdll\Debug\hdf5_hl_f90cstubddll.dll c:\MyHDFstuff\hdf5\proj\hdf5_hlfortrandll\Release\hdf5_hlfortrandll.dll - c:\MyHDFstuff\hdf5\proj\hdf5_hlfortrandll\Debug\hdf5_hlfortrandlld.dll + c:\MyHDFstuff\hdf5\proj\hdf5_hlfortrandll\Debug\hdf5_hlfortranddll.dll Run test_hdf5_hl_fortran.bat in the hdf5\hl\fortran\test directory at the command prompt as below: diff --git a/windows/hl/examples/ex_dsdll/ex_dsdll.vcproj b/windows/hl/examples/ex_dsdll/ex_dsdll.vcproj index c6f6a8d..7aef8e9 100644 --- a/windows/hl/examples/ex_dsdll/ex_dsdll.vcproj +++ b/windows/hl/examples/ex_dsdll/ex_dsdll.vcproj @@ -38,7 +38,7 @@ Name="VCCustomBuildTool"/> - + diff --git a/windows/hl/test/hl_test_dsdll/hl_test_dsdll.vcproj b/windows/hl/test/hl_test_dsdll/hl_test_dsdll.vcproj index 7148b6d..c253a2f 100644 --- a/windows/hl/test/hl_test_dsdll/hl_test_dsdll.vcproj +++ b/windows/hl/test/hl_test_dsdll/hl_test_dsdll.vcproj @@ -43,7 +43,7 @@ OutputFile=".\../../../../hl/test/hl_test_dsdll/Release/hl_test_dsdll.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_hldll\hdf5_hldlld.dll" + AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_hldll\hdf5_hlddll.dll" ProgramDatabaseFile=".\../../../../hl/test/hl_test_dsdll/Release/hl_test_dsdll.pdb" SubSystem="1" TargetMachine="1"/> diff --git a/windows/install_hlcppdll.BAT b/windows/install_hlcppdll.BAT index 5dbb668..fbb2d9c 100755 --- a/windows/install_hlcppdll.BAT +++ b/windows/install_hlcppdll.BAT @@ -19,5 +19,5 @@ @ ECHO OFF copy proj\hdf5_hl_cppdll\Release\hdf5_hl_cppdll.dll %SystemRoot%\system >temp.txt -copy proj\hdf5_hl_cppdll\Debug\hdf5_hl_cppdlld.dll %SystemRoot%\system >temp.txt +copy proj\hdf5_hl_cppdll\Debug\hdf5_hl_cppddll.dll %SystemRoot%\system >temp.txt del temp.txt \ No newline at end of file diff --git a/windows/install_hldll.BAT b/windows/install_hldll.BAT index 1a67c62..18e0893 100755 --- a/windows/install_hldll.BAT +++ b/windows/install_hldll.BAT @@ -19,6 +19,6 @@ @REM Last Updated: @ ECHO OFF -copy proj\hdf5_hldll\Debug\hdf5_hldlld.dll %SystemRoot%\system >temp.txt +copy proj\hdf5_hldll\Debug\hdf5_hlddll.dll %SystemRoot%\system >temp.txt copy proj\hdf5_hldll\Release\hdf5_hldll.dll %SystemRoot%\system >temp.txt del temp.txt \ No newline at end of file diff --git a/windows/install_hlf90dll.bat b/windows/install_hlf90dll.bat index b1abd1e..14b836f 100755 --- a/windows/install_hlf90dll.bat +++ b/windows/install_hlf90dll.bat @@ -19,8 +19,8 @@ @REM Last Updated: @ECHO OFF -copy proj\hdf5_hl_fortrandll\Debug\hdf5_hl_fortrandlld.dll %SystemRoot%\system >temp.txt -copy proj\hdf5_hl_f90cstubdll\Debug\hdf5_hl_f90cstubdlld.dll %SystemRoot%\system >temp.txt +copy proj\hdf5_hl_fortrandll\Debug\hdf5_hl_fortranddll.dll %SystemRoot%\system >temp.txt +copy proj\hdf5_hl_f90cstubdll\Debug\hdf5_hl_f90cstubddll.dll %SystemRoot%\system >temp.txt copy proj\hdf5_hl_fortrandll\Release\hdf5_hl_fortrandll.dll %SystemRoot%\system >temp.txt copy proj\hdf5_hl_f90cstubdll\Release\hdf5_hl_f90cstubdll.dll %SystemRoot%\system >temp.txt diff --git a/windows/installhdf5lib.bat b/windows/installhdf5lib.bat index 5e73159..22e9cd9 100755 --- a/windows/installhdf5lib.bat +++ b/windows/installhdf5lib.bat @@ -108,17 +108,17 @@ copy proj\hdf5_hl_fortran\debug\hdf5_hl_fortrand.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 +copy proj\hdf5_hldll\debug\hdf5_hlddll.lib hdf5lib\debug\dll +copy proj\hdf5_hldll\debug\hdf5_hlddll.dll hdf5lib\debug\dll -copy proj\hdf5_hl_cppdll\debug\hdf5_hl_cppdlld.lib hdf5lib\debug\dll -copy proj\hdf5_hl_cppdll\debug\hdf5_hl_cppdlld.dll hdf5lib\debug\dll +copy proj\hdf5_hl_cppdll\debug\hdf5_hl_cppddll.lib hdf5lib\debug\dll +copy proj\hdf5_hl_cppdll\debug\hdf5_hl_cppddll.dll hdf5lib\debug\dll -copy proj\hdf5_hl_fortrandll\debug\hdf5_hl_fortrandlld.lib hdf5lib\debug\dll -copy proj\hdf5_hl_fortrandll\debug\hdf5_hl_fortrandlld.dll hdf5lib\debug\dll +copy proj\hdf5_hl_fortrandll\debug\hdf5_hl_fortranddll.lib hdf5lib\debug\dll +copy proj\hdf5_hl_fortrandll\debug\hdf5_hl_fortranddll.dll hdf5lib\debug\dll -copy proj\hdf5_hl_f90cstubdll\debug\hdf5_hl_f90cstubdlld.lib hdf5lib\debug\dll -copy proj\hdf5_hl_f90cstubdll\debug\hdf5_hl_f90cstubdlld.dll hdf5lib\debug\dll +copy proj\hdf5_hl_f90cstubdll\debug\hdf5_hl_f90cstubddll.lib hdf5lib\debug\dll +copy proj\hdf5_hl_f90cstubdll\debug\hdf5_hl_f90cstubddll.dll hdf5lib\debug\dll copy hl\src\*.h hdf5lib\release\include copy "hl\c++\src\*.h" hdf5lib\release\include diff --git a/windows/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj b/windows/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj index 3fc96eb..fa9925a 100644 --- a/windows/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj +++ b/windows/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj @@ -103,12 +103,12 @@ Name="VCCustomBuildTool"/> - + diff --git a/windows/proj/hdf5_hldll/hdf5_hldll.vcproj b/windows/proj/hdf5_hldll/hdf5_hldll.vcproj index 835f756..6445d92 100644 --- a/windows/proj/hdf5_hldll/hdf5_hldll.vcproj +++ b/windows/proj/hdf5_hldll/hdf5_hldll.vcproj @@ -104,12 +104,12 @@