[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

15 files changed, 29 insertions, 29 deletions

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"/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hldlld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile=".\..\..\..\..\hl\examples\ex_dsdll\Debug/ex_dsdll.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

diff --git a/windows/hl/examples/ex_imagesdll/ex_imagesdll.vcproj b/windows/hl/examples/ex_imagesdll/ex_imagesdll.vcproj
index 97483f5..7ec9819 100644
--- a/windows/hl/examples/ex_imagesdll/ex_imagesdll.vcproj
+++ b/windows/hl/examples/ex_imagesdll/ex_imagesdll.vcproj
@@ -38,7 +38,7 @@
 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hldlld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/ex_imagesdll.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

diff --git a/windows/hl/examples/ex_litedll/ex_litedll.vcproj b/windows/hl/examples/ex_litedll/ex_litedll.vcproj
index cf3727f..5eada93 100644
--- a/windows/hl/examples/ex_litedll/ex_litedll.vcproj
+++ b/windows/hl/examples/ex_litedll/ex_litedll.vcproj
@@ -100,7 +100,7 @@
 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hldlld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile=".\..\..\..\..\hl\examples\ex_litedll\Debug/ex_litedll.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

diff --git a/windows/hl/examples/ex_packetdll/ex_packetdll.vcproj b/windows/hl/examples/ex_packetdll/ex_packetdll.vcproj
index b497422..33a9f34 100644
--- a/windows/hl/examples/ex_packetdll/ex_packetdll.vcproj
+++ b/windows/hl/examples/ex_packetdll/ex_packetdll.vcproj
@@ -38,7 +38,7 @@
 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hldlld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile=".\..\..\..\..\hl\examples\ex_packetdll\Debug/ex_packetdll.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

diff --git a/windows/hl/examples/ex_tabledll/ex_tabledll.vcproj b/windows/hl/examples/ex_tabledll/ex_tabledll.vcproj
index 4c7cc20..ab7807b 100644
--- a/windows/hl/examples/ex_tabledll/ex_tabledll.vcproj
+++ b/windows/hl/examples/ex_tabledll/ex_tabledll.vcproj
@@ -100,7 +100,7 @@
 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hldlld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile=".\..\..\..\..\hl\examples\ex_tabledll\Debug/ex_tabledll.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

diff --git a/windows/hl/fortran/examples/ex_litedll/ex_litedll.vfproj b/windows/hl/fortran/examples/ex_litedll/ex_litedll.vfproj
index 3a892cd..b01bc47 100644
--- a/windows/hl/fortran/examples/ex_litedll/ex_litedll.vfproj
+++ b/windows/hl/fortran/examples/ex_litedll/ex_litedll.vfproj
@@ -9,7 +9,7 @@
 				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\debug/;..\..\..\..\..\proj\hdf5_hl_fortrandll\debug/" WarnArgMismatch="true" CallingConvention="callConventionCVF" ModulePath="Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtSingleThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" AdditionalOptions="/MACHINE:I386" OutputFile="..\..\..\..\..\hl\fortran\examples\ex_litedll\Debug\ex_litedll.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\..\proj\hdf5_hl_fortrandll\debug" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/ex_litedll.pdb" SubSystem="subSystemConsole" 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 hdf5_fortranddll.lib hdf5_hl_fortrandlld.lib"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" AdditionalOptions="/MACHINE:I386" OutputFile="..\..\..\..\..\hl\fortran\examples\ex_litedll\Debug\ex_litedll.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\..\proj\hdf5_hl_fortrandll\debug" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/ex_litedll.pdb" SubSystem="subSystemConsole" 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 hdf5_fortranddll.lib hdf5_hl_fortranddll.lib"/>

 				<Tool Name="VFPreLinkEventTool"/>

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

 		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\examples\ex_litedll\Release" IntermediateDirectory="..\..\..\..\..\hl\fortran\examples\ex_litedll\Release" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true" Command="c:\hdf\hdf5-18\vnet\dep_vs6\windows\hl\fortran\examples\ex_litedll\$(OUTDIR)\ex_litedll.exe">

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"/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile="..\..\..\proj\hdf5_hl_cppdll\Debug/hdf5_hl_cppdlld.dll"

+				OutputFile="..\..\..\proj\hdf5_hl_cppdll\Debug/hdf5_hl_cppddll.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

 				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile=".\..\..\..\proj\hdf5_hl_cppdll\Debug/hdf5_hl_cppdlld.pdb"

-				ImportLibrary=".\..\..\..\proj\hdf5_hl_cppdll\Debug/hdf5_hl_cppdlld.lib"

+				ProgramDatabaseFile=".\..\..\..\proj\hdf5_hl_cppdll\Debug/hdf5_hl_cppddll.pdb"

+				ImportLibrary=".\..\..\..\proj\hdf5_hl_cppdll\Debug/hdf5_hl_cppddll.lib"

 				TargetMachine="1"/>

 			<Tool

 				Name="VCMIDLTool"

diff --git a/windows/proj/hdf5_hl_f90cstubdll/hdf5_hl_f90cstubdll.vcproj b/windows/proj/hdf5_hl_f90cstubdll/hdf5_hl_f90cstubdll.vcproj
index fc305b2..5e9b31e 100644
--- a/windows/proj/hdf5_hl_f90cstubdll/hdf5_hl_f90cstubdll.vcproj
+++ b/windows/proj/hdf5_hl_f90cstubdll/hdf5_hl_f90cstubdll.vcproj
@@ -102,12 +102,12 @@
 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile="..\..\..\proj\hdf5_hl_f90cstubdll\Debug/hdf5_hl_f90cstubdlld.dll"

+				OutputFile="..\..\..\proj\hdf5_hl_f90cstubdll\Debug/hdf5_hl_f90cstubddll.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

 				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile=".\..\..\..\proj\hdf5_hl_f90cstubdll\Debug/hdf5_hl_f90cstubdlld.pdb"

-				ImportLibrary=".\..\..\..\proj\hdf5_hl_f90cstubdll\Debug/hdf5_hl_f90cstubdlld.lib"

+				ProgramDatabaseFile=".\..\..\..\proj\hdf5_hl_f90cstubdll\Debug/hdf5_hl_f90cstubddll.pdb"

+				ImportLibrary=".\..\..\..\proj\hdf5_hl_f90cstubdll\Debug/hdf5_hl_f90cstubddll.lib"

 				TargetMachine="1"/>

 			<Tool

 				Name="VCMIDLTool"

diff --git a/windows/proj/hdf5_hl_fortrandll/hdf5_hl_fortrandll.vfproj b/windows/proj/hdf5_hl_fortrandll/hdf5_hl_fortrandll.vfproj
index c232128..5674160 100644
--- a/windows/proj/hdf5_hl_fortrandll/hdf5_hl_fortrandll.vfproj
+++ b/windows/proj/hdf5_hl_fortrandll/hdf5_hl_fortrandll.vfproj
@@ -18,7 +18,7 @@
 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" AdditionalOptions="/dll" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS,BUILD_HDF5_DLL" WarnArgMismatch="true" CallingConvention="callConventionCVF" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" AdditionalOptions="/MACHINE:I386" OutputFile="..\..\..\proj\hdf5_hl_fortrandll\Debug/hdf5_hl_fortrandlld.dll" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hdf5_hl_fortrandlld.pdb" ImportLibrary="$(OUTDIR)/hdf5_hl_fortrandlld.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" AdditionalOptions="/MACHINE:I386" OutputFile="..\..\..\proj\hdf5_hl_fortrandll\Debug/hdf5_hl_fortranddll.dll" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hdf5_hl_fortranddll.pdb" ImportLibrary="$(OUTDIR)/hdf5_hl_fortranddll.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></Configurations>

 	<Files>

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 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile="..\..\..\proj\hdf5_hldll\Debug/hdf5_hldlld.dll"

+				OutputFile="..\..\..\proj\hdf5_hldll\Debug/hdf5_hlddll.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

 				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile=".\..\..\..\proj\hdf5_hldll\Debug/hdf5_hldlld.pdb"

-				ImportLibrary=".\..\..\..\proj\hdf5_hldll\Debug/hdf5_hldlld.lib"

+				ProgramDatabaseFile=".\..\..\..\proj\hdf5_hldll\Debug/hdf5_hlddll.pdb"

+				ImportLibrary=".\..\..\..\proj\hdf5_hldll\Debug/hdf5_hlddll.lib"

 				TargetMachine="1"/>

 			<Tool

 				Name="VCMIDLTool"