mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-02-23 16:20:57 +08:00
[svn-r17471] Corrected use of _DEBUG preprocessor value in release configurations of hdf5_f90cstubdll.vcproj
Corrected debug configuration of examples project file Updated windows batch file to match the testh5diff.sh script change in rev 17466. Tested: windows
This commit is contained in:
Allen Byrne
parent
dd68ba15ea
commit
5a5ca3f12c
@ -198,7 +198,7 @@
|
||||
Name="Debug|Win32"
|
||||
OutputDirectory="..\..\..\examples\$(ProjectName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="$(OutDir)"
|
||||
ConfigurationType="10"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||
@ -210,11 +210,74 @@
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
TargetEnvironment="3"
|
||||
TypeLibraryName=".\Debug/allexamples.tlb"
|
||||
HeaderFileName=""
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
|
||||
RuntimeLibrary="1"
|
||||
UsePrecompiledHeader="0"
|
||||
PrecompiledHeaderFile=".\Debug/allexamples.pch"
|
||||
AssemblerListingLocation=".\Debug/"
|
||||
ObjectFile=".\Debug/"
|
||||
ProgramDataBaseFileName=".\Debug/"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="3"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
Culture="1033"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
OutputFile=".\Debug/allexamples.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile=".\Debug/allexamples.pdb"
|
||||
SubSystem="1"
|
||||
TargetMachine="17"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
|
||||
@ -52,7 +52,7 @@
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\src"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"
|
||||
StringPooling="true"
|
||||
RuntimeLibrary="2"
|
||||
EnableFunctionLevelLinking="true"
|
||||
@ -146,7 +146,7 @@
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\src"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"
|
||||
StringPooling="true"
|
||||
RuntimeLibrary="2"
|
||||
EnableFunctionLevelLinking="true"
|
||||
|
||||
@ -381,8 +381,8 @@ rem ############################################################################
|
||||
call :tooltest h5diff_607.txt -d "1" %file1% %file2% g1/dset3 g1/dset4
|
||||
|
||||
rem 6.8: repeated option
|
||||
call :testing %h5diff% -d 1 -d 2 %srcfile1% %srcfile2% g1/dset3 g1/dset4
|
||||
call :tooltest h5diff_608.txt -d 1 -d 2 %file1% %file2% g1/dset3 g1/dset4
|
||||
call :testing %h5diff% --use-system-epsilon %srcfile1% %srcfile2% g1/dset3 g1/dset4
|
||||
call :tooltest h5diff_608.txt --use-system-epsilon %file1% %file2% g1/dset3 g1/dset4
|
||||
|
||||
rem 6.9: number larger than biggest difference
|
||||
call :testing %h5diff% -d 200 %srcfile1% %srcfile2% g1/dset3 g1/dset4
|
||||
@ -432,13 +432,10 @@ rem ############################################################################
|
||||
call :tooltest h5diff_619.txt -p 0.005 %file1% %file2% g1/dset3 g1/dset4
|
||||
|
||||
|
||||
|
||||
rem ##############################################################################
|
||||
rem # -n
|
||||
rem ##############################################################################
|
||||
|
||||
|
||||
|
||||
rem 6.21: negative value
|
||||
call :testing %h5diff% -n -4 %srcfile1% %srcfile2% g1/dset3 g1/dset4
|
||||
call :tooltest h5diff_621.txt -n -4 %file1% %file2% g1/dset3 g1/dset4
|
||||
@ -471,6 +468,7 @@ rem ############################################################################
|
||||
call :testing %h5diff% -n 1 %srcfile1% %srcfile2% g1/dset3 g1/dset4
|
||||
call :tooltest h5diff_628.txt -n 1 %file1% %file2% g1/dset3 g1/dset4
|
||||
|
||||
rem This is disabled on *nix platforms
|
||||
rem 6.29 non valid files
|
||||
call :testing %h5diff% file1.h6 file2.h6
|
||||
call :tooltest h5diff_629.txt file1.h6 file2.h6
|
||||
@ -493,7 +491,7 @@ rem ############################################################################
|
||||
|
||||
rem 10. read by hyperslab, print indexes
|
||||
rem ##############################################################################
|
||||
rem Not tested on windows as this has not been a problem - ADB 1/22/2009
|
||||
rem Not skipped on windows as this has not been a problem - ADB 1/22/2009
|
||||
rem if test -n "$pmode" -a "$mydomainname" = hdfgroup.uiuc.edu; then
|
||||
rem # skip this test which sometimes hangs in some THG machines
|
||||
rem SKIP -v $SRCFILE9 $SRCFILE10
|
||||
|
||||
Loading…
Reference in New Issue
Block a user