summaryrefslogtreecommitdiffstats
path: root/windows/tools/h5copy
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2008-04-30 19:51:13 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2008-04-30 19:51:13 (GMT)
commitaec106e324ce20e5efb725c25a6a333c7970127b (patch)
tree234df369115a46b08037c5f385061cf58823e497 /windows/tools/h5copy
parent5773fd34bc5adf59b4530d95ac9f0c0585902803 (diff)
downloadhdf5-aec106e324ce20e5efb725c25a6a333c7970127b.zip
hdf5-aec106e324ce20e5efb725c25a6a333c7970127b.tar.gz
hdf5-aec106e324ce20e5efb725c25a6a333c7970127b.tar.bz2
[svn-r14903] Undoing change committed in r14902.
Diffstat (limited to 'windows/tools/h5copy')
-rw-r--r--windows/tools/h5copy/h5copy.vcproj17
-rw-r--r--windows/tools/h5copy/testh5copy.bat4
2 files changed, 11 insertions, 10 deletions
diff --git a/windows/tools/h5copy/h5copy.vcproj b/windows/tools/h5copy/h5copy.vcproj
index 81d0c12..c714d28 100644
--- a/windows/tools/h5copy/h5copy.vcproj
+++ b/windows/tools/h5copy/h5copy.vcproj
@@ -4,6 +4,7 @@
Version="8.00"
Name="h5copy"
ProjectGUID="{69952435-F01F-46A7-B907-A78EBC864ED7}"
+ RootNamespace="h5copy"
>
<Platforms>
<Platform
@@ -21,7 +22,7 @@
OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -75,7 +76,7 @@
Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
OutputFile="$(OutDir)\$(ProjectName).exe"
- LinkIncremental="1"
+ LinkIncremental="0"
SuppressStartupBanner="true"
IgnoreDefaultLibraryNames="libc.lib"
GenerateDebugInformation="true"
@@ -113,7 +114,7 @@
OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -168,7 +169,7 @@
Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
OutputFile="$(OutDir)\$(ProjectName).exe"
- LinkIncremental="1"
+ LinkIncremental="0"
SuppressStartupBanner="true"
IgnoreDefaultLibraryNames="libc.lib"
GenerateDebugInformation="true"
@@ -206,7 +207,7 @@
OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -261,7 +262,7 @@
Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
OutputFile="$(OutDir)\$(ProjectName).exe"
- LinkIncremental="1"
+ LinkIncremental="0"
SuppressStartupBanner="true"
IgnoreDefaultLibraryNames="libcd.lib"
ProgramDatabaseFile=".\../../../tools/h5copy/Release/h5copy.pdb"
@@ -298,7 +299,7 @@
OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -354,7 +355,7 @@
Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
OutputFile="$(OutDir)\$(ProjectName).exe"
- LinkIncremental="1"
+ LinkIncremental="0"
SuppressStartupBanner="true"
IgnoreDefaultLibraryNames="libcd.lib"
ProgramDatabaseFile=".\../../../tools/h5copy/Release/h5copy.pdb"
diff --git a/windows/tools/h5copy/testh5copy.bat b/windows/tools/h5copy/testh5copy.bat
index 8fc9f67..7b3d034 100644
--- a/windows/tools/h5copy/testh5copy.bat
+++ b/windows/tools/h5copy/testh5copy.bat
@@ -211,7 +211,7 @@ rem rem Create the expect file if it doesn't yet exist
rem call :verify_h5ls CREATED %*
rem copy %actual% %expect%
rem ) else (
- fc %expect_parsed% %actual_parsed% | find "FC: no diff" > nul
+ fc %expect_parsed% %actual_parsed% > nul
if %errorlevel% equ 0 (
call :verify_h5ls PASSED %*
) else (
@@ -305,4 +305,4 @@ rem ############################################################################
popd
endlocal & exit /b %nerrors%
- \ No newline at end of file
+