[svn-r22955] Purpose:

	Removed legacy Visual Studio solutions and projects, which will
	no longer be supported after HDF5 1.8.10.

46 files changed, 0 insertions, 18485 deletions

diff --git a/windows/tools/checktools.bat b/windows/tools/checktools.bat
deleted file mode 100644
index 87f30ca..0000000
--- a/windows/tools/checktools.bat
+++ /dev/null
@@ -1,164 +0,0 @@
-@echo off

-rem

-rem Copyright by The HDF Group.

-rem Copyright by the Board of Trustees of the University of Illinois.

-rem All rights reserved.

-rem

-rem This file is part of HDF5.  The full HDF5 copyright notice, including

-rem terms governing use, modification, and redistribution, is contained in

-rem the files COPYING and Copyright.html.  COPYING can be found at the root

-rem of the source code distribution tree; Copyright.html can be found at the

-rem root level of an installed copy of the electronic HDF5 document set and

-rem is linked from the top-level documents page.  It can also be found at

-rem http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have

-rem access to either file, you may request a copy from help@hdfgroup.org.

-rem

-rem Tests for the hdf5 tools

-rem

-rem    Created:  Scott Wegner, 9/4/07

-rem    Modified: Scott Wegner, 9/6/07

-rem

-

-setlocal enabledelayedexpansion

-pushd %~dp0

-

-set /a nerrors=0

-

-rem Clean any variables starting with "HDF5_TOOL_", as we use these for our

-rem tests.  Also clear "HDF5_TOOL_TESTS", as we will be addding all of our tests

-rem to this variable.

-rem Set at least one variable in set beforehand to avoid error message.

-rem --SJW 9/5/07

-set hdf5_tool_=foo

-for /f "tokens=1 delims==" %%a in ('set hdf5_tool_') do set %%a=

-set hdf5_tool_tests=

-

-goto main

-

-

-rem Function to add a test to the test suite.  

-rem Expects the following parameters:

-rem     %1 - Name of the tool being tested

-rem     %2 - Relative path of script

-:add_test

-

-    set hdf5_tool_tests=%hdf5_tool_tests% %1

-    set hdf5_tool_%1_test=%CD%\%2\%1

-

-    exit /b

-    

-

-rem Run all of the tests that have been added to the suite.  Print a header

-rem at the beginning of each one.  Short-circuit if a test fails.

-rem Expects the following parameters:

-rem     %1 - release or debug version

-rem     %2 - "dll" or nothing

-:run_tests

-    for %%a in (%hdf5_tool_tests%) do (

-        echo.

-        echo.************************************

-        echo.  Testing %%a ^(%1 %2^)

-        echo.************************************

-        

-        rem Only add our parameters for batch scripts.

-        call !hdf5_tool_%%a_test:.bat= %1 %2!

-        rem Exit early if test fails.

-        if errorlevel 1 (

-            set /a nerrors=!nerrors!+1

-			echo.

-			echo.************************************

-			echo.  Testing %%a ^(%1 %2^)  FAILED

-			exit /b 1

-		)

-    )

-    

-    rem If we get here, that means all of our tests passed.

-    exit /b

-

-

-rem This is where we add tests to the suite, and run them all at the end.

-rem Make sure only to run dll versions of tests you build dll for.

-rem Also make sure to add *.bat to batch scripts, as the above functions rely

-rem on it for sending parameters.  --SJW 9/6/07

-:main

-

-    rem lib tests

-    call :add_test talign%2 talign%2\%1

-

-    rem h5dump tests

-    rem Test commented because it produces output in the wrong directory.

-    rem --SJW 9/5/07

-    rem if not "%2"=="dll" (

-    rem     call :add_test h5dumptst .\testfiles\h5dumptst\%1

-    rem )

-    call :add_test testh5dump.bat .\h5dump

-    call :add_test testh5dumpxml.bat .\h5dump

-    

-    rem h5diff tests

-    rem Test commented because it produces output in the wrong directory.

-    rem --SJW 9/5/07

-    rem if not "%2"=="dll" (

-    rem     call :add_test h5difftst .\testfiles\h5difftst\%1

-    rem )

-    call :add_test testh5diff.bat .\h5diff

-

-    rem h5ls tests

-    call :add_test testh5ls.bat .\h5ls

-    

-    rem misc tests

-    rem Test commented because we don't built it on Windows

-    rem --SJW 9/5/07

-    rem call :add_test h5stat_gentest .\testfiles\h5stat_gentest%2\%1

-    call :add_test testh5repart.bat .\h5repart

-    if not "%2"=="dll" (

-        call :add_test testh5mkgrp.bat .\h5mkgrp

-    )

-    

-    rem h5import tests

-    rem Test commented because it produces output in the wrong directory.

-    rem --SJW 9/5/07

-    rem if not "%2"=="dll" (

-    rem     call :add_test h5importtest .\testfiles\h5importtest\%1

-    rem )

-    call :add_test h5importtestutil.bat .\h5import

-    

-    rem h5repack tests

-    call :add_test h5repack.bat .\h5repack

-    if not "%2"=="dll" (

-        call :add_test h5repacktst .\testfiles\h5repacktst\%1

-    )

-    

-    rem h5jam tests

-    if not "%2"=="dll" (

-        call :add_test testh5jam.bat .\h5jam

-    )

-    

-    rem h5copy tests

-    rem Test commented because we don't built it on Windows

-    rem --SJW 9/5/07

-    rem call :add_test h5stat_gentest .\testfiles\h5stat_gentest%2\%1

-    if not "%2"=="dll" (

-        call :add_test testh5copy.bat .\h5copy

-    )

-    

-    rem h5stat tests

-    rem Test commented because it produces output in the wrong directory.

-    rem --SJW 9/5/07

-    rem if not "%2"=="dll" (

-    rem     call :add_test h5repart_gentest .\testfiles\h5repart_gentest\%1

-    rem )

-    call :add_test testh5stat.bat .\h5stat

-    

-

-    rem Run the tests, passing in which version to run

-    call :run_tests %*

-        

-    if "%nerrors%"=="0" (

-		echo.All tool tests passed.

-	) else (

-        echo.** FAILED tool tests.

-    )

-        

-    popd

-    endlocal & exit /b %nerrors%

-    
\ No newline at end of file
diff --git a/windows/tools/h5copy/h5copy.vcproj b/windows/tools/h5copy/h5copy.vcproj
deleted file mode 100644
index 3e5c9db..0000000
--- a/windows/tools/h5copy/h5copy.vcproj
+++ /dev/null
@@ -1,398 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="h5copy"

-	ProjectGUID="{69952435-F01F-46A7-B907-A78EBC864ED7}"

-	RootNamespace="h5copy"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5copy/Debug/h5copy.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5copy/Debug/h5copy.pch"

-				AssemblerListingLocation=".\../../../tools/h5copy/Debug/"

-				ObjectFile=".\../../../tools/h5copy/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5copy/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5copy/Debug/h5copy.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5copy/Debug/h5copy.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5copy/Debug/h5copy.pch"

-				AssemblerListingLocation=".\../../../tools/h5copy/Debug/"

-				ObjectFile=".\../../../tools/h5copy/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5copy/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5copy/Debug/h5copy.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5copy/Release/h5copy.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5copy/Release/h5copy.pch"

-				AssemblerListingLocation=".\../../../tools/h5copy/Release/"

-				ObjectFile=".\../../../tools/h5copy/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5copy/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				ProgramDatabaseFile=".\../../../tools/h5copy/Release/h5copy.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5copy/Release/h5copy.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5copy/Release/h5copy.pch"

-				AssemblerListingLocation=".\../../../tools/h5copy/Release/"

-				ObjectFile=".\../../../tools/h5copy/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5copy/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				ProgramDatabaseFile=".\../../../tools/h5copy/Release/h5copy.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\..\tools\h5copy\h5copy.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/h5copy/testh5copy.bat b/windows/tools/h5copy/testh5copy.bat
deleted file mode 100644
index c14b505..0000000
--- a/windows/tools/h5copy/testh5copy.bat
+++ /dev/null
@@ -1,448 +0,0 @@
-@echo off

-rem

-rem Copyright by The HDF Group.

-rem Copyright by the Board of Trustees of the University of Illinois.

-rem All rights reserved.

-rem

-rem This file is part of HDF5.  The full HDF5 copyright notice, including

-rem terms governing use, modification, and redistribution, is contained in

-rem the files COPYING and Copyright.html.  COPYING can be found at the root

-rem of the source code distribution tree; Copyright.html can be found at the

-rem root level of an installed copy of the electronic HDF5 document set and

-rem is linked from the top-level documents page.  It can also be found at

-rem http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have

-rem access to either file, you may request a copy from help@hdfgroup.org.

-rem

-rem Tests for the h5copy tool

-rem

-rem    Created:  Scott Wegner, 8/16/07

-rem    Modified: Scott Wegner, 8/22/07

-rem

-

-

-rem We don't currently build DLL version of h5copy, but this test script is

-rem setup to support it if we do in the future.  --SJW 8/22/07

-

-setlocal enabledelayedexpansion

-pushd %~dp0

-

-set EXIT_SUCCESS=0

-set EXIT_FAILURE=1

-

-rem The tool name

-set h5copy=h5copy%2

-rem The path of the tool binary

-set h5copy_bin=%CD%\%1\%h5copy%

-rem The h5diff tool name

-set h5diff=h5diff%2

-rem The path of the h5diff too binary

-set h5diff_bin=%CD%\..\%h5diff%\%1\%h5diff%

-rem The h5ls tool name

-set h5ls=h5ls%2

-rem Arguments to the h5ls tool

-set h5ls_args=-Svr

-rem The path of the h5ls tool binary

-set h5ls_bin=%CD%\..\%h5ls%\%1\%h5ls%

-

-set /a nerrors=0

-set verbose=yes

-

-set srcfile1=h5copytst.h5

-set srcfile2=h5copy_ref.h5

-set hdf_ext_src_file=h5copy_extlinks_src.h5

-set hdf_ext_trg_file=h5copy_extlinks_trg.h5

-

-set indir=%CD%\testfiles

-set outdir=%CD%\..\testfiles

-

-if not exist %outdir% mkdir %outdir%

-

-goto main

-

-

-rem Print a line-line message left justified in a field of 70 characters

-rem beginning with the word "Testing".

-rem

-:testing

-    set test_msg=Testing

-    for %%a in (%*) do (

-        if %%a neq PASSED (

-        if %%a neq *FAILED* (

-            set test_msg=!test_msg! %%~nxa

-        ) )

-    )

-    set test_msg=%test_msg%                                                                

-    echo.%test_msg:~0,69% %1

-    

-    exit /b

-

-rem Print a line-line message left justified in a field of 70 characters

-rem beginning with the word "Verifying".

-rem

-:verify

-    set verify_msg=Verifying h5diff output

-    for %%a in (%*) do (

-        if %%a neq PASSED (

-        if %%a neq *FAILED* (

-            set verify_msg=!verify_msg! %%~nxa

-        ) )

-    )

-    set verify_msg=%verify_msg%                                                                

-    echo.%verify_msg:~0,69% %1

-    

-    exit /b

-

-rem Print a line-line message left justified in a field of 70 characters

-rem beginning with the word "Verifying".

-rem

-:verify_h5ls

-    set verifyh5ls_msg=Verifying h5ls file structure

-    for %%a in (%*) do (

-        if %%a neq PASSED (

-        if %%a neq *FAILED* (

-            set verifyh5ls_msg=!verifyh5ls_msg! %%~nxa

-        ) )

-    )

-    set verifyh5ls_msg=%verifyh5ls_msg%                                                                

-    echo.%verifyh5ls_msg:~0,69% %1

-    

-    exit /b

-

-    

-    

-rem Run a test and print PASS or *FAIL*. If h5copy can complete

-rem with exit status 0, consider it pass. If a test fails then increment

-rem the `nerrors' global variable.

-rem Assumed arguments:

-rem $1 is -i

-rem $2 is input file

-rem $3 is -o

-rem $4 is output file

-rem $* everything else arguments for h5copy.

-

-:tooltest

-    set runh5diff=yes

-    if "%1"=="-i" (

-        set inputfile=%2

-    ) else (

-        set runh5diff=no

-    )

-    if "%3"=="-o" (

-        set outputfile=%4

-    ) else (

-        set runh5diff=no

-    )

-    

-    (

-        echo.#############################

-        echo. output for %h5copy%  %*

-        echo.#############################

-        %h5copy_bin% %*

-    ) > output.out

-    

-    if %errorlevel% neq 0 (

-        call :testing *FAILED* %h5copy% %*

-        echo.failed result is:

-        type output.out

-        set /a nerrors=!nerrors!+1

-    ) else (

-        call :testing PASSED %h5copy% %*

-        

-        rem Clean up output file

-        if not defined HDF5_NOCLEANUP (

-            del /f output.out

-        )

-    )

-    

-    if %runh5diff% neq no (

-        call :h5difftest %inputfile% %outputfile% %7 %9

-    )

-    

-    exit /b

-    

-    

-:tooltest_fail

-    set runh5diff=yes

-    if "%1"=="-i" (

-        set inputfile=%2

-    ) else (

-        set runh5diff=no

-    )

-    if "%3"=="-o" (

-        set outputfile=%4

-    ) else (

-        set runh5diff=no

-    )

-    

-    (

-        echo.#############################

-        echo. output for %h5copy%  %*

-        echo.#############################

-        %h5copy_bin% %*

-    ) > output.out

-    

-    if %errorlevel% neq 0 (

-        call :testing *FAILED* %h5copy% %*

-        echo.failed result is:

-        type output.out

-        set /a nerrors=!nerrors!+1

-    ) else (

-        call :testing PASSED %h5copy% %*

-        

-        rem Clean up output file

-        if not defined HDF5_NOCLEANUP (

-            del /f output.out

-        )

-    )

-    

-    if %runh5diff% neq no (

-        call :h5difftest_fail %inputfile% %outputfile% %7 %9

-    )

-    

-    exit /b

-    

-    

-rem Call the h5diff tool

-rem

-:h5difftest

-    %h5diff_bin% -q %*

-    if %errorlevel% neq 0 (

-        call :verify *FAILED* %*

-        set /a nerrors=!nerrors!+1

-    ) else (

-        call :verify PASSED %*

-    )

-    

-    exit /b

-    

-    

-rem Call the h5diff tool with a call that is expected to fail

-rem

-:h5difftest_fail

-    %h5diff_bin% -q %*

-    if %errorlevel% neq 1 (

-        call :verify *FAILED* %*

-        set /a nerrors=!nerrors!+1

-    ) else (

-        call :verify PASSED %*

-    )

-    

-    exit /b

-    

-    

-rem Call the h5ls tool to verify the correct output data in the destination file

-rem

-:h5lstest

-    set expect=%indir%\%~n1.ls

-    set expect_parsed=%expect%.parsed

-    set actual=%outdir%\%~n1.out

-    set actual_parsed=%actual%.parsed

-    

-    rem Stderr is included in stdout so that the diff can detect

-    rem any unexpected output from that stream too.

-    rem

-    rem Note: The modification time and storage utilization are masked off

-    rem so that the output is more portable

-    (

-        echo.#############################

-        echo.Expected output for %h5ls% %*

-        echo.#############################

-        %h5ls_bin% %h5ls_args% %*

-    ) > %actual% 2>&1

-    

-    rem Windows doesn't have "sed" command, and parsing the files line-by-line

-    rem to emulate Unix takes a very long time.  Instead, we simply remove lines

-    rem with "Modified" or "Storage".  We also remove lines "Opened (filename) 

-    rem with sec2 driver" and "Expected output for (h5ls test)", because Windows 

-    rem paths differ from Linux.  Do this for actual and expected otput.

-    rem If there is a better alternative in the future, we should use it instead.

-    rem --SJW 8/22/07

-    for %%a in (expect actual) do (

-        findstr /v /c:"    Modified:" !%%a! > tmp.txt

-        findstr /v /c:"    Storage:" tmp.txt > tmp2.txt

-        findstr /v /b /c:"Expected output for " tmp2.txt > tmp.txt

-        findstr /v /b /c:"Opened " tmp.txt > !%%a_parsed!

-    )

-    del /f tmp.txt tmp2.txt

-        

-    rem Don't special case non-existing expected output as Linux does, because

-    rem we depend on it above to parse anyway.  It should be an error if it

-    rem doesn't exist.  --SJW 8/22/07

-rem    if not exist %expect% (

-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% > nul

-    if %errorlevel% equ 0 (

-        call :verify_h5ls PASSED %*

-    ) else (

-        call :verify_h5ls *FAILED* %*

-        echo.    Expected result ^(*.ls^) differs from actual result ^(*.out^)

-        set /a nerrors=!nerrors!+1

-        if "yes"=="%verbose%" fc %expect_parsed% %actual_parsed%

-    )

-rem    )

-    

-    rem Clean up output file

-    if not defined HDF5_NOCLEANUP (

-        for %%a in (%actual% %actual_parsed% %expect_parsed%) do del /f %%a

-    )

-    

-    exit /b

-    

-    

-    

-rem Copy single datasets of various forms from one group to another,

-rem       adding object copied to the destination file each time

-rem

-rem Assumed arguments:

-rem <none>

-:copyobjects

-    

-    set testfile=%indir%\%srcfile1%

-    set fileout=%outdir%\%srcfile1:.h5=.out.h5%

-    

-    rem Remove any output file left over from previous test run

-    del /f %fileout% 2> nul

-    

-    echo.Test copying various forms of datasets

-    call :tooltest -i %testfile% -o %fileout% -v -s simple     -d simple

-    call :tooltest -i %testfile% -o %fileout% -v -s chunk      -d chunk

-    call :tooltest -i %testfile% -o %fileout% -v -s compact    -d compact

-    call :tooltest -i %testfile% -o %fileout% -v -s compound   -d compound

-    call :tooltest -i %testfile% -o %fileout% -v -s compressed -d compressed

-    call :tooltest -i %testfile% -o %fileout% -v -s named_vl   -d named_vl

-    call :tooltest -i %testfile% -o %fileout% -v -s nested_vl  -d nested_vl

-

-    echo.Test copying dataset within group in source file to root of destination

-    call :tooltest -i %testfile% -o %fileout% -v -s grp_dsets/simple  -d simple_top

-

-    echo.Test copying ^& renaming dataset.

-    call :tooltest -i %testfile% -o %fileout% -v -s compound   -d rename

-

-    echo.Test copying empty, 'full' ^& 'nested' groups

-    call :tooltest -i %testfile% -o %fileout% -v -s grp_empty  -d grp_empty

-    call :tooltest -i %testfile% -o %fileout% -v -s grp_dsets  -d grp_dsets

-    call :tooltest -i %testfile% -o %fileout% -v -s grp_nested -d grp_nested

-

-    echo.Test copying dataset within group in source file to group in destination

-    call :tooltest -i %testfile% -o %fileout% -v -s /grp_dsets/simple  -d /grp_dsets/simple_group

-

-    echo.Test copying ^& renaming group

-    call :tooltest -i %testfile% -o %fileout% -v -s grp_dsets  -d grp_rename

-

-    echo.Test copying 'full' group hierarchy into group in destination file

-    call :tooltest -i %testfile% -o %fileout% -v -s grp_dsets  -d /grp_rename/grp_dsets

-

-    echo.Test copying objects into group hier. that doesn't exist yet in destination file

-    call :tooltest -i %testfile% -o %fileout% -vp -s simple    -d /A/B1/simple

-    call :tooltest -i %testfile% -o %fileout% -vp -s simple    -d /A/B2/simple2

-    call :tooltest -i %testfile% -o %fileout% -vp -s /grp_dsets/simple    -d /C/D/simple

-    call :tooltest -i %testfile% -o %fileout% -vp -s /grp_dsets -d /E/F/grp_dsets

-    call :tooltest -i %testfile% -o %fileout% -vp -s /grp_nested -d /G/H/grp_nested

-

-    rem Verify that the file created above is correct

-    call :h5lstest %fileout%

-

-    rem Remove output file created, if the "no cleanup" environment variable is

-    rem   not defined

-    if not defined HDF5_NOCLEANUP (

-        del /f %fileout%

-    )

-

-    exit /b

-    

-

-rem Copy references in various way.

-rem adding to the destination file each time compare the result

-rem

-rem Assumed arguments:

-rem <none>

-:copyreferences 

-

-    set testfile=%indir%\%srcfile2%

-    set fileout=%outdir%\%srcfile2:.h5=.out.h5%

-

-    rem Remove any output file left over from previous test run

-    del /f %fileout% 2> nul

-

-    echo.Test copying object and region references

-    rem echo.TOOLTEST -f ref -i $TESTFILE -o $FILEOUT -v -s / -d /COPY

-    call :tooltest -f ref -i %testfile% -o %fileout% -v -s / -d /COPY

-

-    rem Verify that the file created above is correct

-    call :h5lstest %fileout%

-

-    rem Remove output file created, if the "no cleanup" environment variable is

-    rem   not defined

-    if not defined HDF5_NOCLEANUP (

-        del /f %fileout%

-    )

-

-    exit /b

- 

-rem Copy external links.

-rem adding to the destination file each time compare the result

-rem

-rem Assumed arguments:

-rem <none>

-:copy_ext_links 

-

-    set testfile=%indir%\%hdf_ext_src_file%

-    set fileout=%outdir%\%hdf_ext_src_file:.h5=.out.h5%

-

-    rem Remove any output file left over from previous test run

-    del /f %fileout% 2> nul

-

-    echo.Test copying external link directly without -f ext

-    call :tooltest -v -i %testfile% -o %fileout% -s /group_ext/extlink_dset -d /copy1_dset

-

-    echo.Test copying external link directly with -f ext

-    call :tooltest -f ext -i %testfile% -o %fileout% -v -s /group_ext/extlink_dset -d /copy2_dset

-

-    echo.Test copying dangling external link (no obj) directly without -f ext

-    call :tooltest -v -i %testfile% -o %fileout% -s /group_ext/extlink_notyet1 -d /copy_dangle1_1

-

-    echo.Test copying dangling external link (no obj) directly with -f ext

-    call :tooltest -f ext -i %testfile% -o %fileout% -v -s /group_ext/extlink_notyet1 -d /copy_dangle1_2

-

-    echo.Test copying dangling external link (no file) directly without -f ext

-    call :tooltest -v -i %testfile% -o %fileout% -s /group_ext/extlink_notyet2 -d /copy_dangle2_1

-

-    echo.Test copying dangling external link (no file) directly with -f ext

-    call :tooltest -f ext -i %testfile% -o %fileout% -v -s /group_ext/extlink_notyet2 -d /copy_dangle2_2

-

-    echo.Test copying a group contains external links without -f ext

-    call :tooltest -v -i %testfile% -o %fileout% -s /group_ext -d /copy1_group

-

-    echo.Test copying a group contains external links with -f ext

-    call :tooltest -f ext -i %testfile% -o %fileout% -v -f ext -s /group_ext -d /copy2_group

-

-    rem Verify that the file created above is correct

-    call :h5lstest %fileout%

-

-    rem Remove output file created, if the "no cleanup" environment variable is

-    rem   not defined

-    if not defined HDF5_NOCLEANUP (

-        del /f %fileout%

-    )

-

-    exit /b

-   

-rem ##############################################################################

-rem ###           T H E   T E S T S                                            ###

-rem ##############################################################################

-

-:main

-    call :copyobjects

-    call :copyreferences

-    call :copy_ext_links

-

-    if %nerrors% equ 0 (

-        echo.All h5copy tests passed.

-    )

-    

-    popd

-    endlocal & exit /b %nerrors%

-    

diff --git a/windows/tools/h5debug/h5debug.vcproj b/windows/tools/h5debug/h5debug.vcproj
deleted file mode 100644
index 82143a9..0000000
--- a/windows/tools/h5debug/h5debug.vcproj
+++ /dev/null
@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="h5debug"

-	ProjectGUID="{BE1A0022-708E-4CC2-B01C-26BD99AB6576}"

-	RootNamespace="h5debug"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5debug/Debug/h5debug.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5debug/Debug/h5debug.pch"

-				AssemblerListingLocation=".\../../../tools/h5debug/Debug/"

-				ObjectFile=".\../../../tools/h5debug/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5debug/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5debug/Debug/h5debug.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5debug/Debug/h5debug.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5debug/Debug/h5debug.pch"

-				AssemblerListingLocation=".\../../../tools/h5debug/Debug/"

-				ObjectFile=".\../../../tools/h5debug/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5debug/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5debug/Debug/h5debug.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5debug/Release/h5debug.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5debug/Release/h5debug.pch"

-				AssemblerListingLocation=".\../../../tools/h5debug/Release/"

-				ObjectFile=".\../../../tools/h5debug/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5debug/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				ProgramDatabaseFile=".\../../../tools/h5debug/Release/h5debug.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5debug/Release/h5debug.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5debug/Release/h5debug.pch"

-				AssemblerListingLocation=".\../../../tools/h5debug/Release/"

-				ObjectFile=".\../../../tools/h5debug/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5debug/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				ProgramDatabaseFile=".\../../../tools/h5debug/Release/h5debug.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\..\tools\misc\h5debug.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/h5debugdll/h5debugdll.vcproj b/windows/tools/h5debugdll/h5debugdll.vcproj
deleted file mode 100644
index 4c9131e..0000000
--- a/windows/tools/h5debugdll/h5debugdll.vcproj
+++ /dev/null
@@ -1,388 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="h5debugdll"

-	ProjectGUID="{D10F67D0-8057-49C2-A62A-12D0C512288E}"

-	RootNamespace="h5debugdll"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5debugdll/Release/h5debugdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5debugdll/Release/h5debugdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5debugdll/Release/"

-				ObjectFile=".\../../../tools/h5debugdll/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5debugdll/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../tools/h5debugdll/Release/h5debugdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5debugdll/Release/h5debugdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5debugdll/Release/h5debugdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5debugdll/Release/"

-				ObjectFile=".\../../../tools/h5debugdll/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5debugdll/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../tools/h5debugdll/Release/h5debugdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5debugdll/Debug/h5debugdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5debugdll/Debug/h5debugdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5debugdll/Debug/"

-				ObjectFile=".\../../../tools/h5debugdll/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5debugdll/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5debugdll/Debug/h5debugdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5debugdll/Debug/h5debugdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5debugdll/Debug/h5debugdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5debugdll/Debug/"

-				ObjectFile=".\../../../tools/h5debugdll/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5debugdll/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5debugdll/Debug/h5debugdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\..\tools\misc\h5debug.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/h5diff/h5diff.vcproj b/windows/tools/h5diff/h5diff.vcproj
deleted file mode 100644
index 5e8de50..0000000
--- a/windows/tools/h5diff/h5diff.vcproj
+++ /dev/null
@@ -1,404 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="h5diff"

-	ProjectGUID="{1C5A9EC8-F882-4A8A-B773-E79CD46369AF}"

-	RootNamespace="h5diff"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5diff/Debug/h5diff.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5diff/Debug/h5diff.pch"

-				AssemblerListingLocation=".\../../../tools/h5diff/Debug/"

-				ObjectFile=".\../../../tools/h5diff/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5diff/Debug/"

-				BrowseInformation="1"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5diff/Debug/h5diff.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5diff/Debug/h5diff.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5diff/Debug/h5diff.pch"

-				AssemblerListingLocation=".\../../../tools/h5diff/Debug/"

-				ObjectFile=".\../../../tools/h5diff/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5diff/Debug/"

-				BrowseInformation="1"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5diff/Debug/h5diff.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5diff/Release/h5diff.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5diff/Release/h5diff.pch"

-				AssemblerListingLocation=".\../../../tools/h5diff/Release/"

-				ObjectFile=".\../../../tools/h5diff/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5diff/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				ProgramDatabaseFile=".\../../../tools/h5diff/Release/h5diff.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5diff/Release/h5diff.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5diff/Release/h5diff.pch"

-				AssemblerListingLocation=".\../../../tools/h5diff/Release/"

-				ObjectFile=".\../../../tools/h5diff/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5diff/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				ProgramDatabaseFile=".\../../../tools/h5diff/Release/h5diff.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\..\tools\h5diff\h5diff_common.c"

-			>

-		</File>

-		<File

-			RelativePath="..\..\..\tools\h5diff\h5diff_main.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/h5diff/testh5diff.bat b/windows/tools/h5diff/testh5diff.bat
deleted file mode 100644
index 491332f..0000000
--- a/windows/tools/h5diff/testh5diff.bat
+++ /dev/null
@@ -1,980 +0,0 @@
-@echo off

-rem

-rem Copyright by The HDF Group.

-rem Copyright by the Board of Trustees of the University of Illinois.

-rem All rights reserved.

-rem

-rem This file is part of HDF5.  The full HDF5 copyright notice, including

-rem terms governing use, modification, and redistribution, is contained in

-rem the files COPYING and Copyright.html.  COPYING can be found at the root

-rem of the source code distribution tree; Copyright.html can be found at the

-rem root level of an installed copy of the electronic HDF5 document set and

-rem is linked from the top-level documents page.  It can also be found at

-rem http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have

-rem access to either file, you may request a copy from help@hdfgroup.org.

-rem

-rem Tests for the h5diff tool

-rem

-rem    Created:  Scott Wegner, 8/22/07

-rem    Modified: Allen Byrne, 2/23/10

-rem

-

-setlocal enabledelayedexpansion

-pushd %~dp0

-

-rem ############################################################################

-rem test file names 

-rem ############################################################################

-

-set indir=%CD%\testfiles

-

-set srcfile1=h5diff_basic1.h5

-set srcfile2=h5diff_basic2.h5

-set srcfile3=h5diff_types.h5

-set srcfile4=h5diff_dtypes.h5

-set srcfile5=h5diff_attr1.h5

-set srcfile6=h5diff_attr2.h5

-set srcfile7=h5diff_dset1.h5

-set srcfile8=h5diff_dset2.h5

-set srcfile9=h5diff_hyper1.h5

-set srcfile10=h5diff_hyper2.h5

-set srcfile11=h5diff_empty.h5

-set srcfile12=h5diff_links.h5

-set srcfile13=h5diff_softlinks.h5

-set srcfile14=h5diff_linked_softlink.h5

-set srcfile15=h5diff_extlink_src.h5

-set srcfile16=h5diff_extlink_trg.h5

-set srcfile17=h5diff_ext2softlink_src.h5

-set srcfile18=h5diff_ext2softlink_trg.h5

-set srclnkfile1=h5diff_danglelinks1.h5

-set srclnkfile2=h5diff_danglelinks2.h5

-set src_grp_recurse1=h5diff_grp_recurse1.h5

-set src_grp_recurse2=h5diff_grp_recurse2.h5

-set src_grp_recurse1_ext=h5diff_grp_recurse_ext1.h5

-set src_grp_recurse2_ext1=h5diff_grp_recurse_ext2-1.h5

-set src_grp_recurse2_ext2=h5diff_grp_recurse_ext2-2.h5

-set src_grp_recurse2_ext3=h5diff_grp_recurse_ext2-3.h5

-set srcexclude1_1=h5diff_exclude1-1.h5

-set srcexclude1_2=h5diff_exclude1-2.h5

-set srcexclude2_1=h5diff_exclude2-1.h5

-set srcexclude2_2=h5diff_exclude2-2.h5

-set src_comp_vl_strs=h5diff_comp_vl_strs.h5

-set src_COMPS_ARRAY_VLEN1=compounds_array_vlen1.h5

-set src_COMPS_ARRAY_VLEN2=compounds_array_vlen2.h5

-set src_ATTR_VERBOSE_LEVEL_FILE1=h5diff_attr_v_level1.h5

-set src_ATTR_VERBOSE_LEVEL_FILE2=h5diff_attr_v_level2.h5

-

-set file1=%indir%\h5diff_basic1.h5

-set file2=%indir%\h5diff_basic2.h5

-set file3=%indir%\h5diff_types.h5

-set file4=%indir%\h5diff_dtypes.h5

-set file5=%indir%\h5diff_attr1.h5

-set file6=%indir%\h5diff_attr2.h5

-set file7=%indir%\h5diff_dset1.h5

-set file8=%indir%\h5diff_dset2.h5

-set file9=%indir%\h5diff_hyper1.h5

-set file10=%indir%\h5diff_hyper2.h5

-set file11=%indir%\h5diff_empty.h5

-set file12=%indir%\h5diff_links.h5

-set file13=%indir%\h5diff_softlinks.h5

-set file14=%indir%\h5diff_linked_softlink.h5

-set file15=%indir%\h5diff_extlink_src.h5

-set file16=%indir%\h5diff_extlink_trg.h5

-set file17=%indir%\h5diff_ext2softlink_src.h5

-set file18=%indir%\h5diff_ext2softlink_trg.h5

-set lnkfile1=%indir%\h5diff_danglelinks1.h5

-set lnkfile2=%indir%\h5diff_danglelinks2.h5

-set grp_recurse1=%indir%\h5diff_grp_recurse1.h5

-set grp_recurse2=%indir%\h5diff_grp_recurse2.h5

-set grp_recurse1_ext=%indir%\h5diff_grp_recurse_ext1.h5

-set grp_recurse2_ext1=%indir%\h5diff_grp_recurse_ext2-1.h5

-set grp_recurse2_ext2=%indir%\h5diff_grp_recurse_ext2-2.h5

-set grp_recurse2_ext3=%indir%\h5diff_grp_recurse_ext2-3.h5

-set exclude1_1=%indir%\h5diff_exclude1-1.h5

-set exclude1_2=%indir%\h5diff_exclude1-2.h5

-set exclude2_1=%indir%\h5diff_exclude2-1.h5

-set exclude2_2=%indir%\h5diff_exclude2-2.h5

-set comp_vl_strs=%indir%\h5diff_comp_vl_strs.h5

-set COMPS_ARRAY_VLEN1=%indir%\compounds_array_vlen1.h5

-set COMPS_ARRAY_VLEN2=%indir%\compounds_array_vlen2.h5

-set ATTR_VERBOSE_LEVEL_FILE1=%indir%\h5diff_attr_v_level1.h5

-set ATTR_VERBOSE_LEVEL_FILE2=%indir%\h5diff_attr_v_level2.h5

-

-

-rem The tool name

-set h5diff=h5diff%2

-rem The path of the tool binary

-set h5diff_bin=%CD%\..\%h5diff%\%1\%h5diff%

-

-set EXIT_SUCCESS=0

-set EXIT_FAILURE=1

-

-set /a nerrors=0

-set verbose=yes

-rem default to run h5diff tests

-set pmode=

-rem following not needed for windows see #10 ADB 1/22/2009

-rem mydomainname=`domainname 2>/dev/null`

-

-if not exist .\testfiles mkdir .\testfiles

-

-rem Parse options

-rem On Windows, we don't parse, because we only want to worry about

-rem debug/release and dll  --SJW 9/5/07

-

-goto main

-

-

-rem Print a line-line message left justified in a field of 70 characters

-rem beginning with the word "Testing".

-rem On Windows, simply set up the test_msg variable, so it can be printed later

-rem with the :results function.  This is because Windows doesn't support

-rem printing without a linefeed.  --SJW 6/20/08

-rem

-:testing

-    set test_msg=Testing

-    for %%a in (%*) do (

-            set test_msg=!test_msg! %%~nxa

-    )

-    set test_msg=%test_msg%                                                                

-    set test_msg=%test_msg:~0,69%

-    

-    exit /b

-

-

-rem Print the testing results.  Simply echo the contents of test_msg (set up

-rem above), along with the passed parameter, generall PASSED, FAILED, or -SKIP-

-:results

-    echo.%test_msg% %*

-    

-    exit /b

-    

-    

-    

-rem Function STDOUT_FILTER isn't technically needed on Windows, because this

-rem script will never run on platforms that require it.  However, include empty

-rem interface for consistency.  --SJW 8/22/07

-:stdout_filter

-    exit /b

-    

-

-rem Function STDERR_FILTER isn't technically needed on Windows, because this

-rem script will never run on platforms that require it.  However, include empty

-rem interface for consistency.  --SJW 8/22/07

-:stderr_filter

-    exit /b

-    

-    

-    

-rem Run a test and print PASS or *FAIL*.  If a test fails then increment

-rem the `nerrors' global variable and (if verbose is set) display the

-rem difference between the actual output and the expected output. The

-rem expected output is given as the first argument to this function and

-rem the actual output file is calculated by replacing the `.ddl' with

-rem `.out'.  The actual output is not removed if HDF5_NOCLEANUP has a

-rem non-zero value.

-rem

-:tooltest

-    set expect=%CD%\testfiles\%1

-    set actual=%CD%\testfiles\%~n1.out

-    set actual_err=%CD%\testfiles\~n1.err

-    set actual_sav=%actual%-sav

-    set actual_err_sav=%actual_err%-sav

-    

-    rem We define %params% here because Windows `shift` command doesn't affect

-    rem the %* variable.  --SJW 8/22/07

-    set params=

-    for /f "tokens=2*" %%a in ("%*") do (

-        if "%%b"=="" (

-            set params=%%a

-        ) else (

-            set params=%%a %%b

-        )

-    )

-    rem Parallel mode not actually supported, but included for consistency.

-    if defined pmode (

-        rem do nothing

-    )

-    

-    rem Run test.

-    (

-        rem echo.#############################

-        rem rem Remove quotes here, because Linux 'echo' command strips them

-        rem echo.Expected output for 'h5diff %params:"=%'

-        rem echo.#############################

-        pushd testfiles

-        %h5diff_bin% %params%

-        popd

-    ) > %actual% 2> %actual_err%

-	set EXIT_CODE=!errorlevel!

-    rem save actual and actual_err in case they are needed later.

-    copy /y %actual% %actual_sav% > nul

-    call :stdout_filter %actual%

-    copy /y %actual_err% %actual_err_sav% > nul

-    call :stderr_filter %actual_err%

-    type %actual_err% >> %actual%

-    echo EXIT CODE: !EXIT_CODE! >> %actual%

-    

-    if not exist %expect% (

-        rem Create the expect file if it doesn't yet exist.

-        call :results CREATED

-        copy /y %actual% %expect% > nul

-    ) else (

-        fc /w %expect% %actual% > nul

-        if !errorlevel! equ 0 (

-            call :results PASSED

-        ) else (

-            call :results *FAILED*

-            echo.    Expected result ^(%expect%^) differs from actual result ^(%actual%^)

-            set /a nerrors=!nerrors!+1

-            if "yes"=="%verbose%" fc /w %actual% %expect%

-        )

-    )

-        

-    rem Clean up output file

-    if not defined hdf5_nocleanup (

-        del /f %actual% %actual_err% %actual_sav% %actual_err_sav%

-    )

-    

-    exit /b

-    

-    

-rem Print a "SKIP" message

-:skip

-    call :testing -SKIP- %h5diff% %*

-    

-    exit /b

-    

-    

-:main

-rem ############################################################################

-rem  The tests 

-rem  To avoid the printing of the complete full path of the test file, that hides

-rem  all the other parameters for long paths, the printing of the command line 

-rem  is done first in

-rem  TESTING with the name only of the test file $TOOL, not its full path $TESTFILE

-rem ############################################################################

-

-rem ############################################################################

-rem # Common usage

-rem ############################################################################

-

-

-    rem 1.0

-    call :testing %h5diff% -h

-    call :tooltest h5diff_10.txt -h

-

-    rem 1.1 normal mode

-    call :testing %h5diff% %srcfile1% %srcfile2%

-    call :tooltest h5diff_11.txt  %file1% %file2% 

-

-    rem 1.2 normal mode with objects

-    call :testing %h5diff% %srcfile1% %srcfile2% g1/dset1 g1/dset2

-    call :tooltest h5diff_12.txt  %file1% %file2%  g1/dset1 g1/dset2

-

-    rem 1.3 report mode

-    call :testing %h5diff% -r %srcfile1% %srcfile2%

-    call :tooltest h5diff_13.txt -r %file1% %file2%

-

-    rem 1.4 report  mode with objects

-    call :testing %h5diff% -r %srcfile1% %srcfile2% g1/dset1 g1/dset2

-    call :tooltest h5diff_14.txt -r %file1% %file2% g1/dset1 g1/dset2

-

-    rem 1.5 with -d

-    call :testing %h5diff% --report --delta=5 %srcfile1% %srcfile2% g1/dset3 g1/dset4

-    call :tooltest h5diff_15.txt --report --delta=5 %file1% %file2% g1/dset3 g1/dset4

-

-    rem 1.6.1 with -p (int)

-    call :testing %h5diff% -v -p 0.02 %srcfile1% %srcfile1% g1/dset5 g1/dset6

-    call :tooltest h5diff_16_1.txt -v -p 0.02 %file1% %file1% g1/dset5 g1/dset6

-

-    rem 1.6.2 with -p (unsigned long_long)

-    call :testing %h5diff% --verbose --relative=0.02 %srcfile1% %srcfile1% g1/dset7 g1/dset8

-    call :tooltest h5diff_16_2.txt --verbose --relative=0.02 %file1% %file1% g1/dset7 g1/dset8

-

-    rem 1.6.3 with -p (double)

-    call :testing %h5diff% -v -p 0.02 %srcfile1% %srcfile1% g1/dset9 g1/dset10

-    call :tooltest h5diff_16_3.txt -v -p 0.02 %file1% %file1% g1/dset9 g1/dset10

-

-    rem 1.7 verbose mode

-    call :testing %h5diff% -v %srcfile1% %srcfile2%

-    call :tooltest h5diff_17.txt -v %file1% %file2% 

-

-    rem 1.71 test 32-bit INFINITY

-    call :testing %h5diff% -v %srcfile1% %srcfile1% /g1/fp19 /g1/fp19_COPY

-    call :tooltest h5diff_171.txt -v %file1% %file1% /g1/fp19 /g1/fp19_COPY

-

-    rem 1.72 test 64-bit INFINITY

-    call :testing %h5diff% -v %srcfile1% %srcfile1% /g1/fp20 /g1/fp20_COPY

-    call :tooltest h5diff_172.txt -v %file1% %file1% /g1/fp20 /g1/fp20_COPY

-

-    rem 1.8 quiet mode 

-    call :testing %h5diff% -q %srcfile1% %srcfile2%

-    call :tooltest h5diff_18.txt -q %file1% %file2% 

-    

-    rem ########################################################################

-    rem # not comparable types

-    rem ########################################################################

-

-    rem 2.0

-    call :testing %h5diff% -v %srcfile3% %srcfile3% dset g1

-    call :tooltest h5diff_20.txt -v %file3% %file3% dset g1

-

-    rem 2.1

-    call :testing %h5diff% -v %srcfile3% %srcfile3% dset l1

-    call :tooltest h5diff_21.txt -v %file3% %file3% dset l1

-

-    rem 2.2

-    call :testing %h5diff% -v %srcfile3% %srcfile3% dset t1

-    call :tooltest h5diff_22.txt -v %file3% %file3% dset t1

-

-    rem #######################################################################

-    rem # compare groups, types, links (no differences and differences)

-    rem #######################################################################

-

-    rem 2.3

-    call :testing %h5diff%  -v %srcfile3% %srcfile3% g1 g1

-    call :tooltest h5diff_23.txt -v %file3% %file3% g1 g1

-

-    rem 2.4

-    call :testing %h5diff% -v  %srcfile3% %srcfile3% t1 t1

-    call :tooltest h5diff_24.txt -v %file3% %file3% t1 t1

-

-    rem 2.5

-    call :testing %h5diff% -v  %srcfile3% %srcfile3% l1 l1 

-    call :tooltest h5diff_25.txt -v %file3% %file3% l1 l1 

-

-    rem 2.6

-    call :testing %h5diff% -v %srcfile3% %srcfile3% g1 g2

-    call :tooltest h5diff_26.txt -v %file3% %file3% g1 g2

-

-    rem 2.7

-    call :testing %h5diff% -v %srcfile3% %srcfile3% t1 t2

-    call :tooltest h5diff_27.txt -v %file3% %file3% t1 t2

-

-    rem 2.8

-    call :testing %h5diff% -v %srcfile3% %srcfile3% l1 l2

-    call :tooltest h5diff_28.txt -v %file3% %file3% l1 l2

-

-

-

-    rem ########################################################################

-    rem # Dataset datatypes

-    rem ########################################################################

-

-    rem 5.0

-    call :testing %h5diff% -v %srcfile4% %srcfile4% dset0a dset0b

-    call :tooltest h5diff_50.txt -v %file4% %file4% dset0a dset0b

-

-    rem 5.1

-    call :testing %h5diff% -v %srcfile4% %srcfile4%  dset1a dset1b

-    call :tooltest h5diff_51.txt -v %file4% %file4% dset1a dset1b

-

-    rem 5.2

-    call :testing %h5diff% -v %srcfile4% %srcfile4%  dset2a dset2b

-    call :tooltest h5diff_52.txt -v %file4% %file4% dset2a dset2b

-

-    rem 5.3

-    call :testing %h5diff% -v %srcfile4% %srcfile4%  dset3a dset4b

-    call :tooltest h5diff_53.txt -v %file4% %file4% dset3a dset4b

-

-    rem 5.4

-    call :testing %h5diff% -v %srcfile4% %srcfile4%  dset4a dset4b

-    call :tooltest h5diff_54.txt -v %file4% %file4% dset4a dset4b

-

-    rem 5.5

-    call :testing %h5diff% -v %srcfile4% %srcfile4%  dset5a dset5b

-    call :tooltest h5diff_55.txt -v %file4% %file4% dset5a dset5b

-

-    rem 5.6

-    call :testing %h5diff% -v %srcfile4% %srcfile4%  dset6a dset6b

-    call :tooltest h5diff_56.txt -v %file4% %file4% dset6a dset6b

-

-    rem 5.7

-    call :testing %h5diff% -v %srcfile4% %srcfile4%  dset7a dset7b

-    call :tooltest h5diff_57.txt -v %file4% %file4% dset7a dset7b

-

-    rem 5.8 (region reference)

-    call :testing %h5diff% -v %srcfile7% %srcfile8%  refreg

-    call :tooltest h5diff_58.txt -v %file7% %file8% refreg

-

-    rem ########################################################################

-    rem # Error messages

-    rem ########################################################################

-

-

-    rem 6.0: Check if the command line number of arguments is less than 3

-    call :testing %h5diff% %srcfile1%

-    call :tooltest h5diff_600.txt %file1% 

-

-    rem 6.1: Check if non-exist object name is specified 

-    call :testing %h5diff% %srcfile1% %srcfile1% nono_obj

-    rem SKIP this test as on Wondows legacy specific 

-    rem call :tooltest h5diff_601.txt %file1% %file1% nono_obj

-    call :results -SKIP-

-

-

-    rem ########################################################################

-    rem # -d 

-    rem ########################################################################

-

-

-    rem 6.3: negative value

-    call :testing %h5diff%  -d -4 %srcfile1% %srcfile2%  g1/dset3 g1/dset4

-    call :tooltest h5diff_603.txt -d -4 %file1% %file2% g1/dset3 g1/dset4

-

-    rem 6.4: zero

-    call :testing %h5diff%  -d 0 %srcfile1% %srcfile2%  g1/dset3 g1/dset4

-    call :tooltest h5diff_604.txt -d 0 %file1% %file2% g1/dset3 g1/dset4

-

-    rem 6.5: non number

-    call :testing %h5diff% -d u %srcfile1% %srcfile2%  g1/dset3 g1/dset4

-    call :tooltest h5diff_605.txt -d u %file1% %file2% g1/dset3 g1/dset4

-

-    rem 6.6: hexadecimal

-    call :testing %h5diff% -d 0x1 %srcfile1% %srcfile2%  g1/dset3 g1/dset4

-    call :tooltest h5diff_606.txt -d 0x1 %file1% %file2% g1/dset3 g1/dset4

-

-    rem 6.7: string

-    call :testing %h5diff% -d "1" %srcfile1% %srcfile2%  g1/dset3 g1/dset4

-    call :tooltest h5diff_607.txt -d "1" %file1% %file2%  g1/dset3 g1/dset4

-

-    rem 6.8: repeated option

-    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

-    call :tooltest h5diff_609.txt -d 200 %file1% %file2%  g1/dset3 g1/dset4

-

-    rem 6.10: number smaller than smallest difference

-    call :testing %h5diff% -d 1 %srcfile1% %srcfile2%  g1/dset3 g1/dset4

-    call :tooltest h5diff_610.txt -d 1 %file1% %file2%  g1/dset3 g1/dset4

-

-

-    rem ########################################################################

-    rem # -p

-    rem ########################################################################

-

-

-

-    rem 6.12: negative value

-    call :testing %h5diff% -p -4 %srcfile1% %srcfile2%  g1/dset3 g1/dset4

-    call :tooltest h5diff_612.txt -p -4 %file1% %file2% g1/dset3 g1/dset4

-

-    rem 6.13: zero

-    call :testing %h5diff% -p 0 %srcfile1% %srcfile2%  g1/dset3 g1/dset4

-    call :tooltest h5diff_613.txt -p 0 %file1% %file2% g1/dset3 g1/dset4

-

-    rem 6.14: non number

-    call :testing %h5diff% -p u %srcfile1% %srcfile2%   g1/dset3 g1/dset4

-    call :tooltest h5diff_614.txt -p u %file1% %file2% g1/dset3 g1/dset4

-

-    rem 6.15: hexadecimal

-    call :testing %h5diff% -p 0x1 %srcfile1% %srcfile2%  g1/dset3 g1/dset4

-    call :tooltest h5diff_615.txt -p 0x1 %file1% %file2% g1/dset3 g1/dset4

-

-    rem 6.16: string

-    call :testing %h5diff% -p "0.21" %srcfile1% %srcfile2%  g1/dset3 g1/dset4

-    call :tooltest h5diff_616.txt -p "0.21" %file1% %file2% g1/dset3 g1/dset4

-

-    rem 6.17: repeated option

-    call :testing %h5diff% -p 0.21 -p 0.22 %srcfile1% %srcfile2%  g1/dset3 g1/dset4

-    call :tooltest h5diff_617.txt -p 0.21 -p 0.22 %file1% %file2% g1/dset3 g1/dset4

-

-    rem 6.18: number larger than biggest difference

-    call :testing %h5diff% -p 2 %srcfile1% %srcfile2%  g1/dset3 g1/dset4

-    call :tooltest h5diff_618.txt -p 2 %file1% %file2% g1/dset3 g1/dset4

-

-    rem 6.19: number smaller than smallest difference

-    call :testing %h5diff% -p 0.005 %srcfile1% %srcfile2%  g1/dset3 g1/dset4

-    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

-

-    rem 6.22: zero

-    call :testing %h5diff% -n 0 %srcfile1% %srcfile2%  g1/dset3 g1/dset4

-    call :tooltest h5diff_622.txt -n 0 %file1% %file2% g1/dset3 g1/dset4

-

-    rem 6.23: non number

-    call :testing %h5diff% -n u %srcfile1% %srcfile2%  g1/dset3 g1/dset4

-    call :tooltest h5diff_623.txt -n u %file1% %file2% g1/dset3 g1/dset4

-

-    rem 6.24: hexadecimal

-    call :testing %h5diff% -n 0x1 %srcfile1% %srcfile2%  g1/dset3 g1/dset4

-    call :tooltest h5diff_624.txt -n 0x1 %file1% %file2% g1/dset3 g1/dset4

-

-    rem 6.25: string

-    call :testing %h5diff% -n "2" %srcfile1% %srcfile2%   g1/dset3 g1/dset4

-    call :tooltest h5diff_625.txt -n "2" %file1% %file2% g1/dset3 g1/dset4

-

-    rem 6.26: repeated option

-    call :testing %h5diff% -n 2 -n 3 %srcfile1% %srcfile2%  g1/dset3 g1/dset4

-    call :tooltest h5diff_626.txt -n 2 -n 3 %file1% %file2% g1/dset3 g1/dset4

-

-    rem 6.27: number larger than biggest difference

-    call :testing %h5diff% --count=200 %srcfile1% %srcfile2%  g1/dset3 g1/dset4

-    call :tooltest h5diff_627.txt --count=200 %file1% %file2% g1/dset3 g1/dset4

-

-    rem 6.28: number smaller than smallest difference

-    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

-

-    rem ######################################################################

-    rem # NaN

-    rem ######################################################################

-    rem 6.30: test (NaN == NaN) must be true based on our documentation -- XCAO

-    call :testing %h5diff% -v -d "0.0001" %srcfile1% %srcfile1% g1/fp18 g1/fp18_COPY

-    call :tooltest h5diff_630.txt -v -d "0.0001" %file1% %file1% g1/fp18 g1/fp18_COPY

-    call :testing %h5diff% -v --use-system-epsilon %srcfile1% %srcfile1% g1/fp18 g1/fp18_COPY

-    call :tooltest h5diff_631.txt -v --use-system-epsilon %file1% %file1% g1/fp18 g1/fp18_COPY

-

-

-    rem ########################################################################

-    rem 7.  attributes

-    rem ########################################################################

-    call :testing %h5diff% -v  %srcfile5% %srcfile6%

-    call :tooltest h5diff_70.txt -v %file5% %file6%

-

-    rem ##################################################

-    rem  attrs with verbose option level

-    rem ##################################################

-    call :testing %h5diff% -v1 %srcfile5% %srcfile6%

-    call :tooltest h5diff_700.txt -v1 %file5% %file6%

-

-    call :testing %h5diff% -v2 %srcfile5% %srcfile6%

-    call :tooltest h5diff_701.txt -v2 %file5% %file6% 

-

-    call :testing %h5diff%  --verbose=1 %srcfile5% %srcfile6%

-    call :tooltest h5diff_702.txt --verbose=1 %file5% %file6% 

-

-    call :testing %h5diff% --verbose=2 %srcfile5% %srcfile6%

-    call :tooltest h5diff_703.txt --verbose=2 %file5% %file6% 

-

-    rem same attr number , all same attr name

-    call :testing %h5diff% -v2 %src_ATTR_VERBOSE_LEVEL_FILE1% %src_ATTR_VERBOSE_LEVEL_FILE2% /g

-    call :tooltest h5diff_704.txt -v2 %ATTR_VERBOSE_LEVEL_FILE1% %ATTR_VERBOSE_LEVEL_FILE2% /g

-

-    rem same attr number , some same attr name

-    call :testing %h5diff%  -v2 %src_ATTR_VERBOSE_LEVEL_FILE1% %src_ATTR_VERBOSE_LEVEL_FILE2% /dset

-    call :tooltest h5diff_705.txt -v2 %ATTR_VERBOSE_LEVEL_FILE1% %ATTR_VERBOSE_LEVEL_FILE2% /dset

-

-    rem same attr number , all different attr name

-    call :testing %h5diff% -v2 %src_ATTR_VERBOSE_LEVEL_FILE1% %src_ATTR_VERBOSE_LEVEL_FILE2% /ntype

-    call :tooltest h5diff_706.txt -v2 %ATTR_VERBOSE_LEVEL_FILE1% %ATTR_VERBOSE_LEVEL_FILE2% /ntype

-

-    rem different attr number , same attr name (intersected)

-    call :testing %h5diff% -v2 %src_ATTR_VERBOSE_LEVEL_FILE1% %src_ATTR_VERBOSE_LEVEL_FILE2% /g2

-    call :tooltest h5diff_707.txt -v2 %ATTR_VERBOSE_LEVEL_FILE1% %ATTR_VERBOSE_LEVEL_FILE2% /g2

-

-    rem different attr number , all different attr name 

-    call :testing %h5diff% -v2 %src_ATTR_VERBOSE_LEVEL_FILE1% %src_ATTR_VERBOSE_LEVEL_FILE2% /g3

-    call :tooltest h5diff_708.txt -v2 %ATTR_VERBOSE_LEVEL_FILE1% %ATTR_VERBOSE_LEVEL_FILE2% /g3

-

-    rem when no attributes exist in both objects

-    call :testing %h5diff% -v2 %src_ATTR_VERBOSE_LEVEL_FILE1% %src_ATTR_VERBOSE_LEVEL_FILE2% /g4

-    call :tooltest h5diff_709.txt -v2 %ATTR_VERBOSE_LEVEL_FILE1% %ATTR_VERBOSE_LEVEL_FILE2% /g4

-

-    rem file vs file

-    call :testing %h5diff% -v2 %src_ATTR_VERBOSE_LEVEL_FILE1% %src_ATTR_VERBOSE_LEVEL_FILE2%

-    call :tooltest h5diff_710.txt -v2 %ATTR_VERBOSE_LEVEL_FILE1% %ATTR_VERBOSE_LEVEL_FILE2%

-

-

-    rem #######################################################################

-    rem 8.  all dataset datatypes

-    rem #######################################################################

-    call :testing %h5diff% -v  %srcfile7% %srcfile8%

-    call :tooltest h5diff_80.txt -v %file7% %file8%

-

-    rem 9. compare a file with itself

-    call :testing %h5diff% -v  %srcfile2% %srcfile2%

-    call :tooltest h5diff_90.txt -v %file2% %file2%

-

-    rem 10. read by hyperslab, print indexes

-    rem #######################################################################

-    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

-    rem    else

-    rem #######################################################################

-    call :testing %h5diff% -v %srcfile9% %srcfile10%

-    call :tooltest h5diff_100.txt -v %file9% %file10%

-    rem    fi

-

-    rem 11. floating point comparison

-    rem Not tested on Windows due to difference in formatting of scientific 

-    rem notation (101, 102)  --SJW 8/23/07

-    call :testing %h5diff% -v %srcfile1% %srcfile1% g1/d1  g1/d2

-    rem call :tooltest h5diff_101.txt -v %file1% %file1% g1/d1  g1/d2

-    call :results -SKIP-

-

-    call :testing %h5diff% -v  %srcfile1% %srcfile1%  g1/fp1 g1/fp2

-    rem call :tooltest h5diff_102.txt -v %file1% %file1% g1/fp1 g1/fp2

-    call :results -SKIP-

-

-    rem Not tested on Windows due to difference in formatting of scientific 

-    rem notation with other OS. printf("%g") (103, 104)  

-    call :testing %h5diff% -v --use-system-epsilon %srcfile1% %srcfile1% g1/d1  g1/d2

-    rem call :tooltest h5diff_103.txt -v --use-system-epsilon %file1% %file1% g1/d1  g1/d2

-    call :results -SKIP-

-

-    call :testing %h5diff% -v --use-system-epsilon %srcfile1% %srcfile1%  g1/fp1 g1/fp2

-    rem call :tooltest h5diff_102.txt -v --use-system-epsilon %file1% %file1% g1/fp1 g1/fp2

-    call :results -SKIP-

-

-    rem   New option added #1368(E1)  - ADB 2/5/2009

-	rem not compable -c flag

-	call :testing %h5diff% %srcfile2% %srcfile2% g2/dset1  g2/dset2

-    call :tooltest h5diff_200.txt %file2% %file2% g2/dset1  g2/dset2 

-

-	call :testing %h5diff% -c %srcfile2% %srcfile2% g2/dset1  g2/dset2

-    call :tooltest h5diff_201.txt -c %file2% %file2% g2/dset1  g2/dset2 

-

-	call :testing %h5diff% -c %srcfile2% %srcfile2% g2/dset2  g2/dset3

-    call :tooltest h5diff_202.txt -c %file2% %file2% g2/dset2  g2/dset3

-

-	call :testing %h5diff% -c %srcfile2% %srcfile2% g2/dset3  g2/dset4

-    call :tooltest h5diff_203.txt -c %file2% %file2% g2/dset3  g2/dset4

-

-	call :testing %h5diff% -c %srcfile2% %srcfile2% g2/dset4  g2/dset5

-    call :tooltest h5diff_204.txt -c %file2% %file2% g2/dset4  g2/dset5

-

-	call :testing %h5diff% -c %srcfile2% %srcfile2% g2/dset5  g2/dset6

-    call :tooltest h5diff_205.txt -c %file2% %file2% g2/dset5  g2/dset6

-	

-    rem   New option added - ADB 2/11/2009

-	rem # not comparable in compound

-	call :testing %h5diff% -c %srcfile2% %srcfile2% g2/dset7  g2/dset8

-    call :tooltest h5diff_206.txt -c %file2% %file2% g2/dset7  g2/dset8

-

-	call :testing %h5diff% -c %srcfile2% %srcfile2% g2/dset8  g2/dset9

-    call :tooltest h5diff_207.txt -c %file2% %file2% g2/dset8  g2/dset9

-

-    rem #######################################################################

-    rem # Links compare without --follow-symlinks nor --no-dangling-links

-    rem #######################################################################

-    rem test for bug1749

-	call :testing %h5diff% -v %srcfile12% %srcfile12% /link_g1 /link_g2

-    call :tooltest h5diff_300.txt -v %file12% %file12% /link_g1 /link_g2

-

-    rem #######################################################################

-    rem # Links compare with --follow-symlinks Only

-    rem #######################################################################

-    rem soft links file to file

-	call :testing %h5diff% --follow-symlinks -v  %srcfile13% %srcfile13%

-    call :tooltest h5diff_400.txt --follow-symlinks -v %file13% %file13% 

-

-    rem softlink vs dset"

-	call :testing %h5diff% --follow-symlinks -v %srcfile13% %srcfile13% /softlink_dset1_1 /target_dset2

-    call :tooltest h5diff_401.txt --follow-symlinks -v %file13% %file13% /softlink_dset1_1 /target_dset2

-

-    rem dset vs softlink"

-	call :testing %h5diff% --follow-symlinks -v %srcfile13% %srcfile13% /target_dset2 /softlink_dset1_1

-    call :tooltest h5diff_402.txt --follow-symlinks -v %file13% %file13% /target_dset2 /softlink_dset1_1

-

-    rem softlink vs softlink"

-	call :testing %h5diff% --follow-symlinks -v %srcfile13% %srcfile13% /softlink_dset1_1 /softlink_dset2

-    call :tooltest h5diff_403.txt --follow-symlinks -v %file13% %file13% /softlink_dset1_1 /softlink_dset2

-

-    rem extlink vs extlink (FILE)"

-	call :testing %h5diff% --follow-symlinks -v %srcfile15% %srcfile15%

-    call :tooltest h5diff_404.txt --follow-symlinks -v %file15% %file15%

-

-    rem extlink vs dset"

-	call :testing %h5diff% --follow-symlinks -v %srcfile15% %srcfile16% /ext_link_dset1 /target_group2/x_dset

-    call :tooltest h5diff_405.txt --follow-symlinks -v %file15% %file16% /ext_link_dset1 /target_group2/x_dset

-

-    rem dset vs extlink"

-	call :testing %h5diff% --follow-symlinks -v %srcfile16% %srcfile15% /target_group2/x_dset /ext_link_dset1

-    call :tooltest h5diff_406.txt --follow-symlinks -v %file16% %file15% /target_group2/x_dset /ext_link_dset1

-

-    rem extlink vs extlink"

-	call :testing %h5diff% --follow-symlinks -v %srcfile15% %srcfile15% /ext_link_dset1 /ext_link_dset2

-    call :tooltest h5diff_407.txt --follow-symlinks -v %file15% %file15% /ext_link_dset1 /ext_link_dset2

-

-    rem softlink vs extlink"

-	call :testing %h5diff% --follow-symlinks -v %srcfile13% %srcfile15% /softlink_dset1_1 /ext_link_dset2

-    call :tooltest h5diff_408.txt --follow-symlinks -v %file13% %file15% /softlink_dset1_1 /ext_link_dset2

-

-    rem extlink vs softlink "

-	call :testing %h5diff% --follow-symlinks -v %srcfile15% %srcfile13% /ext_link_dset2 /softlink_dset1_1

-    call :tooltest h5diff_409.txt --follow-symlinks -v %file15% %file13% /ext_link_dset2 /softlink_dset1_1

-

-    rem linked_softlink vs linked_softlink (FILE)"

-	call :testing %h5diff% --follow-symlinks -v %srcfile14% %srcfile14%

-    call :tooltest h5diff_410.txt --follow-symlinks -v %file14% %file14%

-

-    rem dset2 vs linked_softlink_dset1"

-	call :testing %h5diff% --follow-symlinks -v %srcfile14% %srcfile14% /target_dset2 /softlink1_to_slink2

-    call :tooltest h5diff_411.txt --follow-symlinks -v %file14% %file14% /target_dset2 /softlink1_to_slink2

-

-    rem    rem linked_softlink_dset1 vs dset2"

-	call :testing %h5diff% --follow-symlinks -v %srcfile14% %srcfile14% /softlink1_to_slink2 /target_dset2

-    call :tooltest h5diff_412.txt --follow-symlinks -v %file14% %file14% /softlink1_to_slink2 /target_dset2

-

-    rem linked_softlink_to_dset1 vs linked_softlink_to_dset2"

-	call :testing %h5diff% --follow-symlinks -v %srcfile14% %srcfile14% /softlink1_to_slink2 /softlink2_to_slink2

-    call :tooltest h5diff_413.txt --follow-symlinks -v %file14% %file14% /softlink1_to_slink2 /softlink2_to_slink2

-

-    rem group vs linked_softlink_group1"

-	call :testing %h5diff% --follow-symlinks -v %srcfile14% %srcfile14% /target_group /softlink3_to_slink2

-    call :tooltest h5diff_414.txt --follow-symlinks -v %file14% %file14% /target_group /softlink3_to_slink2

-

-    rem linked_softlink_group1 vs group"

-	call :testing %h5diff% --follow-symlinks -v %srcfile14% %srcfile14% /softlink3_to_slink2 /target_group

-    call :tooltest h5diff_415.txt --follow-symlinks -v %file14% %file14% /softlink3_to_slink2 /target_group

-

-    rem linked_softlink_to_group1 vs linked_softlink_to_group2"

-	call :testing %h5diff% --follow-symlinks -v %srcfile14% %srcfile14% /softlink3_to_slink2 /softlink4_to_slink2

-    call :tooltest h5diff_416.txt --follow-symlinks -v %file14% %file14% /softlink3_to_slink2 /softlink4_to_slink2

-

-    rem non-exist-softlink vs softlink"

-	call :testing %h5diff% --follow-symlinks -v %srcfile13% %srcfile13% /softlink_noexist /softlink_dset2

-    call :tooltest h5diff_417.txt --follow-symlinks -v %file13% %file13% /softlink_noexist /softlink_dset2

-

-    rem softlink vs non-exist-softlink"

-	call :testing %h5diff% --follow-symlinks -v %srcfile13% %srcfile13% /softlink_dset2 /softlink_noexist

-    call :tooltest h5diff_418.txt --follow-symlinks -v %file13% %file13% /softlink_dset2 /softlink_noexist

-

-    rem non-exist-extlink_file vs extlink"

-	call :testing %h5diff% --follow-symlinks -v %srcfile15% %srcfile15% /ext_link_noexist2 /ext_link_dset2

-    call :tooltest h5diff_419.txt --follow-symlinks -v %file15% %file15% /ext_link_noexist2 /ext_link_dset2

-

-    rem exlink vs non-exist-extlink_file"

-	call :testing %h5diff% --follow-symlinks -v %srcfile15% %srcfile15% /ext_link_dset2 /ext_link_noexist2

-    call :tooltest h5diff_420.txt --follow-symlinks -v %file15% %file15% /ext_link_dset2 /ext_link_noexist2

-

-    rem extlink vs non-exist-extlink_obj"

-	call :testing %h5diff% --follow-symlinks -v %srcfile15% %srcfile15% /ext_link_dset2 /ext_link_noexist1

-    call :tooltest h5diff_421.txt --follow-symlinks -v %file15% %file15% /ext_link_dset2 /ext_link_noexist1

-

-    rem non-exist-extlink_obj vs extlink"

-	call :testing %h5diff% --follow-symlinks -v %srcfile15% %srcfile15% /ext_link_noexist1 /ext_link_dset2

-    call :tooltest h5diff_422.txt --follow-symlinks -v %file15% %file15% /ext_link_noexist1 /ext_link_dset2

-

-    rem extlink_to_softlink_to_dset1 vs dset2"

-	call :testing %h5diff% --follow-symlinks -v %srcfile17% %srcfile18% /ext_link_to_slink1 /dset2

-    call :tooltest h5diff_423.txt --follow-symlinks -v %file17% %file18% /ext_link_to_slink1 /dset2

-

-    rem dset2 vs extlink_to_softlink_to_dset1"

-	call :testing %h5diff% --follow-symlinks -v %srcfile18% %srcfile17% /dset2 /ext_link_to_slink1

-    call :tooltest h5diff_424.txt --follow-symlinks -v %file18% %file17% /dset2 /ext_link_to_slink1

-

-    rem extlink_to_softlink_to_dset1 vs extlink_to_softlink_to_dset2"

-	call :testing %h5diff% --follow-symlinks -v %srcfile17% %srcfile17% /ext_link_to_slink1 /ext_link_to_slink2

-    call :tooltest h5diff_425.txt --follow-symlinks -v %file17% %file17% /ext_link_to_slink1 /ext_link_to_slink2

-

-

-    rem #######################################################################

-    rem # Dangling links compare (--follow-symlinks and --no-dangling-links)

-    rem #######################################################################

-    rem dangling links --follow-symlinks (FILE to FILE)

-	call :testing %h5diff% --follow-symlinks -v %srclnkfile1% %srclnkfile2%

-    call :tooltest h5diff_450.txt --follow-symlinks -v %lnkfile1% %lnkfile2%

-

-    rem dangling links --follow-symlinks and --no-dangling-links (FILE to FILE)

-	call :testing %h5diff% --follow-symlinks -v --no-dangling-links  %srclnkfile1% %srclnkfile2%

-    call :tooltest h5diff_451.txt --follow-symlinks -v --no-dangling-links  %lnkfile1% %lnkfile2% 

-

-    rem try --no-dangling-links without --follow-symlinks options

-	call :testing %h5diff%  --no-dangling-links %srcfile13% %srcfile13% 

-    call :tooltest h5diff_452.txt  --no-dangling-links %file13% %file13% 

-

-    rem dangling link found for soft links (FILE to FILE)

-	call :testing %h5diff% --follow-symlinks -v --no-dangling-links %srcfile13% %srcfile13%

-    call :tooltest h5diff_453.txt --follow-symlinks -v --no-dangling-links %file13% %file13% 

-

-    rem dangling link found for soft links (obj to obj)

-	call :testing %h5diff% --follow-symlinks -v --no-dangling-links %srcfile13% %srcfile13% /softlink_dset2 /softlink_noexist

-    call :tooltest h5diff_454.txt --follow-symlinks -v --no-dangling-links %file13% %file13% /softlink_dset2 /softlink_noexist

-

-    rem dangling link found for soft links (obj to obj) Both dangle links

-	call :testing %h5diff% --follow-symlinks -v --no-dangling-links %srcfile13% %srcfile13% /softlink_noexist /softlink_noexist

-    call :tooltest h5diff_455.txt --follow-symlinks -v --no-dangling-links %file13% %file13% /softlink_noexist /softlink_noexist

-

-    rem dangling link found for ext links (FILE to FILE)

-	call :testing %h5diff% --follow-symlinks -v --no-dangling-links %srcfile15% %srcfile15%

-    call :tooltest h5diff_456.txt --follow-symlinks -v --no-dangling-links %file15% %file15%

-

-    rem dangling link found for ext links (obj to obj). target file exist

-	call :testing %h5diff% --follow-symlinks -v --no-dangling-links %srcfile15% %srcfile15% /ext_link_dset1 /ext_link_noexist1

-    call :tooltest h5diff_457.txt --follow-symlinks -v --no-dangling-links %file15% %file15% /ext_link_dset1 /ext_link_noexist1

-

-    rem dangling link found for ext links (obj to obj). target file NOT exist

-	call :testing %h5diff% --follow-symlinks -v --no-dangling-links %srcfile15% %srcfile15% /ext_link_dset1 /ext_link_noexist2

-    call :tooltest h5diff_458.txt --follow-symlinks -v --no-dangling-links %file15% %file15% /ext_link_dset1 /ext_link_noexist2

-

-    rem dangling link found for ext links (obj to obj). Both dangle links

-	call :testing %h5diff% --follow-symlinks -v --no-dangling-links %srcfile15% %srcfile15% /ext_link_noexist1 /ext_link_noexist2

-    call :tooltest h5diff_459.txt --follow-symlinks -v --no-dangling-links %file15% %file15% /ext_link_noexist1 /ext_link_noexist2

-

-    rem ########################################################################

-    rem # test for group diff recursivly

-    rem ########################################################################

-    rem root 

-    call :testing %h5diff% -v %src_grp_recurse1% %src_grp_recurse2% / /

-	call :tooltest h5diff_500.txt -v %grp_recurse1% %grp_recurse2% / /

-

-    call :testing %h5diff% -v --follow-symlinks %src_grp_recurse1% %src_grp_recurse2% / /

-	call :tooltest h5diff_501.txt -v --follow-symlinks %grp_recurse1% %grp_recurse2% / /

-

-    rem root vs group

-    call :testing %h5diff% -v %src_grp_recurse1% %src_grp_recurse2% / /grp1/grp2/grp3

-	call :tooltest h5diff_502.txt -v %grp_recurse1% %grp_recurse2% / /grp1/grp2/grp3

-

-    rem group vs group (same name and structure)

-    call :testing %h5diff% -v %src_grp_recurse1% %src_grp_recurse2% /grp1 /grp1

-	call :tooltest h5diff_503.txt -v %grp_recurse1% %grp_recurse2% /grp1 /grp1

-

-    rem group vs group (different name and structure)

-    call :testing %h5diff% -v %src_grp_recurse1% %src_grp_recurse2% /grp1/grp2 /grp1/grp2/grp3

-	call :tooltest h5diff_504.txt -v %grp_recurse1% %grp_recurse2% /grp1/grp2 /grp1/grp2/grp3

-

-    rem groups vs soft-link

-    call :testing %h5diff%

-	call :tooltest h5diff_505.txt -v %grp_recurse1% %grp_recurse2% /grp1 /slink_grp1

-

-    call :testing %h5diff% -v --follow-symlinks %src_grp_recurse1% %src_grp_recurse2% /grp1/grp2 /slink_grp2

-	call :tooltest h5diff_506.txt -v --follow-symlinks %grp_recurse1% %grp_recurse2% /grp1/grp2 /slink_grp2

-

-    rem groups vs ext-link

-    call :testing %h5diff% -v %src_grp_recurse1% %src_grp_recurse2% /grp1 /elink_grp1

-	call :tooltest h5diff_507.txt -v %grp_recurse1% %grp_recurse2% /grp1 /elink_grp1

-

-    call :testing %h5diff% -v --follow-symlinks %src_grp_recurse1% %src_grp_recurse2% /grp1 /elink_grp1

-	call :tooltest h5diff_508.txt -v --follow-symlinks %grp_recurse1% %grp_recurse2% /grp1 /elink_grp1

-

-    rem soft-link vs ext-link

-    call :testing %h5diff% -v %src_grp_recurse1% %src_grp_recurse2% /slink_grp1 /elink_grp1

-	call :tooltest h5diff_509.txt -v %grp_recurse1% %grp_recurse2% /slink_grp1 /elink_grp1

-

-    call :testing %h5diff% -v --follow-symlinks %src_grp_recurse1% %src_grp_recurse2% /slink_grp1 /elink_grp1

-	call :tooltest h5diff_510.txt -v --follow-symlinks %grp_recurse1% %grp_recurse2% /slink_grp1 /elink_grp1

-

-    rem circled ext links

-    call :testing %h5diff% -v %src_grp_recurse1% %src_grp_recurse2% /grp10 /grp11

-	call :tooltest h5diff_511.txt -v %grp_recurse1% %grp_recurse2% /grp10 /grp11

-

-    call :testing %h5diff% -v --follow-symlinks %src_grp_recurse1% %src_grp_recurse2% /grp10 /grp11

-	call :tooltest h5diff_512.txt -v --follow-symlinks %grp_recurse1% %grp_recurse2% /grp10 /grp11

-

-    rem circled soft2ext-link vs soft2ext-link

-    call :testing %h5diff% -v %src_grp_recurse1% %src_grp_recurse2% /slink_grp10 /slink_grp11

-	call :tooltest h5diff_513.txt -v %grp_recurse1% %grp_recurse2% /slink_grp10 /slink_grp11

-

-    call :testing %h5diff% -v --follow-symlinks %src_grp_recurse1% %src_grp_recurse2% /slink_grp10 /slink_grp11

-	call :tooltest h5diff_514.txt -v --follow-symlinks %grp_recurse1% %grp_recurse2% /slink_grp10 /slink_grp11

-

-    rem ######################################################################

-    rem # Test for group recursive diff via multi-linked external links 

-    rem # With follow-symlinks, file $GRP_RECURSE1_EXT and $GRP_RECURSE2_EXT1 

-    rem # should be same with the external links.

-    rem ######################################################################

-    rem file vs file

-    call :testing %h5diff% -v %src_grp_recurse1_ext% %src_grp_recurse2_ext1%

-    call :tooltest h5diff_515.txt -v %grp_recurse1_ext% %grp_recurse2_ext1%

-

-    call :testing %h5diff% -v --follow-symlinks %src_grp_recurse1_ext% %src_grp_recurse2_ext1%

-    call :tooltest h5diff_516.txt -v --follow-symlinks %grp_recurse1_ext% %grp_recurse2_ext1%

-

-    rem group vs group

-    call :testing %h5diff% -v %src_grp_recurse1_ext% %src_grp_recurse2_ext1% /g1

-    call :tooltest h5diff_517.txt -v %grp_recurse1_ext% %grp_recurse2_ext1% /g1

-

-    call :testing %h5diff% -v --follow-symlinks %src_grp_recurse1_ext% %src_grp_recurse2_ext1% /g1

-    call :tooltest h5diff_518.txt -v --follow-symlinks %grp_recurse1_ext% %grp_recurse2_ext1% /g1

-

-

-    rem #######################################################################

-    rem # Exclude objects (--exclude-path)

-    rem #######################################################################

-    rem #-------------------------------------------------

-    rem # Same structure, same names and different value.

-

-    rem Exclude the object with different value. Expect return - same

-    call :testing %h5diff% -v --exclude-path /group1/dset3 %srcexclude1_1% %srcexclude1_2%

-    call :tooltest h5diff_480.txt -v --exclude-path /group1/dset3 %exclude1_1% %exclude1_2%

-

-    rem Verify different by not excluding. Expect return - diff

-    call :testing %h5diff% -v %srcexclude1_1% %srcexclude1_2%

-    call :tooltest h5diff_481.txt -v %exclude1_1% %exclude1_2%

-

-    rem #----------------------------------------

-    rem # Different structure, different names. 

-

-    rem Exclude all the different objects. Expect return - same

-    call :testing %h5diff% -v --exclude-path "/group1" --exclude-path "/dset1" %srcexclude2_1% %srcexclude2_2%

-    call :tooltest h5diff_482.txt -v --exclude-path "/group1" --exclude-path "/dset1" %exclude2_1% %exclude2_2%

-

-    rem Exclude only some different objects. Expect return - diff

-    call :testing %h5diff% -v --exclude-path "/group1" %srcexclude2_1% %srcexclude2_2%

-    call :tooltest h5diff_483.txt -v --exclude-path "/group1" %exclude2_1% %exclude2_2%

-

-    rem Exclude from group compare

-    call :testing %h5diff% -v --exclude-path "/dset3" %srcexclude1_1% %srcexclude1_2% /group1

-    call :tooltest h5diff_484.txt -v --exclude-path "/dset3"  %exclude1_1% %exclude1_2% /group1

-

-    rem #######################################################################

-    rem # diff various multiple vlen and fixed strings in a compound type dataset

-    rem #######################################################################

-    call :testing %h5diff% -v %src_comp_vl_strs% %src_comp_vl_strs% /group /group_copy

-    call :tooltest h5diff_530.txt -v  %comp_vl_strs% %comp_vl_strs% /group /group_copy

-

-    rem # #####################################################################

-    rem # # Test container types (array,vlen) with multiple nested compound types

-    rem # # Complex compound types in dataset and attribute

-    rem # #####################################################################

-    call :testing %h5diff% -v %src_COMPS_ARRAY_VLEN1% %src_COMPS_ARRAY_VLEN2%

-    call :tooltest h5diff_540.txt -v %COMPS_ARRAY_VLEN1% %COMPS_ARRAY_VLEN2%

-

-    rem #######################################################################

-    rem # Test mutually exclusive options 

-    rem #######################################################################

-

-    rem ------------------------------------------------------

-    rem Test with -d , -p and --use-system-epsilon. 

-    call :testing %h5diff% -v -d 5 -p 0.05 --use-system-epsilon %srcfile1% %srcfile2% /g1/dset3 /g1/dset4

-    call :tooltest h5diff_640.txt -v -d 5 -p 0.05 --use-system-epsilon %file1% %file2% /g1/dset3 /g1/dset4

-

-    call :testing %h5diff% -v -d 5 -p 0.05 %srcfile1% %srcfile2% /g1/dset3 /g1/dset4

-    call :tooltest h5diff_641.txt -v -d 5 -p 0.05 %file1% %file2% /g1/dset3 /g1/dset4

-

-    call :testing %h5diff% -v -p 0.05 -d 5 %srcfile1% %srcfile2% /g1/dset3 /g1/dset4

-    call :tooltest h5diff_642.txt -v -p 0.05 -d 5 %file1% %file2% /g1/dset3 /g1/dset4

-

-    call :testing %h5diff% -v -d 5 --use-system-epsilon %srcfile1% %srcfile2% /g1/dset3 /g1/dset4

-    call :tooltest h5diff_643.txt -v -d 5 --use-system-epsilon %file1% %file2% /g1/dset3 /g1/dset4

-

-    call :testing %h5diff% -v --use-system-epsilon -d 5 %srcfile1% %srcfile2% /g1/dset3 /g1/dset4

-    call :tooltest h5diff_644.txt -v --use-system-epsilon -d 5 %file1% %file2% /g1/dset3 /g1/dset4

-

-    call :testing %h5diff% -v -p 0.05 --use-system-epsilon %srcfile1% %srcfile2% /g1/dset3 /g1/dset4

-    call :tooltest h5diff_645.txt -v -p 0.05 --use-system-epsilon %file1% %file2% /g1/dset3 /g1/dset4

-

-    call :testing %h5diff% -v --use-system-epsilon -p 0.05 %srcfile1% %srcfile2% /g1/dset3 /g1/dset4

-    call :tooltest h5diff_646.txt -v --use-system-epsilon -p 0.05 %file1% %file2% /g1/dset3 /g1/dset4

-	

-    rem #######################################################################

-    rem # END

-    rem #######################################################################

-

-    if %nerrors% equ 0 (

-       echo.All %h5diff% tests passed.

-    )

-

-    popd

-    endlocal & exit /b %nerrors%

-    

diff --git a/windows/tools/h5diffdll/h5diffdll.vcproj b/windows/tools/h5diffdll/h5diffdll.vcproj
deleted file mode 100644
index bd153bd..0000000
--- a/windows/tools/h5diffdll/h5diffdll.vcproj
+++ /dev/null
@@ -1,394 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="h5diffdll"

-	ProjectGUID="{EC6B5EAD-D938-4211-A7B1-01C9D2C15160}"

-	RootNamespace="h5diffdll"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5diffdll/Release/h5diffdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5diffdll/Release/h5diffdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5diffdll/Release/"

-				ObjectFile=".\../../../tools/h5diffdll/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5diffdll/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../tools/h5diffdll/Release/h5diffdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5diffdll/Release/h5diffdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5diffdll/Release/h5diffdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5diffdll/Release/"

-				ObjectFile=".\../../../tools/h5diffdll/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5diffdll/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../tools/h5diffdll/Release/h5diffdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5diffdll/Debug/h5diffdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5diffdll/Debug/h5diffdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5diffdll/Debug/"

-				ObjectFile=".\../../../tools/h5diffdll/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5diffdll/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5diffdll/Debug/h5diffdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5diffdll/Debug/h5diffdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5diffdll/Debug/h5diffdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5diffdll/Debug/"

-				ObjectFile=".\../../../tools/h5diffdll/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5diffdll/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5diffdll/Debug/h5diffdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\..\tools\h5diff\h5diff_common.c"

-			>

-		</File>

-		<File

-			RelativePath="..\..\..\tools\h5diff\h5diff_main.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/h5dump/h5dump.vcproj b/windows/tools/h5dump/h5dump.vcproj
deleted file mode 100644
index d3e6d71..0000000
--- a/windows/tools/h5dump/h5dump.vcproj
+++ /dev/null
@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="h5dump"

-	ProjectGUID="{9A8352DF-AA1E-4FE0-9494-F9D6B4E10CA2}"

-	RootNamespace="h5dump"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5dump/Debug/h5dump.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5dump/Debug/h5dump.pch"

-				AssemblerListingLocation=".\../../../tools/h5dump/Debug/"

-				ObjectFile=".\../../../tools/h5dump/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5dump/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5dump/Debug/h5dump.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5dump/Debug/h5dump.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5dump/Debug/h5dump.pch"

-				AssemblerListingLocation=".\../../../tools/h5dump/Debug/"

-				ObjectFile=".\../../../tools/h5dump/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5dump/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5dump/Debug/h5dump.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5dump/Release/h5dump.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5dump/Release/h5dump.pch"

-				AssemblerListingLocation=".\../../../tools/h5dump/Release/"

-				ObjectFile=".\../../../tools/h5dump/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5dump/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				ProgramDatabaseFile=".\../../../tools/h5dump/Release/h5dump.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5dump/Release/h5dump.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5dump/Release/h5dump.pch"

-				AssemblerListingLocation=".\../../../tools/h5dump/Release/"

-				ObjectFile=".\../../../tools/h5dump/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5dump/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				ProgramDatabaseFile=".\../../../tools/h5dump/Release/h5dump.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\..\tools\h5dump\h5dump.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/h5dump/testh5dump.bat b/windows/tools/h5dump/testh5dump.bat
deleted file mode 100644
index 307765c..0000000
--- a/windows/tools/h5dump/testh5dump.bat
+++ /dev/null
@@ -1,703 +0,0 @@
-@echo off

-rem

-rem Copyright by The HDF Group.

-rem Copyright by the Board of Trustees of the University of Illinois.

-rem All rights reserved.

-rem

-rem This file is part of HDF5.  The full HDF5 copyright notice, including

-rem terms governing use, modification, and redistribution, is contained in

-rem the files COPYING and Copyright.html.  COPYING can be found at the root

-rem of the source code distribution tree; Copyright.html can be found at the

-rem root level of an installed copy of the electronic HDF5 document set and

-rem is linked from the top-level documents page.  It can also be found at

-rem http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have

-rem access to either file, you may request a copy from help@hdfgroup.org.

-rem

-rem Tests for the h5dump tool

-rem

-rem    Created:  Scott Wegner, 8/23/07

-rem    Modified: Scott Wegner, 5/12/08

-rem

-

-setlocal enabledelayedexpansion

-pushd %~dp0

-

-set h5pubconf=%CD%\..\..\src\h5pubconf.h

-

-rem Determine which filters are available

-rem On Windows, the function :detect_filter sets these for us

-call :detect_filter szip

-call :detect_filter deflate

-call :detect_filter shuffle

-call :detect_filter fletcher32

-call :detect_filter nbit

-call :detect_filter scaleoffset

-

-rem The tool name

-set dumper=h5dump%2

-rem The path of the tool library

-set dumper_bin=%CD%\..\%dumper%\%1\%dumper%

-set testdir=%CD%\..\testfiles

-

-rem The h5diff tool name

-set h5diff=..\h5diff%2\%1\h5diff%2

-rem The path of the h5diff tool binary

-set h5diff_bin=%CD%\%h5diff%

-

-rem The h5import tool name

-set h5import=..\h5import%2\%1\h5import%2

-rem The path of the h5import tool binary

-set h5import_bin=%CD%\%h5import%

-

-set nerrors=0

-set verbose=yes

-

-set srcdir=%CD%

-

-if not exist %testdir% mkdir %testdir%

-

-goto main

-

-

-rem Print a line-line message left justified in a field of 70 characters

-rem beginning with the word "Testing".

-rem

-:testing

-    set test_msg=Testing %dumper%

-    for %%a in (%*) do (

-        if %%a neq PASSED (

-        if %%a neq *FAILED* (

-            set test_msg=!test_msg! %%~nxa

-        ) )

-    )

-    rem We need to replace PERCENT here with "%" for tests that use a percent

-    rem sign.  --SJW 5/12/08

-    set test_msg=!test_msg:PERCENT=%%!                                                                

-    echo.%test_msg:~0,69% %1

-    

-    exit /b

-

-    

-rem Run a test and print PASS or *FAIL*.  If a test fails then increment

-rem the `nerrors' global variable and (if $verbose is set) display the

-rem difference between the actual output and the expected output. The

-rem expected output is given as the first argument to this function and

-rem the actual output file is calculated by replacing the `.ddl' with

-rem `.out'.  The actual output is not removed if $HDF5_NOCLEANUP has a

-rem non-zero value.

-rem

-:tooltest

-    set expect=%CD%\..\testfiles\%1

-    set actual=%CD%\..\testfiles\%~n1.out

-    set actual_err=%CD%\..\testfiles\%~n1.err

-    

-    rem We define %params% here because Windows `shift` command doesn't affect

-    rem the %* variable.  --SJW 8/23/07

-    set params=%*

-    rem If there is not 2nd parameter, that means we have no filename, which 

-    rem implies that we are on the "tnofilename" test.  Make sure we remove the

-    rem expected output from the params, and add a space.  --SJW 8/27/07

-    if "%2"=="" (

-        set params= 

-    ) else (

-        set params=!params:* =!

-    )

-    

-    rem Run test.

-    

-    (

-        rem We need to replace PERCENT here with "%" for tests that use percents

-        rem Also remove quotes here, because Linux 'echo' command strips them.

-        rem --SJW 8/24/07

-        set params_echo=!params:PERCENT=%%!

-        echo.#############################

-        echo.Expected output for 'h5dump !params_echo:"=!'

-        echo.#############################

-        pushd %CD%\..\testfiles

-        %dumper_bin% !params:PERCENT=%%!

-        popd

-    ) > %actual% 2> %actual_err%

-    type %actual_err% >> %actual%

-    

-    if not exist %expect% (

-        rem Create the expect file if it doesn't yet exist.

-        call :testing CREATED %params%

-        copy /y %actual% %expect% > nul

-    ) else (

-        fc /w %expect% %actual% > nul

-        if !errorlevel! equ 0 (

-            call :testing PASSED %params%

-        ) else (

-            call :testing *FAILED* %params%

-            echo.    Expected results ^(*.ddl^) differs from actual results ^(*.out^)

-            set /a nerrors=!nerrors!+1

-            if "yes"=="%verbose%" fc /w %expect% %actual%

-        )

-    )

-    

-    rem Clean up output file

-    if not defined hdf5_nocleanup (

-        del /f %actual% %actual_err%

-    )

-    

-    exit /b

-    

-

-rem same as TOOLTEST but does not print the header Expected output

-rem use for the binary tests that expect a full path in -o

-:tooltest1

-

-    set expect=%srcdir%\..\testfiles\%1

-    set actual=%CD%\..\testfiles\%~n1.out

-    set actual_err=%CD%\..\testfiles\%~n1.err

-

-    rem We define %params% here because Windows `shift` command doesn't affect

-    rem the %* variable.  --SJW 8/23/07

-    set params=%*

-    rem If there is not 2nd parameter, that means we have no filename, which 

-    rem implies that we are on the "tnofilename" test.  Make sure we remove the

-    rem expected output from the params, and add a space.  --SJW 8/27/07

-    if "%2"=="" (

-        set params= 

-    ) else (

-        set params=!params:* =!

-    )

-    

-    rem Run test.

-    (

-        pushd %CD%\..\testfiles

-        %dumper_bin% !params:PERCENT=%%!

-        popd

-    ) > %actual% 2> %actual_err%

-    type %actual_err% >> %actual%

-        

-    if not exist %expect% (

-        rem Create the expect file if it doesn't yet exist.

-        call :testing CREATED %params%

-        copy /y %actual% %expect% > nul

-    ) else (

-        fc /w %expect% %actual% > nul

-        if !errorlevel! equ 0 (

-            call :testing PASSED %params%

-        ) else (

-            call :testing *FAILED* %params%

-            echo.    Expected results ^(*.ddl^) differs from actual results ^(*.out^)

-            set /a nerrors=!nerrors!+1

-            if "yes"=="%verbose%" fc /w %expect% %actual%

-        )

-    )

-    

-    rem Clean up output file

-    if not defined hdf5_nocleanup (

-        del /f %actual% %actual_err%

-    )

-    

-    exit /b

-

-rem Print a "SKIP" message

-:skip

-    call :testing -SKIP- %*

-    exit /b

-    

-    

-rem Print a line-line message left justified in a field of 70 characters

-rem

-:print_h5diff

-    set test_msg=Running h5diff

-    for %%a in (%*) do (

-        if %%a neq PASSED (

-        if %%a neq *FAILED* (

-            set test_msg=!test_msg! %%~nxa

-        ) )

-    )

-    set test_msg=%test_msg%                                                                

-    echo.%test_msg:~0,69% %1

-    

-    exit /b

-

-    

-rem Call the h5diff tool

-rem

-:difftest

-    (

-        pushd %CD%\..\testfiles

-        %h5diff_bin% %* -q

-        popd

-    )

-    if %errorlevel% neq 0 (

-        call :print_h5diff *FAILED* %*

-        set /a nerrors=!nerrors!+1

-    ) else (

-        call :print_h5diff PASSED %*

-    )

-    

-    exit /b

-

-    

-rem Print a line-line message left justified in a field of 70 characters

-rem beginning with the word "Verifying".

-rem

-:print_h5import

-    set test_msg=Running h5import

-    for %%a in (%*) do (

-        if %%a neq PASSED (

-        if %%a neq *FAILED* (

-            set test_msg=!test_msg! %%~nxa

-        ) )

-    )

-    set test_msg=%test_msg%                                                                

-    echo.%test_msg:~0,69% %1

-    

-    exit /b

-

-    

-rem Call the h5import tool

-rem

-:importtest

-    rem Remove the output hdf5 file if it exists

-    set hdf5_file=%CD%\..\testfiles\%5

-    if exist %hdf5_file% (

-        del /f %hdf5_file%

-    )

-    

-    (

-        pushd %CD%\..\testfiles

-        %h5import_bin% %*

-        popd

-    )

-    if %errorlevel% neq 0 (

-        call :print_h5import *FAILED* %*

-        set /a nerrors=!nerrors!+1

-    ) else (

-        call :print_h5import PASSED %*

-    )

-    exit /b

-

-    

-    

-rem This is a Windows-specific function that detects if the filter passed

-rem should be enabled for this test script.  It searches H5pubconf.h for the

-rem string "#define H5_HAVE_FILTER_%1" and sets the variable "use_filter_%1"

-rem accordingly.  On other platforms, this variable is set in the Makefile.

-rem If we find a better way to test this in the future, we should use it.

-rem --SJW 9/4/07

-:detect_filter

-    findstr /b /i /c:"#define H5_HAVE_FILTER_%1" %h5pubconf% > nul

-    if %errorlevel% equ 0 (

-        set use_filter_%1=yes

-    ) else (

-        set use_filter_%1=no

-    )

-    

-    exit /b

-

-

-rem ############################################################################

-rem ############################################################################

-rem #                       T H E   T E S T S                                ###

-rem ############################################################################

-rem ############################################################################

-:main

-

-    rem test for signed/unsigned datasets

-    call :tooltest packedbits.ddl packedbits.h5

-

-    rem test for displaying groups

-    call :tooltest tgroup-1.ddl tgroup.h5

-    rem test for displaying the selected groups

-    call :tooltest tgroup-2.ddl --group=/g2 --group / -g /y tgroup.h5

-

-    rem test for displaying simple space datasets

-    call :tooltest tdset-1.ddl tdset.h5

-    rem test for displaying selected datasets

-    call :tooltest tdset-2.ddl -H -d dset1 -d /dset2 --dataset=dset3 tdset.h5

-

-    rem test for displaying attributes

-    call :tooltest tattr-1.ddl tattr.h5

-    rem test for displaying the selected attributes of string type and scalar space

-    call :tooltest tattr-2.ddl -a /attr1 --attribute /attr4 --attribute=/attr5 tattr.h5

-    rem test for header and error messages

-    call :tooltest tattr-3.ddl --header -a /attr2 --attribute=/attr tattr.h5

-    rem test for displaying attributes in shared datatype (also in group and dataset)

-    call :tooltest tnamed_dtype_attr.ddl tnamed_dtype_attr.h5

-

-    rem test for displaying soft links and user-defined links

-    call :tooltest tslink-1.ddl tslink.h5

-    call :tooltest tudlink-1.ddl tudlink.h5

-    rem test for displaying the selected link

-    call :tooltest tslink-2.ddl -l slink2 tslink.h5

-    call :tooltest tudlink-2.ddl -l udlink2 tudlink.h5

-

-    rem tests for hard links

-    call :tooltest thlink-1.ddl thlink.h5

-    call :tooltest thlink-2.ddl -d /g1/dset2 --dataset /dset1 --dataset=/g1/g1.1/dset3 thlink.h5

-    call :tooltest thlink-3.ddl -d /g1/g1.1/dset3 --dataset /g1/dset2 --dataset=/dset1 thlink.h5

-    call :tooltest thlink-4.ddl -g /g1 thlink.h5

-    call :tooltest thlink-5.ddl -d /dset1 -g /g2 -d /g1/dset2 thlink.h5

-

-    rem tests for compound data types

-    call :tooltest tcomp-1.ddl tcompound.h5

-    rem test for named data types

-    call :tooltest tcomp-2.ddl -t /type1 --datatype /type2 --datatype=/group1/type3 tcompound.h5

-    rem test for unamed type 

-    call :tooltest tcomp-3.ddl -t /#6632 -g /group2 tcompound.h5

-    rem test complicated compound datatype

-    call :tooltest tcomp-4.ddl tcompound_complex.h5

-    

-    rem test for the nested compound type

-    call :tooltest tnestcomp-1.ddl tnestedcomp.h5

-

-    rem test for options

-    call :tooltest tall-1.ddl tall.h5

-    call :tooltest tall-2.ddl --header -g /g1/g1.1 -a attr2 tall.h5

-    call :tooltest tall-3.ddl -d /g2/dset2.1 -l /g1/g1.2/g1.2.1/slink tall.h5

-

-    rem test for loop detection

-    call :tooltest tloop-1.ddl tloop.h5

-

-    rem test for string 

-    call :tooltest tstr-1.ddl tstr.h5

-    call :tooltest tstr-2.ddl tstr2.h5

-

-    rem test for file created by Lib SAF team

-    call :tooltest tsaf.ddl tsaf.h5

-

-    rem test for file with variable length data

-    call :tooltest tvldtypes1.ddl tvldtypes1.h5

-    call :tooltest tvldtypes2.ddl tvldtypes2.h5

-    call :tooltest tvldtypes3.ddl tvldtypes3.h5

-    call :tooltest tvldtypes4.ddl tvldtypes4.h5

-    call :tooltest tvldtypes5.ddl tvldtypes5.h5

-

-    rem test for file with variable length string data

-    call :tooltest tvlstr.ddl tvlstr.h5

-

-    rem test for files with array data

-    call :tooltest tarray1.ddl tarray1.h5

-    call :tooltest tarray1_big.ddl -R tarray1_big.h5

-    call :tooltest tarray2.ddl tarray2.h5

-    call :tooltest tarray3.ddl tarray3.h5

-    call :tooltest tarray4.ddl tarray4.h5

-    call :tooltest tarray5.ddl tarray5.h5

-    call :tooltest tarray6.ddl tarray6.h5

-    call :tooltest tarray7.ddl tarray7.h5

-    call :tooltest tarray8.ddl tarray8.h5

-

-    rem test for files with empty data

-    call :tooltest tempty.ddl tempty.h5

-

-    rem test for files with groups that have comments

-    call :tooltest tgrp_comments.ddl tgrp_comments.h5

-

-    rem test the --filedriver flag

-    call :tooltest tsplit_file.ddl --filedriver=split tsplit_file

-    rem On Windows, we pass "PERCENT", and let other calls replace it with

-    rem the "%".  We cannot pass "%" directly because Windows interprets it as

-    rem the name of the script.  --SJW 8/24/07

-    call :tooltest tfamily.ddl --filedriver=family tfamilyPERCENT05d.h5

-    call :tooltest tmulti.ddl --filedriver=multi tmulti

-

-    rem test for files with group names which reach > 1024 bytes in size

-    call :tooltest tlarge_objname.ddl -w157 tlarge_objname.h5

-

-    rem test '-A' to suppress data but print attr's

-    call :tooltest tall-2A.ddl -A tall.h5

-

-    rem test '-r' to print attributes in ASCII instead of decimal

-    call :tooltest tall-2B.ddl -A -r tall.h5

-

-    rem test Subsetting

-    call :tooltest tall-4s.ddl --dataset=/g1/g1.1/dset1.1.1 --start=1,1 --stride=2,3 --count=3,2 --block=1,1 tall.h5

-    call :tooltest tall-5s.ddl -d "/g1/g1.1/dset1.1.2[0;2;10;]" tall.h5

-    call :tooltest tdset-3s.ddl -d "/dset1[1,1;;;]" tdset.h5

-    rem block

-    rem call :tooltest tdset2-1s.ddl -d "/dset1[;3,2;4,4;1,4]" tdset2.h5

-

-    rem test printing characters in ASCII instead of decimal

-    call :tooltest tchar1.ddl -r tchar.h5

-

-    rem test failure handling

-    rem Missing file name

-    call :tooltest tnofilename.ddl 

-

-    rem rev. 2004

-

-    rem tests for super block

-    call :tooltest tboot1.ddl -H -B -d dset tfcontents1.h5

-    call :tooltest tboot2.ddl -B tfcontents2.h5

-

-    rem test -p with a non existing dataset

-    call :tooltest tperror.ddl -p -d bogus tfcontents1.h5

-

-    rem test for file contents

-    call :tooltest tcontents.ddl -n tfcontents1.h5

-

-    rem tests for storage layout

-    rem compact

-    call :tooltest tcompact.ddl -H -p -d compact tfilters.h5

-    rem contiguous

-    call :tooltest tcontiguos.ddl -H -p -d contiguous tfilters.h5

-    rem chunked

-    call :tooltest tchunked.ddl -H -p -d chunked tfilters.h5

-    rem external 

-    call :tooltest texternal.ddl -H -p -d external tfilters.h5

-

-    rem fill values

-    call :tooltest tfill.ddl -p tfvalues.h5

-

-    rem several datatype, with references , print path

-    call :tooltest treference.ddl  tattr2.h5

-

-    rem escape/not escape non printable characters

-    call :tooltest tstringe.ddl -e tstr3.h5

-    call :tooltest tstring.ddl tstr3.h5

-    rem char data as ASCII with non escape

-    call :tooltest tstring2.ddl -r -d str4 tstr3.h5

-

-    rem array indices print/not print

-    call :tooltest tindicesyes.ddl taindices.h5

-    call :tooltest tindicesno.ddl -y taindices.h5

-

-    rem ######### array indices with subsetting

-    rem 1D case

-    call :tooltest tindicessub1.ddl -d 1d -s 1 -S 10 -c 2 -k 3 taindices.h5

-

-    rem 2D case

-    call :tooltest tindicessub2.ddl -d 2d -s 1,2 -S 3,3 -c 3,2 -k 2,2 taindices.h5

-

-    rem 3D case

-    call :tooltest tindicessub3.ddl -d 3d -s 0,1,2 -S 1,3,3 -c 2,2,2 -k 1,2,2 taindices.h5

-

-    rem 4D case

-    call :tooltest tindicessub4.ddl -d 4d -s 0,0,1,2 -c 2,2,3,2 -S 1,1,3,3 -k 1,1,2,2 taindices.h5

-

-

-    rem tests for filters

-    rem SZIP

-    set option=-H -p -d szip tfilters.h5

-    if not "%use_filter_szip%"=="yes" (

-        call :skip %option%

-    ) else (

-        call :tooltest tszip.ddl %option%

-    )

-    rem deflate

-    set option=-H -p -d deflate tfilters.h5

-    if not "%use_filter_deflate%"=="yes" (

-        call :skip %option%

-    ) else (

-        call :tooltest tdeflate.ddl %option%

-    )

-    rem shuffle

-    set option=-H -p -d shuffle tfilters.h5

-    if not "%use_filter_shuffle%"=="yes" (

-        call :skip %option%

-    ) else (

-        call :tooltest tshuffle.ddl %option%

-    )

-    rem fletcher32

-    set option=-H -p -d fletcher32  tfilters.h5

-    if not "%use_filter_fletcher32%"=="yes" (

-        call :skip %option%

-    ) else (

-        call :tooltest tfletcher32.ddl %option%

-    )

-    rem nbit

-    set option=-H -p -d nbit  tfilters.h5

-    if not "%use_filter_nbit%"=="yes" (

-        call :skip %option%

-    ) else (

-        call :tooltest tnbit.ddl %option%

-    )

-    rem scaleoffset

-    set option=-H -p -d scaleoffset  tfilters.h5

-    if not "%use_filter_scaleoffset%"=="yes" (

-        call :skip %option%

-    ) else (

-        call :tooltest tscaleoffset.ddl %option%

-    )

-    rem all

-    set option=-H -p -d all  tfilters.h5

-    rem Windows doesn't have "or" for compound conditional, so we must check

-    rem each one individually.  --SJW 8/24/07

-    if not "%use_filter_fletcher32%"=="yes" (

-        call :skip %option%

-    ) else if not "%use_filter_szip%"=="yes" (

-        call :skip %option%

-    ) else if not "%use_filter_deflate%"=="yes" (

-        call :skip %option%

-    ) else if not "%use_filter_shuffle%"=="yes" (

-        call :skip %option%

-    ) else if not "%use_filter_nbit%"=="yes" (

-        call :skip %option%

-    ) else if not "%use_filter_scaleoffset%"=="yes" (

-        call :skip %option%

-    ) else (

-        call :tooltest tallfilters.ddl %option%

-    )

-    rem user defined

-    call :tooltest tuserfilter.ddl -H  -p -d myfilter  tfilters.h5

-

-    rem test for displaying objects with very long names

-    call :tooltest tlonglinks.ddl tlonglinks.h5

-

-    rem dimensions over 4GB, print boundary 

-    call :tooltest tbigdims.ddl -d dset4gb -s 4294967284 -c 22 tbigdims.h5

-

-    rem hyperslab read

-    call :tooltest thyperslab.ddl thyperslab.h5

-

-

-    rem

-        

-    rem test for displaying dataset and attribute of null space

-    call :tooltest tnullspace.ddl tnullspace.h5

-

-    rem test for long double (some systems do not have long double)

-    rem call :tooltest tldouble.ddl tldouble.h5

-

-    rem test for vms

-    call :tooltest tvms.ddl tvms.h5

-

-    rem test for binary output

-    rem Don't use %testdir% here, because we are already in the correct

-    rem directory, and using it only gets in the way of the output formatting.

-    rem --SJW 8/24/07

-    call :tooltest1   tbin1.ddl -d integer -o out1.bin -b LE tbinary.h5

-

-    rem NATIVE default. the NATIVE test can be validated with h5import/h5diff

-    call :tooltest1   tbin1.ddl -d integer -o out1.bin -b MEMORY tbinary.h5

-    call :importtest out1.bin -c out3.h5import -o out1.h5

-    call :difftest tbinary.h5 out1.h5 /integer /integer

-    

-    call :tooltest1 tbin2.ddl -b BE -d float -o out2.bin tbinary.h5

-    

-    rem the NATIVE test can be validated with h5import/h5diff

-    call :tooltest1 tbin3.ddl -d integer -o out3.bin -b NATIVE tbinary.h5

-    call :importtest out3.bin -c out3.h5import -o out3.h5

-    call :difftest tbinary.h5 out3.h5 /integer /integer

-

-    call :tooltest1   tbin4.ddl -d double  -b FILE -o out4.bin    tbinary.h5

-       

-    rem Clean up binary output files

-    if not defined hdf5_nocleanup (

-        for /l %%a in (1,1,4) do del /f %testdir%\out%%a.bin

-        del /f %testdir%\out3.h5

-    )

-

-    rem test for dataset region references 

-    call :tooltest tdatareg.ddl tdatareg.h5

-    call :tooltest tdataregR.ddl -R tdatareg.h5

-    call :tooltest tattrreg.ddl tattrreg.h5

-    call :tooltest tattrregR.ddl -R tattrreg.h5

-

-    rem tests for group creation order

-    rem "1" tracked, "2" name, root tracked

-    call :tooltest tordergr1.ddl --group=1 --sort_by=creation_order --sort_order=ascending tordergr.h5

-    call :tooltest tordergr2.ddl --group=1 --sort_by=creation_order --sort_order=descending tordergr.h5

-    call :tooltest tordergr3.ddl -g 2 -q name -z ascending tordergr.h5

-    call :tooltest tordergr4.ddl -g 2 -q name -z descending tordergr.h5

-    call :tooltest tordergr5.ddl -q creation_order tordergr.h5

-

-    rem tests for attribute order

-    call :tooltest torderattr1.ddl -H --sort_by=name --sort_order=ascending torderattr.h5

-    call :tooltest torderattr2.ddl -H --sort_by=name --sort_order=descending torderattr.h5

-    call :tooltest torderattr3.ddl -H --sort_by=creation_order --sort_order=ascending torderattr.h5

-    call :tooltest torderattr4.ddl -H --sort_by=creation_order --sort_order=descending torderattr.h5

-

-    rem tests for floating point user defined printf format

-    rem Note: Make sure to use PERCENT rather than "%", because Windows needs

-    rem to handle it specially.  --SJW 5/12/08

-    call :tooltest tfpformat.ddl -m PERCENT.7f tfpformat.h5

-
-    rem tests for traversal of external links
-    call :tooltest textlinksrc.ddl textlinksrc.h5
-    call :tooltest textlinkfar.ddl textlinkfar.h5
-
-    rem test for dangling external links
-    call :tooltest textlink.ddl textlink.h5
-

-	rem test for dataset packed bits 

-	rem Set up xCMD to test or skip.

-    rem Limits:

-    rem Maximum number of packed bits is 8 (for now).

-    rem Maximum integer size is 64 (for now).

-    rem Maximun Offset is 63 (Maximum size - 1).

-    rem Maximum Offset+Length is 64 (Maximum size).

-    rem Tests:

-    rem Normal operation on both signed and unsigned int datasets.

-    rem Sanity check

-    rem Their rawdata output should be the same.

-    call :tooltest tpbitsSignedWhole.ddl -d /DS08BITS -M 0,8 packedbits.h5

-    call :tooltest tpbitsUnsignedWhole.ddl -d /DU08BITS -M 0,8 packedbits.h5

-    call :tooltest tpbitsSignedIntWhole.ddl -d /DS16BITS -M 0,16 packedbits.h5

-    call :tooltest tpbitsUnsignedIntWhole.ddl -d /DU16BITS -M 0,16 packedbits.h5

-    call :tooltest tpbitsSignedLongWhole.ddl -d /DS32BITS -M 0,32 packedbits.h5

-    call :tooltest tpbitsUnsignedLongWhole.ddl -d /DU32BITS -M 0,32 packedbits.h5

-    call :tooltest tpbitsSignedLongLongWhole.ddl -d /DS64BITS -M 0,64 packedbits.h5

-    call :tooltest tpbitsUnsignedLongLongWhole.ddl -d /DU64BITS -M 0,64 packedbits.h5

-    call :tooltest tpbitsSignedLongLongWhole63.ddl -d /DS64BITS -M 0,63 packedbits.h5

-    call :tooltest tpbitsUnsignedLongLongWhole63.ddl -d /DU64BITS -M 0,63 packedbits.h5

-    call :tooltest tpbitsSignedLongLongWhole1.ddl -d /DS64BITS -M 1,63 packedbits.h5

-    call :tooltest tpbitsUnsignedLongLongWhole1.ddl -d /DU64BITS -M 1,63 packedbits.h5

-    rem Half sections

-    call :tooltest tpbitsSigned4.ddl -d /DS08BITS -M 0,4,4,4 packedbits.h5

-    call :tooltest tpbitsUnsigned4.ddl -d /DU08BITS -M 0,4,4,4 packedbits.h5

-    call :tooltest tpbitsSignedInt8.ddl -d /DS16BITS -M 0,8,8,8 packedbits.h5

-    call :tooltest tpbitsUnsignedInt8.ddl -d /DU16BITS -M 0,8,8,8 packedbits.h5

-    call :tooltest tpbitsSignedLong16.ddl -d /DS32BITS -M 0,16,16,16 packedbits.h5

-    call :tooltest tpbitsUnsignedLong16.ddl -d /DU32BITS -M 0,16,16,16 packedbits.h5

-    call :tooltest tpbitsSignedLongLong32.ddl -d /DS64BITS -M 0,32,32,32 packedbits.h5

-    call :tooltest tpbitsUnsignedLongLong32.ddl -d /DU64BITS -M 0,32,32,32 packedbits.h5

-    rem Quarter sections

-    call :tooltest tpbitsSigned2.ddl -d /DS08BITS -M 0,2,2,2,4,2,6,2 packedbits.h5

-    call :tooltest tpbitsUnsigned2.ddl -d /DU08BITS -M 0,2,2,2,4,2,6,2 packedbits.h5

-    call :tooltest tpbitsSignedInt4.ddl -d /DS16BITS -M 0,4,4,4,8,4,12,4 packedbits.h5

-    call :tooltest tpbitsUnsignedInt4.ddl -d /DU16BITS -M 0,4,4,4,8,4,12,4 packedbits.h5

-    call :tooltest tpbitsSignedLong8.ddl -d /DS32BITS -M 0,8,8,8,16,8,24,8 packedbits.h5

-    call :tooltest tpbitsUnsignedLong8.ddl -d /DU32BITS -M 0,8,8,8,16,8,24,8 packedbits.h5

-    call :tooltest tpbitsSignedLongLong16.ddl -d /DS64BITS -M 0,16,16,16,32,16,48,16 packedbits.h5

-    call :tooltest tpbitsUnsignedLongLong16.ddl -d /DU64BITS -M 0,16,16,16,32,16,48,16 packedbits.h5

-    rem Begin and End

-    call :tooltest tpbitsSigned.ddl -d /DS08BITS -M 0,2,2,6 packedbits.h5

-    call :tooltest tpbitsUnsigned.ddl -d /DU08BITS -M 0,2,2,6 packedbits.h5

-    call :tooltest tpbitsSignedInt.ddl -d /DS16BITS -M 0,2,10,6 packedbits.h5

-    call :tooltest tpbitsUnsignedInt.ddl -d /DU16BITS -M 0,2,10,6 packedbits.h5

-    call :tooltest tpbitsSignedLong.ddl -d /DS32BITS -M 0,2,26,6 packedbits.h5

-    call :tooltest tpbitsUnsignedLong.ddl -d /DU32BITS -M 0,2,26,6 packedbits.h5

-    call :tooltest tpbitsSignedLongLong.ddl -d /DS64BITS -M 0,2,58,6 packedbits.h5

-    call :tooltest tpbitsUnsignedLongLong.ddl -d /DU64BITS -M 0,2,58,6 packedbits.h5

-    rem Overlapped packed bits.

-    call :tooltest tpbitsOverlapped.ddl -d /DS08BITS -M 0,1,1,1,2,1,0,3 packedbits.h5

-    rem Maximum number of packed bits.

-    call :tooltest tpbitsMax.ddl -d /DS08BITS -M 0,1,1,1,2,1,3,1,4,1,5,1,6,1,7,1 packedbits.h5

-    rem Compound type.

-    call :tooltest tpbitsCompound.ddl -d /dset1 -M 0,1,1,1 tcompound.h5

-    rem Array type.

-    call :tooltest tpbitsArray.ddl -d /Dataset1 -M 0,1,1,1 tarray1.h5

-    rem Test Error handling.

-    rem Too many packed bits requested. Max is 8 for now.

-    call :tooltest tpbitsMaxExceeded.ddl -d /DS08BITS -M 0,1,0,1,1,1,2,1,3,1,4,1,5,1,6,1,7,1 packedbits.h5

-    rem Offset too large. Max is 7 (8-1) for now.

-    call :tooltest tpbitsOffsetExceeded.ddl -d /DS08BITS -M 64,1 packedbits.h5

-    call :tooltest tpbitsCharOffsetExceeded.ddl -d /DS08BITS -M 8,1 packedbits.h5

-    call :tooltest tpbitsIntOffsetExceeded.ddl -d /DS16BITS -M 16,1 packedbits.h5

-    call :tooltest tpbitsLongOffsetExceeded.ddl -d /DS32BITS -M 32,1 packedbits.h5

-    rem Bad offset, must not be negative.

-    call :tooltest tpbitsOffsetNegative.ddl -d /DS08BITS -M -1,1 packedbits.h5

-    rem Bad length, must not be positive.

-    call :tooltest tpbitsLengthPositive.ddl -d /DS08BITS -M 4,0 packedbits.h5

-    rem Offset+Length is too large. Max is 8 for now.

-    call :tooltest tpbitsLengthExceeded.ddl -d /DS08BITS -M 37,28 packedbits.h5

-    call :tooltest tpbitsCharLengthExceeded.ddl -d /DS08BITS -M 2,7 packedbits.h5

-    call :tooltest tpbitsIntLengthExceeded.ddl -d /DS16BITS -M 10,7 packedbits.h5

-    call :tooltest tpbitsLongLengthExceeded.ddl -d /DS32BITS -M 26,7 packedbits.h5

-    rem Incomplete pair of packed bits request.

-    call :tooltest tpbitsIncomplete.ddl -d /DS08BITS -M 0,2,2,1,0,2,2, packedbits.h5

-    

-    if %nerrors% equ 0 (

-        echo.All %dumper% tests passed.

-    )

-    

-    popd

-    endlocal & exit /b %nerrors%

-    

diff --git a/windows/tools/h5dump/testh5dumpxml.bat b/windows/tools/h5dump/testh5dumpxml.bat
deleted file mode 100644
index 63356aa..0000000
--- a/windows/tools/h5dump/testh5dumpxml.bat
+++ /dev/null
@@ -1,224 +0,0 @@
-@echo off

-rem

-rem Copyright by The HDF Group.

-rem Copyright by the Board of Trustees of the University of Illinois.

-rem All rights reserved.

-rem

-rem This file is part of HDF5.  The full HDF5 copyright notice, including

-rem terms governing use, modification, and redistribution, is contained in

-rem the files COPYING and Copyright.html.  COPYING can be found at the root

-rem of the source code distribution tree; Copyright.html can be found at the

-rem root level of an installed copy of the electronic HDF5 document set and

-rem is linked from the top-level documents page.  It can also be found at

-rem http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have

-rem access to either file, you may request a copy from help@hdfgroup.org.

-rem

-rem Tests for the h5dump tool

-rem

-rem    Created:  Scott Wegner, 8/27/07

-rem    Modified: 

-rem

-

-setlocal enabledelayedexpansion

-pushd %~dp0

-

-rem set h5_lone_colon=%h5_lone_colon%

-

-rem The tool name

-set dumper=h5dump%2

-rem The path of the tool library

-set dumper_bin=%CD%\..\%dumper%\%1\%dumper%

-

-set nerrors=0

-set verbose=yes

-

-if not exist ..\testfiles mkdir ..\testfiles

-

-goto main

-

-rem Print a line-line message left justified in a field of 70 characters

-rem beginning with the word "Testing".

-rem

-:testing

-    set test_msg=Testing %dumper%

-    for %%a in (%*) do (

-        if %%a neq PASSED (

-        if %%a neq *FAILED* (

-            set test_msg=!test_msg! %%~nxa

-        ) )

-    )

-    set test_msg=!test_msg!                                                                

-    echo.%test_msg:~0,69% %1

-    

-    exit /b

-

- 

-rem Run a test and print PASS or *FAIL*.  If a test fails then increment

-rem the `nerrors' global variable and (if $verbose is set) display the

-rem difference between the actual output and the expected output. The

-rem expected output is given as the first argument to this function and

-rem the actual output file is calculated by replacing the `.ddl' with

-rem `.out'.  The actual output is not removed if HDF5_NOCLEANUP has a

-rem non-zero value.

-rem

-:tooltest

-    set expect=%CD%\..\testfiles\%1

-    set expect_eol=%CD%\..\testfiles\%~n1.eol

-    set actual=%CD%\..\testfiles\%~n1.out

-    set actual_err=%CD%\..\testfiles\%~n1.err

-    

-    rem We define %params% here because Windows `shift` command doesn't affect

-    rem the %* variable.  --SJW 8/23/07

-    set params=%*

-    set params=%params:* =%

-    

-    rem Run test.

-    

-    (

-        rem Remove quotes here, because Linux 'echo' command strips them.

-        rem --SJW 8/24/07

-        echo.#############################

-        echo.Expected output for 'h5dump !params:"=!'

-        echo.#############################

-        pushd %CD%\..\testfiles

-        %dumper_bin% !params!

-        popd

-    ) > %actual% 2> %actual_err%

-    type %actual_err% >> %actual%

-    

-    if not exist %expect% (

-        call :testing CREATED %params%

-        copy %actual% %expect% > nul

-    ) else (

-        fc /w %expect% %actual% > nul

-        if !errorlevel! equ 0 (

-            call :testing PASSED %params%

-        ) else (

-            rem First, check if the error is caused by Unix-style EOL, because

-            rem FC can fail incorrectly when comparing them. --SJW 5/30/08

-            more < %expect% > %expect_eol%

-            fc /w %expect_eol% %actual% > nul

-            if !errorlevel! equ 0 (

-                call :testing PASSED %params%

-            ) else (

-                call :testing *FAILED* %params%

-                echo.    Expected results ^(*.ddl^) differs from actual results ^(*.out^)

-                set /a nerrors=!nerrors!+1

-                if "yes"=="%verbose%" fc /w %expect% %actual%

-            )

-        )

-    )

-    

-    rem Clean up output file

-    if not defined HDF5_NOCLEANUP del /f %expect_eol% %actual% %actual_err% 

-    

-    exit /b

-    

-

-rem Print a "SKIP" message

-:skip

-    call :testing -SKIP- %*

-    exit /b

-    

-    

-rem ############################################################################

-rem ############################################################################

-rem #                       T H E   T E S T S                                ###

-rem ############################################################################

-rem ############################################################################

-:main

-

-    rem test XML

-    call :tooltest tall.h5.xml --xml tall.h5

-    call :tooltest tattr.h5.xml --xml tattr.h5

-    call :tooltest tbitfields.h5.xml --xml tbitfields.h5

-    call :tooltest tcompound.h5.xml --xml tcompound.h5

-    call :tooltest tcompound2.h5.xml --xml tcompound2.h5

-    call :tooltest tdatareg.h5.xml --xml tdatareg.h5

-    call :tooltest tdset.h5.xml --xml tdset.h5

-    call :tooltest tdset2.h5.xml --xml tdset2.h5

-    call :tooltest tenum.h5.xml --xml tenum.h5

-    call :tooltest tgroup.h5.xml --xml tgroup.h5

-    call :tooltest thlink.h5.xml --xml thlink.h5

-    call :tooltest tloop.h5.xml --xml tloop.h5

-    call :tooltest tloop2.h5.xml --xml tloop2.h5

-    call :tooltest tmany.h5.xml --xml tmany.h5

-    call :tooltest tnestedcomp.h5.xml --xml tnestedcomp.h5

-    call :tooltest tcompound_complex.h5.xml --xml tcompound_complex.h5

-    call :tooltest tobjref.h5.xml --xml tobjref.h5

-    call :tooltest topaque.h5.xml --xml topaque.h5

-    call :tooltest tslink.h5.xml --xml tslink.h5

-    call :tooltest tudlink.h5.xml --xml tudlink.h5

-    call :tooltest textlink.h5.xml --xml textlink.h5

-    call :tooltest tstr.h5.xml --xml tstr.h5

-    call :tooltest tstr2.h5.xml --xml tstr2.h5

-    call :tooltest tref.h5.xml --xml tref.h5

-    call :tooltest tname-amp.h5.xml --xml tname-amp.h5

-    call :tooltest tname-apos.h5.xml --xml tname-apos.h5

-    call :tooltest tname-gt.h5.xml --xml tname-gt.h5

-    call :tooltest tname-lt.h5.xml --xml tname-lt.h5

-    call :tooltest tname-quot.h5.xml --xml tname-quot.h5

-    call :tooltest tname-sp.h5.xml --xml tname-sp.h5

-    call :tooltest tstring.h5.xml --xml tstring.h5

-    call :tooltest tstring-at.h5.xml --xml tstring-at.h5

-    call :tooltest tref-escapes.h5.xml --xml tref-escapes.h5

-    call :tooltest tref-escapes-at.h5.xml --xml tref-escapes-at.h5

-    call :tooltest tnodata.h5.xml --xml tnodata.h5

-    call :tooltest tarray1.h5.xml --xml tarray1.h5

-    call :tooltest tarray2.h5.xml --xml tarray2.h5

-    call :tooltest tarray3.h5.xml --xml tarray3.h5

-    call :tooltest tarray6.h5.xml --xml tarray6.h5

-    call :tooltest tarray7.h5.xml --xml tarray7.h5

-    call :tooltest tvldtypes1.h5.xml --xml tvldtypes1.h5

-    call :tooltest tvldtypes2.h5.xml --xml tvldtypes2.h5

-    call :tooltest tvldtypes3.h5.xml --xml tvldtypes3.h5

-    call :tooltest tvldtypes4.h5.xml --xml tvldtypes4.h5

-    call :tooltest tvldtypes5.h5.xml --xml tvldtypes5.h5

-    call :tooltest tvlstr.h5.xml --xml tvlstr.h5

-    call :tooltest tsaf.h5.xml --xml tsaf.h5

-    call :tooltest tempty.h5.xml --xml tempty.h5

-    call :tooltest tnamed_dtype_attr.h5.xml --xml tnamed_dtype_attr.h5

-    rem Test dataset and attribute of null space.  Commented out:

-    rem wait until the XML schema is updated for null space. 

-    rem call :tooltest tnullspace.h5.xml --xml tnulspace.h5

-

-    rem other options for xml

-

-    call :tooltest tempty-dtd.h5.xml --xml --use-dtd tempty.h5

-    call :tooltest tempty-dtd-2.h5.xml --xml -u tempty.h5

-

-    rem The lone colon here confuses some systems (Cray X1).  Skip

-    rem it if configure detects that this is a problem.

-    if not "X$H5_LONE_COLON"=="Xno" (

-        call :tooltest tempty-nons.h5.xml --xml -X ":" tempty.h5

-    ) else (

-        call :skip tempty-nons.h5.xml --xml -X ":" tempty.h5

-    )

-

-    call :tooltest tempty-nons-2.h5.xml --xml --xml-ns=":" tempty.h5

-

-    rem Some of these combinations are syntactically correct but

-    rem  the URLs are dummies 

-    call :tooltest tempty-ns.h5.xml --xml -X "thing:" tempty.h5

-    call :tooltest tempty-ns-2.h5.xml --xml --xml-ns="thing:" tempty.h5

-    call :tooltest tempty-nons-uri.h5.xml --xml --xml-ns=":" --xml-dtd="http://somewhere.net" tempty.h5

-    call :tooltest tempty-dtd-uri.h5.xml --xml --use-dtd --xml-dtd="http://somewhere.net" tempty.h5

-

-    call :tooltest tall-2A.h5.xml --xml -A tall.h5

-

-    

-    rem tests for attribute order

-    call :tooltest torderattr1.h5.xml --xml -H --sort_by=name --sort_order=ascending torderattr.h5

-    call :tooltest torderattr2.h5.xml --xml -H --sort_by=name --sort_order=descending torderattr.h5

-    call :tooltest torderattr3.h5.xml --xml -H --sort_by=creation_order --sort_order=ascending torderattr.h5

-    call :tooltest torderattr4.h5.xml --xml -H --sort_by=creation_order --sort_order=descending torderattr.h5    

-    

-    

-    

-    if %nerrors% equ 0 (

-        echo.All %dumper% tests passed.

-    )

-    

-    popd

-    endlocal & exit /b %nerrors%

-    

diff --git a/windows/tools/h5dumpdll/h5dumpdll.vcproj b/windows/tools/h5dumpdll/h5dumpdll.vcproj
deleted file mode 100644
index bbe33d0..0000000
--- a/windows/tools/h5dumpdll/h5dumpdll.vcproj
+++ /dev/null
@@ -1,390 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="h5dumpdll"

-	ProjectGUID="{7E207F6A-DC28-4DEB-8454-7977092131DC}"

-	RootNamespace="h5dumpdll"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5dumpdll/Release/h5dumpdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5dumpdll/Release/h5dumpdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5dumpdll/Release/"

-				ObjectFile=".\../../../tools/h5dumpdll/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5dumpdll/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../tools/h5dumpdll/Release/h5dumpdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5dumpdll/Release/h5dumpdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5dumpdll/Release/h5dumpdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5dumpdll/Release/"

-				ObjectFile=".\../../../tools/h5dumpdll/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5dumpdll/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../tools/h5dumpdll/Release/h5dumpdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5dumpdll/Debug/h5dumpdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalOptions="/I /I&quot;..\..tools&quot;/Fp&quot;Debug/h5dumpdll.pch&quot; "

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5dumpdll/Debug/h5dumpdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5dumpdll/Debug/"

-				ObjectFile=".\../../../tools/h5dumpdll/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5dumpdll/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5dumpdll/Debug/h5dumpdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5dumpdll/Debug/h5dumpdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalOptions="/I /I&quot;..\..tools&quot;/Fp&quot;Debug/h5dumpdll.pch&quot; "

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5dumpdll/Debug/h5dumpdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5dumpdll/Debug/"

-				ObjectFile=".\../../../tools/h5dumpdll/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5dumpdll/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5dumpdll/Debug/h5dumpdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\..\tools\h5dump\h5dump.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/h5import/h5import.vcproj b/windows/tools/h5import/h5import.vcproj
deleted file mode 100644
index 72cdb7b..0000000
--- a/windows/tools/h5import/h5import.vcproj
+++ /dev/null
@@ -1,390 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="h5import"

-	ProjectGUID="{9E588AD8-14BD-4BA3-B4EA-16D1D882C700}"

-	RootNamespace="h5import"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5import/Release/h5import.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5import/Release/h5import.pch"

-				AssemblerListingLocation=".\../../../tools/h5import/Release/"

-				ObjectFile=".\../../../tools/h5import/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5import/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				ProgramDatabaseFile=".\../../../tools/h5import/Release/h5import.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5import/Release/h5import.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5import/Release/h5import.pch"

-				AssemblerListingLocation=".\../../../tools/h5import/Release/"

-				ObjectFile=".\../../../tools/h5import/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5import/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				ProgramDatabaseFile=".\../../../tools/h5import/Release/h5import.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5import/Debug/h5import.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5import/Debug/h5import.pch"

-				AssemblerListingLocation=".\../../../tools/h5import/Debug/"

-				ObjectFile=".\../../../tools/h5import/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5import/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5import/Debug/h5import.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5import/Debug/h5import.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5import/Debug/h5import.pch"

-				AssemblerListingLocation=".\../../../tools/h5import/Debug/"

-				ObjectFile=".\../../../tools/h5import/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5import/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5import/Debug/h5import.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\..\tools\h5import\h5import.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/h5import/h5importtestutil.bat b/windows/tools/h5import/h5importtestutil.bat
deleted file mode 100644
index 6ac8077..0000000
--- a/windows/tools/h5import/h5importtestutil.bat
+++ /dev/null
@@ -1,181 +0,0 @@
-@echo off

-rem

-rem Copyright by The HDF Group.

-rem Copyright by the Board of Trustees of the University of Illinois.

-rem All rights reserved.

-rem

-rem This file is part of HDF5.  The full HDF5 copyright notice, including

-rem terms governing use, modification, and redistribution, is contained in

-rem the files COPYING and Copyright.html.  COPYING can be found at the root

-rem of the source code distribution tree; Copyright.html can be found at the

-rem root level of an installed copy of the electronic HDF5 document set and

-rem is linked from the top-level documents page.  It can also be found at

-rem http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have

-rem access to either file, you may request a copy from help@hdfgroup.org.

-rem

-rem HDF Utilities Test script

-rem

-rem    Created:  Scott Wegner, 8/27/07

-rem    Modified:

-rem

-

-setlocal enabledelayedexpansion

-pushd %~dp0

-

-rem srcdir is used on Unix-- define as the current directory for Windows.

-set srcdir=%CD%

-

-rem The tool name

-set h5import=h5import%2

-rem The path of the tool binary

-set h5import_bin=%CD%\..\%h5import%\%1\%h5import%.exe

-

-rem The h5importtest tool name

-set h5importtest=..\testfiles\h5importtst\%1\h5importtst

-rem The path of the h5importtst tool binary

-set h5importtest_bin=%CD%\%h5importtest%.exe

-

-rem The h5dump tool name

-set h5dump=..\h5dump%2\%1\h5dump%2

-rem The path of the h5dump tool binary

-set h5dump_bin=%CD%\%h5dump%

-

-rem initialize errors variables

-set errors=0

-

-goto main

-

-:testing

-    set test_msg=Testing 

-    for %%a in (%*) do (

-        if %%a neq PASSED (

-        if %%a neq *FAILED* (

-            set test_msg=!test_msg! %%~nxa

-        ) )

-    )

-    rem We need to replace PERCENT-ZERO here with "%0" for the tfamily test.

-    rem --SJW 8/24/07

-    set test_msg=!test_msg:PERCENT-ZERO=%%0!                                                                

-    echo.%test_msg:~0,69% %1

-    

-    exit /b

-

-    

-:tooltest

-    set err=0

-    %h5import_bin% %*

-    %h5dump_bin% %5 > log2

-    

-    pushd tmp_testfiles

-    %h5dump_bin% %5 > log1

-    popd

-    

-    fc /w tmp_testfiles\log1 log2 > nul

-    if %errorlevel% neq 0 set err=1

-    del /f log2 tmp_testfiles\log1

-    if "%err%"=="1" (

-        set /a errors=!errors!+1

-        call :testing *FAILED* %testing%

-    ) else (

-        call :testing: PASSED %testing%

-    )

-    

-    exit /b

-    

-    

-:main

-    echo.

-    echo.==============================

-    echo.H5IMPORT tests started

-    echo.==============================

-

-    if exist %h5import_bin% (

-    if exist %h5importtest_bin% (

-    rem echo.** Testing h5import  ***

-    

-    del /f output.h5 log1 tx* b* *.dat 2> nul

-    

-    if not exist tmp_testfiles mkdir tmp_testfiles

-    copy /y testfiles\*.h5 tmp_testfiles > nul

-    

-    %h5importtest_bin%

-    

-    rem On Linux, they call TESTING here, and output pass/fail from TOOLTEST.

-    rem On Windows, echo gives a carriage return, so we store the TESTING params

-    rem and call TESTING from TOOLTEST.  --SJW 8/27/07

-    set testing=ASCII I32 rank 3 - Output BE 

-    call :tooltest %srcdir%\testfiles\txtin16.txt -c %srcdir%\testfiles\txtin32.conf -o txtin32.h5

-

-    set testing=ASCII I16 rank 3 - Output LE - CHUNKED - extended

-    call :tooltest %srcdir%\testfiles\txtin16.txt -c %srcdir%\testfiles\txtin16.conf -o txtin16.h5

-

-    set testing=ASCII I8 - rank 3 - Output I16 LE-Chunked+Extended+Compressed

-    call :tooltest %srcdir%\testfiles\txtin16.txt -c %srcdir%\testfiles\txtin8.conf  -o txtin8.h5

-

-    set testing=ASCII UI32 - rank 3 - Output BE

-    call :tooltest %srcdir%\testfiles\txtin32.txt -c %srcdir%\testfiles\txtuin32.conf -o txtuin32.h5

-

-    set testing=ASCII UI16 - rank 2 - Output LE+Chunked+Compressed

-    call :tooltest %srcdir%\testfiles\txtuin32.txt -c %srcdir%\testfiles\txtuin16.conf -o txtuin16.h5

-

-    set testing=ASCII F32 - rank 3 - Output LE

-    call :tooltest %srcdir%\testfiles\txtfp32.txt -c %srcdir%\testfiles\txtfp32.conf -o txtfp32.h5

-

-    set testing=ASCII F64 - rank 3 - Output BE + CHUNKED+Extended+Compressed

-    call :tooltest %srcdir%\testfiles\txtfp64.txt -c %srcdir%\testfiles\txtfp64.conf -o txtfp64.h5

-

-    set testing=BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed

-    call :tooltest binfp64.bin -c %srcdir%\testfiles\binfp64.conf -o binfp64.h5

-

-    set testing=BINARY I16 - rank 3 - Output order LE + CHUNKED + extended

-    call :tooltest binin16.bin -c %srcdir%\testfiles\binin16.conf -o binin16.h5

-

-    set testing=BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed

-    call :tooltest binin8.bin -c %srcdir%\testfiles\binin8.conf  -o binin8.h5

-

-    set testing=BINARY I32 - rank 3 - Output BE + CHUNKED

-    call :tooltest binin32.bin -c %srcdir%\testfiles\binin32.conf -o binin32.h5

-

-    set testing=BINARY UI16 - rank 3 - Output byte BE + CHUNKED

-    call :tooltest binuin16.bin -c %srcdir%\testfiles\binuin16.conf -o binuin16.h5

-

-    set testing=BINARY UI32 - rank 3 - Output LE + CHUNKED

-    call :tooltest binuin32.bin -c %srcdir%\testfiles\binuin32.conf -o binuin32.h5

-

-    set testing=STR 

-    call :tooltest %srcdir%\testfiles\txtstr.txt -c %srcdir%\testfiles\txtstr.conf -o txtstr.h5

-

-    set testing=BINARY I8 CR LF EOF

-    call :tooltest binin8w.bin -c %srcdir%\testfiles\binin8w.conf -o binin8w.h5

-    

-    set testing=ASCII F64 - rank 1 - INPUT-CLASS TEXTFPE 

-    call :tooltest %srcdir%\testfiles\textpfe64.txt -c %srcdir%\testfiles\textpfe.conf -o textpfe.h5

-

-

-    del /f *.txt *.bin *.h5

-    rmdir /s /q tmp_testfiles

-    

-    ) else (

-        echo.** h5importtest not avaiable ***

-        set /a errors=!errors!+1

-    )

-    ) else (

-        echo.** h5import not avaiable ***

-        set /a errors=!errors!+1

-    )

-    

-    rem

-    rem Check error results

-    if %errors% equ 0 (

-        echo.======================================

-        echo. H5IMPORT Utilities tests have passed.

-        echo.======================================

-    ) else (

-        echo.======================================

-        echo. H5IMPORT Utilities tests encountered errors

-        echo.======================================

-    )

-    

-    popd

-    endlocal & exit /b %errors%

-    

diff --git a/windows/tools/h5importdll/h5importdll.vcproj b/windows/tools/h5importdll/h5importdll.vcproj
deleted file mode 100644
index 9960816..0000000
--- a/windows/tools/h5importdll/h5importdll.vcproj
+++ /dev/null
@@ -1,382 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="h5importdll"

-	ProjectGUID="{2DCDB978-79B7-4A3A-B24A-D908A49B7D50}"

-	RootNamespace="h5importdll"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5importdll/Release/h5importdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5importdll/Release/h5importdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5importdll/Release/"

-				ObjectFile=".\../../../tools/h5importdll/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5importdll/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../tools/h5importdll/Release/h5importdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5importdll/Release/h5importdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5importdll/Release/h5importdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5importdll/Release/"

-				ObjectFile=".\../../../tools/h5importdll/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5importdll/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../tools/h5importdll/Release/h5importdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5importdll/Debug/h5importdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5importdll/Debug/h5importdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5importdll/Debug/"

-				ObjectFile=".\../../../tools/h5importdll/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5importdll/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5importdll/Debug/h5importdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5importdll/Debug/h5importdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5importdll/Debug/h5importdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5importdll/Debug/"

-				ObjectFile=".\../../../tools/h5importdll/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5importdll/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5importdll/Debug/h5importdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\..\tools\h5import\h5import.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/h5jam/h5jam.vcproj b/windows/tools/h5jam/h5jam.vcproj
deleted file mode 100644
index 37b1835..0000000
--- a/windows/tools/h5jam/h5jam.vcproj
+++ /dev/null
@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="h5jam"

-	ProjectGUID="{196F5935-2391-49A7-B6A2-410DF8149F0D}"

-	RootNamespace="h5jam"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5jam/Release/h5jam.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5jam/Release/h5jam.pch"

-				AssemblerListingLocation=".\../../../tools/h5jam/Release/"

-				ObjectFile=".\../../../tools/h5jam/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5jam/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../tools/h5jam/Release/h5jam.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5jam/Release/h5jam.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5jam/Release/h5jam.pch"

-				AssemblerListingLocation=".\../../../tools/h5jam/Release/"

-				ObjectFile=".\../../../tools/h5jam/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5jam/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../tools/h5jam/Release/h5jam.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5jam/Debug/h5jam.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5jam/Debug/h5jam.pch"

-				AssemblerListingLocation=".\../../../tools/h5jam/Debug/"

-				ObjectFile=".\../../../tools/h5jam/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5jam/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5jam/Debug/h5jam.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5jam/Debug/h5jam.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5jam/Debug/h5jam.pch"

-				AssemblerListingLocation=".\../../../tools/h5jam/Debug/"

-				ObjectFile=".\../../../tools/h5jam/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5jam/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5jam/Debug/h5jam.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\..\tools\h5jam\h5jam.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/h5jam/testh5jam.bat b/windows/tools/h5jam/testh5jam.bat
deleted file mode 100644
index aaefe23..0000000
--- a/windows/tools/h5jam/testh5jam.bat
+++ /dev/null
@@ -1,598 +0,0 @@
-@echo off

-rem

-rem Copyright by The HDF Group.

-rem Copyright by the Board of Trustees of the University of Illinois.

-rem All rights reserved.

-rem

-rem This file is part of HDF5.  The full HDF5 copyright notice, including

-rem terms governing use, modification, and redistribution, is contained in

-rem the files COPYING and Copyright.html.  COPYING can be found at the root

-rem of the source code distribution tree; Copyright.html can be found at the

-rem root level of an installed copy of the electronic HDF5 document set and

-rem is linked from the top-level documents page.  It can also be found at

-rem http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have

-rem access to either file, you may request a copy from help@hdfgroup.org.

-rem

-rem Tests for the h5jam/h5unjam tools

-rem

-rem    Created:  Scott Wegner, 8/27/07

-rem    Modified:

-rem

-

-rem We currently don't build DLL version of h5jam / h5unjam, but the test script

-rem is setup to handle it if we ever decide to.  --SJW 8/27/07

-

-setlocal enabledelayedexpansion

-pushd %~dp0

-

-set h5pubconf=%CD%\..\..\src\h5pubconf.h

-

-rem Determine which filters are available

-rem On Windows, the function :detect_filter sets these for us

-call :detect_filter szip

-call :detect_filter deflate

-call :detect_filter shuffle

-call :detect_filter fletcher32

-

-rem The dumper to use

-set dumper=..\h5dump%2\%1\h5dump%2

-rem The path of the dumper binary

-set dumper_bin=%CD%\%dumper%

-

-rem Tool to test

-set jam=h5jam%2

-rem Tool to test

-set unjam=h5unjam%2

-rem The path of the jam binary

-set jam_bin=%CD%\..\%jam%\%1\%jam%

-rem The path of the unjam binary

-set unjam_bin=%CD%\..\%unjam%\%1\%unjam%

-

-rem The tellub to use

-set tellub=..\..\test\tellub%2\%1\tellub%2

-rem The path of the tellub binary

-set tellub_bin=%CD%\%tellub%

-

-rem The getub to use

-set getub=..\..\test\getub%2\%1\getub%2

-rem The path of the getub binary

-set getub_bin=%CD%\%getub%

-

-set nerrors=0

-set verbose=yes

-

-set testfiles=%CD%\testfiles

-

-goto main

-

-rem Print a line-line message left justified in a field of 70 characters

-rem beginning with the word "Testing".

-rem

-:testing

-    set test_msg=Testing

-    for %%a in (%*) do (

-        if %%a neq PASSED (

-        if %%a neq *FAILED* (

-            set test_msg=!test_msg! %%~nxa

-        ) )

-    )

-    rem Replace ARROW_RIGHT with the correct symbol.  If it was passed directly,

-    rem our output would be incorrectly redirected.  --SJW 8/27/07

-    set test_msg=!test_msg:ARROW_RIGHT=^>!                                                                

-    echo.%test_msg:~0,69% %1

-    

-    exit /b

-

- 

-rem Print a line-line message left justified in a field of 70 characters

-rem beginning with the word "Compare".

-rem

-:compare

-    set test_msg=Compare

-    for %%a in (%*) do (

-        if %%a neq PASSED (

-        if %%a neq *FAILED* (

-            set test_msg=!test_msg! %%~nxa

-        ) )

-    )

-    set test_msg=!test_msg!                                                                

-    echo.%test_msg:~0,69% %1

-    

-    exit /b

-

-    

-rem Print a "SKIP" message

-:skip

-    call :testing -SKIP- %*

-    exit /b

-

-

-rem 

-rem  COMPARE_FILES a.h5 b.h5

-rem    Compare two files, skipping the first line.  This is used to 

-rem    compare the output of the dumper, skipping the file name which

-rem    is different.

-rem    The result is stored in 'compval'.

-rem

-:compare_files

-    rem The easiest way to compare 2 files on Windows and skip the first line

-    rem is to simply filter the first line differences from the output.  If the

-    rem first line is different, FC will also display the second line.

-    rem --SJW 8/27/07

-    fc %1 %2 | findstr /v /b /c:"Comparing files" | findstr /v /b /c:"*****" > cmp1

-    findstr /v /b /c:"    1:  " cmp1 | findstr /v /b /c:"    2:  " > cmp2

-    findstr /b /c:"  " cmp2 > nul

-    if %errorlevel% neq 1 (

-        set cmpval=1

-    ) else (

-        set cmpval=0

-    )

-    del /f cmp1 cmp2

-    

-    exit /b

-    

-    

-rem CLEANUP files

-rem     Clean up named files

-:cleanup

-    if not defined hdf5_nocleanup (

-        for %%a in (%*) do (

-            del /f %%a 2> nul

-        )

-    )

-    exit /b

-    

-    

-rem  SETUP file tocopy

-rem    Clone a standard input file in the test directory

-rem

-:setup

-    copy /y %1 %2 > nul

-    exit /b

-    

-    

-rem

-rem  CHECKFILE orig.h5 compar.h5

-rem     Check that the test file is the same as an original.

-rem     The two files are dumped with the dumper, and the output

-rem     compared with COMPARE_FILES.

-rem     If the files are the same, the test reports " PASSED",

-rem     otherwise, it reports "*FAILED*"

-:checkfile

-    set expected=%~dpn2.out

-    set expected_err=%~dpn2.err

-    set actual=%~n1.out

-    set actual_err=%~n1.err

-    %dumper_bin% %1 >%expected% 2>%expected_err%

-    type %expected_err% >> %expected%

-    

-    rem dump the test file

-    %dumper_bin% %2 >%actual% 2>%actual_err%

-    type %actual_err% >> %actual%

-    

-    rem compare the two files (ignore line 1)

-    call :compare_files %actual% %expected%

-    if "%cmpval%"=="0" (

-        call :compare PASSED %2 to %1

-    ) else (

-        call :compare *FAILED* %2 to %1

-        echo.    Expected result ^(*.ddl^) differs from actual result ^(*.out^)

-        set /a nerrors=!nerrors!+1

-        if "yes"=="%verbose%" fc %expected% %actual%

-    )

-    

-    rem Clean up output files

-    if not defined hdf5_nocleanup (

-        del /f %actual% %actual_err%

-        del /f %expected% %expected_err%

-    )

-    exit /b

-    

-    

-rem

-rem CHECK_UB file.h5 user_block_file origfile.h5 

-rem

-rem   Check the user block in 'file.h5' is the same as

-rem   'user_block' (allowing for padding).

-rem

-rem   If the original file had a user block before the test

-rem   then 'compare.h5' is passed.  The user block must be extracted

-rem   and the test file compared to:

-rem      cat compare_ub user_block_file.

-rem

-rem   This test uses './getub' to extract the user block from 

-rem   'file.h5', which is compared to the file described above.

-rem

-rem   The result is set in variable 'result1'.

-rem

-:check_ub_1

-    set hfile=%1

-    set ufile=%2

-    

-    rem check for third argument (the original file)

-    set origfile=

-    if not "%3"=="" (

-        set origfile="%3"

-    )

-    

-    rem find the length of the user block to check

-    for /f "tokens=4" %%a in ('dir /-c %ufile% ^| findstr /v /b /c:" "') do (

-        set s1=%%a

-    )

-    if "%s1%"=="0" (

-        echo.File %ufile% is empty

-        set result1=1

-    )

-    

-    rem Get the size of the original user block, if any

-    if defined origfile (

-        rem 'tellub' calls H5Fget_user_block to get the size

-        rem of the user block

-        for /f %%a in ('%tellub_bin% %origfile%') do set s2=%%a

-        if "!s2!"=="0" (

-            set size=%s1%

-            set cmpfile=%ufile%

-        ) else (

-            set cmpfile=tt2

-            set /a size=!s2!+%s1%

-            %getub_bin% -c !s2! %origfile% > !cmpfile!

-            type %ufile% >> !cmpfile!

-        )

-    ) else (

-        rem assume no user block

-        set s2=0

-        set size=%s1%

-        set cmpfile=%ufile%

-    )

-    

-    rem Extract 'size' bytes from the front of 'hfile'

-    rem Compare to 'cmpfile', result is set in result1

-    set tfile=tt1

-    %getub_bin% -c %size% %hfile% > %tfile%

-    fc /w %cmpfile% %tfile% > nul

-    if %errorlevel% neq 0 (

-        fc /w %cmpfile% %file%

-        set result1=1

-    ) else (

-        set result1=0

-    )

-    

-    rem clean up

-    del /f %tfile%

-    if not "%s2%"=="0" (

-        del /f %cmpfile%

-    )

-    exit /b

-    

-    

-rem  CHECK_NOUB file.h5

-rem

-rem  Check that 'file.h5' has no user block.

-rem  Setst result2 to 1 if there is a user block (fail), 0 if none (pass)

-:check_noub

-    set hfile=%1

-    rem call `ubsize` to get the size of the user block

-    %tellub_bin% %hfile% > tmp.txt

-    if %errorlevel% neq 0 (

-        rem error

-        set result2=1

-    ) else (

-        for /f %%a in (tmp.txt) do set ubsize=%%a

-        if "!ubsize!"=="0" (

-            rem pass

-            set result2=0

-        ) else (

-            rem fail

-            set result2=1

-        )

-    )

-    del /f tmp.txt 2> nul

-    

-    exit /b

-

-    

-rem  JAMTEST user_block file.h5 [--clobber] [ofile.h5]

-rem

-rem    Test the 'jam' tool:

-rem      1. figure out the input and output, and the comparision

-rem         that will be done.

-rem      2. call 'jam' with the appropriate arguments

-rem      3. check the user block is correct in the output (Check_UB)

-rem    If the user block is correct, print "PASSED", else "*FAILED*"

-:jamtest

-    set ufile=%1

-    set ifile=%2

-    rem the file to test

-    set compare_test=

-    rem the comparison to test against

-    set compare_orig=

-    set cleanup=

-    

-    rem sort out the arguments for the test and the check

-    set do_clobber=no

-    if "%3"=="--clobber" (

-        rem clobber overwrites and existing user block

-        set do_clobber=yes

-        set clobber=--clobber

-        set compare_orig=

-        if "%4"=="" (

-            rem output goes to infile, compare ubfile to infile

-            set ofile=

-            set compare_test=%ifile%

-        ) else (

-            rem output goes to %4, compare ofile to ubfile

-            set ofile=%4

-            set compare_test=!ofile!

-        )

-    ) else (

-        set clobber=

-        rem add user block to existing ub, if any

-        if "%3"=="" (

-            rem output goes to infile, compare ubfile to infile

-            set ofile=

-            set compare_test=%ifile%

-            copy /y %ifile% xxofile.h5 > nul

-            set compare_orig=xxofile.h5

-            set cleanup=%cleanup% !compare_orig!

-        ) else (

-            rem output goes to %4, compare ofile to ubfile

-            set ofile=%3

-            set compare_test=!ofile!

-            set compare_orig=%ifile%

-        )

-    )

-    

-    rem call 'jam' with the appropriate arguments

-    if defined ofile (

-        %jam_bin% -u %ufile% -i %ifile% -o %ofile% %clobber%

-    ) else (

-        %jam_bin% -u %ufile% -i %ifile% %clobber%

-    )

-    

-    call :check_ub_1 %compare_test% %ufile% %compare_orig%

-    

-    if "%result1%"=="0" (

-        if defined ofile (

-            call :testing PASSED %jam% -u %ufile% -i %ifile% -o %ofile% %clobber%

-        ) else (

-            call :testing PASSED %jam% -u %ufile% -i %ifile% %clobber%

-        )

-    ) else ( 

-        if defined ofile (

-            call :testing *FAILED* %jam% -u %ufile% -i %ifile% -o %ofile% %clobber%

-        ) else (

-            call :testing *FAILED* %jam% -u %ufile% -i %ifile% %clobber%

-        )

-        set /a nerrors=%nerrors%+1

-    )

-    call :cleanup %cleanup%

-    

-    exit /b

-    

-    

-rem UNJAMTEST  file.h5 [- | --delete] ofile

-rem

-rem  Test the 'unjam' tool

-rem

-rem ##fix the working directory here and in jamtest

-:unjamtest

-    set infile=%1

-    set ofile=%3

-    if "%2%"=="-" (

-        set uofile=uofile

-        %unjam_bin% -i %infile% -o %ofile% > !uofile!

-    ) else if "%2"=="--delete" (

-        set uofile=none

-        %unjam_bin% -i %infile% -o %ofile% --delete

-    ) else (

-        set uofile=%2

-        %unjam_bin% -i %infile% -u !uofile! -o %ofile%

-    )

-    

-    set result1=0

-    set result2=0

-    set cleanup=

-    if not "%uofile%"=="none" (

-        rem sets results1

-        call :check_ub_1 %infile% %uofile%

-        call :cleanup %uofile%

-    )

-    

-    rem sets result2

-    call :check_noub %ofile%

-    if "%result1% and %result2%"=="0 and 0" (

-        if "%2%"=="-" (

-            rem We use "ARROW_RIGHT" here and replace it in :testing because

-            rem Windows interprets it as a pipe.  --SJW 8/27/07

-            call :testing PASSED %unjam% -i %infile% -o %ofile% ARROW_RIGHT %uofile%

-        ) else if "%2"=="--delete" (

-            call :testing PASSED %unjam% -i %infile% -o %ofile% --delete

-        ) else (

-            call :testing PASSED %unjam% -i %infile% -u %uofile% -o %ofile%

-        )

-    ) else (

-        if "%2%"=="-" (

-            rem We use "ARROW_RIGHT" here and replace it in :testing because

-            rem Windows interprets it as a pipe.  --SJW 8/27/07

-            call :testing *FAILED* %unjam% -i %infile% -o %ofile% ARROW_RIGHT %uofile%

-        ) else if "%2"=="--delete" (

-            call :testing *FAILED* %unjam% -i %infile% -o %ofile% --delete

-        ) else (

-            call :testing *FAILED* %unjam% -i %infile% -u %uofile% -o %ofile%

-        )

-        set /a nerrors=%nerrors%+1

-    )

-    

-    exit /b

-    

-    

-rem This is a Windows-specific function that detects if the filter passed

-rem should be enabled for this test script.  It searches H5pubconf.h for the

-rem string "#define H5_HAVE_FILTER_%1" and sets the variable "use_filter_%1"

-rem accordingly.  On other platforms, this variable is set in the Makefile.

-rem If we find a better way to test this in the future, we should use it.

-rem --SJW 9/4/07

-:detect_filter

-    findstr /b /i /c:"#define H5_HAVE_FILTER_%1" %h5pubconf% > nul

-    if %errorlevel% equ 0 (

-        set use_filter_%1=yes

-    ) else (

-        set use_filter_%1=no

-    )

-    

-    exit /b

-

-

-rem ############################################################################

-rem ############################################################################

-rem #                       T H E   T E S T S                                ###

-rem ############################################################################

-rem ############################################################################

-:main

-    call :jamtest %testfiles%\u10.txt %testfiles%\tall.h5 ta2.h5

-    call :checkfile %testfiles%\tall.h5 ta2.h5

-    call :cleanup ta2.h5

-    call :jamtest %testfiles%\u511.txt %testfiles%\tall.h5 ta3.h5

-    call :checkfile %testfiles%\tall.h5 ta3.h5

-    call :cleanup ta3.h5

-    call :jamtest %testfiles%\u512.txt %testfiles%\tall.h5 ta4.h5

-    call :checkfile %testfiles%\tall.h5 ta4.h5

-    call :cleanup ta4.h5

-    call :jamtest %testfiles%\u513.txt %testfiles%\tall.h5 ta5.h5

-    call :checkfile %testfiles%\tall.h5 ta5.h5

-    call :cleanup ta5.h5

-

-    call :setup %testfiles%\tall.h5 ta.h5

-    call :jamtest %testfiles%\u10.txt ta.h5 

-    call :checkfile %testfiles%\tall.h5 ta.h5

-    call :setup %testfiles%\tall.h5 ta.h5

-    call :jamtest %testfiles%\u511.txt ta.h5 

-    call :checkfile %testfiles%\tall.h5 ta.h5

-    call :setup %testfiles%\tall.h5 ta.h5

-    call :jamtest %testfiles%\u512.txt ta.h5 

-    call :checkfile %testfiles%\tall.h5 ta.h5

-    call :setup %testfiles%\tall.h5 ta.h5

-    call :jamtest %testfiles%\u513.txt ta.h5 

-    call :checkfile %testfiles%\tall.h5 ta.h5

-    call :cleanup ta.h5

-

-    call :jamtest %testfiles%\u10.txt %testfiles%\twithub.h5 tax2.h5

-    call :checkfile %testfiles%\tall.h5 tax2.h5

-    call :cleanup tax2.h5

-    call :jamtest %testfiles%\u511.txt %testfiles%\twithub.h5 tax3.h5

-    call :checkfile %testfiles%\tall.h5 tax3.h5

-    call :cleanup tax3.h5

-    call :jamtest %testfiles%\u512.txt %testfiles%\twithub.h5 tax4.h5

-    call :checkfile %testfiles%\tall.h5 tax4.h5

-    call :cleanup tax4.h5

-    call :jamtest %testfiles%\u513.txt %testfiles%\twithub.h5 tax5.h5

-    call :checkfile %testfiles%\tall.h5 tax5.h5

-    call :cleanup tax5.h5

-

-    call :jamtest %testfiles%\u10.txt %testfiles%\twithub513.h5 tax6.h5

-    call :checkfile %testfiles%\tall.h5 tax6.h5

-    call :cleanup tax6.h5

-    call :jamtest %testfiles%\u511.txt %testfiles%\twithub513.h5 tax7.h5

-    call :checkfile %testfiles%\tall.h5 tax7.h5

-    call :cleanup tax7.h5

-    call :jamtest %testfiles%\u512.txt %testfiles%\twithub513.h5 tax8.h5

-    call :checkfile %testfiles%\tall.h5 tax8.h5

-    call :cleanup tax8.h5

-    call :jamtest %testfiles%\u513.txt %testfiles%\twithub513.h5 tax9.h5

-    call :checkfile %testfiles%\tall.h5 tax9.h5

-    call :cleanup tax9.h5

-

-    call :jamtest %testfiles%\u10.txt %testfiles%\twithub.h5 --clobber taz2.h5 

-    call :checkfile %testfiles%\tall.h5 taz2.h5

-    call :cleanup taz2.h5

-    call :jamtest %testfiles%\u511.txt %testfiles%\twithub.h5 --clobber taz3.h5

-    call :checkfile %testfiles%\tall.h5 taz3.h5

-    call :cleanup taz3.h5

-    call :jamtest %testfiles%\u512.txt %testfiles%\twithub.h5 --clobber taz4.h5 

-    call :checkfile %testfiles%\tall.h5 taz4.h5

-    call :cleanup taz4.h5

-    call :jamtest %testfiles%\u513.txt %testfiles%\twithub.h5 --clobber taz5.h5 

-    call :checkfile %testfiles%\tall.h5 taz5.h5

-    call :cleanup taz5.h5

-

-    call :jamtest %testfiles%\u10.txt %testfiles%\twithub513.h5 --clobber taz6.h5 

-    call :checkfile %testfiles%\tall.h5 taz6.h5

-    call :cleanup taz6.h5

-    call :jamtest %testfiles%\u511.txt %testfiles%\twithub513.h5 --clobber taz7.h5

-    call :checkfile %testfiles%\tall.h5 taz7.h5

-    call :cleanup taz7.h5

-    call :jamtest %testfiles%\u512.txt %testfiles%\twithub513.h5 --clobber taz8.h5 

-    call :checkfile %testfiles%\tall.h5 taz8.h5

-    call :cleanup taz8.h5

-    call :jamtest %testfiles%\u513.txt %testfiles%\twithub513.h5 --clobber taz9.h5 

-    call :checkfile %testfiles%\tall.h5 taz9.h5

-    call :cleanup taz9.h5

-

-    call :setup %testfiles%\twithub.h5 tay2.h5

-    call :jamtest %testfiles%\u10.txt tay2.h5 --clobber

-    call :checkfile %testfiles%\tall.h5 tay2.h5

-    call :cleanup tay2.h5

-    call :setup %testfiles%\twithub.h5 tay3.h5

-    call :jamtest %testfiles%\u511.txt tay3.h5 --clobber

-    call :checkfile %testfiles%\tall.h5 tay3.h5

-    call :cleanup tay3.h5

-    call :setup %testfiles%\twithub.h5 tay4.h5

-    call :jamtest %testfiles%\u512.txt tay4.h5 --clobber

-    call :checkfile %testfiles%\tall.h5 tay4.h5

-    call :cleanup tay4.h5

-    call :setup %testfiles%\twithub.h5 tay5.h5

-    call :jamtest %testfiles%\u513.txt tay5.h5 --clobber

-    call :checkfile %testfiles%\tall.h5 tay5.h5

-    call :cleanup tay5.h5

-

-    call :setup %testfiles%\twithub513.h5 tay6.h5

-    call :jamtest %testfiles%\u10.txt tay6.h5 --clobber

-    call :checkfile %testfiles%\tall.h5 tay6.h5

-    call :cleanup tay6.h5

-    call :setup %testfiles%\twithub513.h5 tay7.h5

-    call :jamtest %testfiles%\u511.txt tay7.h5 --clobber

-    call :checkfile %testfiles%\tall.h5 tay7.h5

-    call :cleanup tay7.h5

-    call :setup %testfiles%\twithub513.h5 tay8.h5

-    call :jamtest %testfiles%\u512.txt tay8.h5 --clobber

-    call :checkfile %testfiles%\tall.h5 tay8.h5

-    call :cleanup tay8.h5

-    call :setup %testfiles%\twithub513.h5 tay9.h5

-    call :jamtest %testfiles%\u513.txt tay9.h5 --clobber

-    call :checkfile %testfiles%\tall.h5 tay9.h5

-    call :cleanup tay9.h5

-

-    call :setup %testfiles%\twithub.h5 tai1.h5

-    call :unjamtest tai1.h5 o10.txt taa1.h5

-    call :checkfile %testfiles%\tall.h5 taa1.h5

-    call :cleanup taa1.h5 tai1.h5 o10.txt

-    call :setup %testfiles%\twithub513.h5 tai2.h5

-    call :unjamtest tai2.h5 o512.txt taa2.h5

-    call :checkfile %testfiles%\tall.h5 taa2.h5

-    call :cleanup taa2.h5 tai2.h5 o512.txt

-

-    call :setup %testfiles%\twithub.h5 tai3.h5

-    call :unjamtest tai3.h5 - taa3.h5

-    call :checkfile %testfiles%\tall.h5 taa3.h5

-    call :cleanup taa3.h5 tai3.h5

-    call :setup %testfiles%\twithub513.h5 tai4.h5

-    call :unjamtest tai4.h5 - taa4.h5

-    call :checkfile %testfiles%\tall.h5 taa4.h5

-    call :cleanup taa4.h5 tai4.h5

-

-    call :setup %testfiles%\twithub.h5 taj2.h5

-    call :unjamtest taj2.h5 --delete tac2.h5

-    call :checkfile %testfiles%\tall.h5 tac2.h5

-    call :cleanup tac2.h5 taj2.h5

-    call :setup %testfiles%\twithub513.h5 taj3.h5

-    call :unjamtest taj3.h5 --delete tac3.h5

-    call :checkfile %testfiles%\tall.h5 tac3.h5

-    call :cleanup tac3.h5 taj3.h5

-

-    if %nerrors% equ 0 (

-        echo.All %jam% tests passed.

-    )

-    

-    popd

-    endlocal & exit /b %nerrors%

-    

diff --git a/windows/tools/h5ls/h5ls.vcproj b/windows/tools/h5ls/h5ls.vcproj
deleted file mode 100644
index e1001ef..0000000
--- a/windows/tools/h5ls/h5ls.vcproj
+++ /dev/null
@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="h5ls"

-	ProjectGUID="{357A1E1A-D5EA-42FB-B4B1-EEB8A4B2BBF0}"

-	RootNamespace="h5ls"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5ls/Release/h5ls.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5ls/Release/h5ls.pch"

-				AssemblerListingLocation=".\../../../tools/h5ls/Release/"

-				ObjectFile=".\../../../tools/h5ls/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5ls/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				ProgramDatabaseFile=".\../../../tools/h5ls/Release/h5ls.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5ls/Release/h5ls.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5ls/Release/h5ls.pch"

-				AssemblerListingLocation=".\../../../tools/h5ls/Release/"

-				ObjectFile=".\../../../tools/h5ls/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5ls/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				ProgramDatabaseFile=".\../../../tools/h5ls/Release/h5ls.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5ls/Debug/h5ls.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5ls/Debug/h5ls.pch"

-				AssemblerListingLocation=".\../../../tools/h5ls/Debug/"

-				ObjectFile=".\../../../tools/h5ls/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5ls/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5ls/Debug/h5ls.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5ls/Debug/h5ls.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5ls/Debug/h5ls.pch"

-				AssemblerListingLocation=".\../../../tools/h5ls/Debug/"

-				ObjectFile=".\../../../tools/h5ls/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5ls/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5ls/Debug/h5ls.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\..\tools\h5ls\h5ls.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/h5ls/testh5ls.bat b/windows/tools/h5ls/testh5ls.bat
deleted file mode 100644
index f15274c..0000000
--- a/windows/tools/h5ls/testh5ls.bat
+++ /dev/null
@@ -1,263 +0,0 @@
-@echo off

-rem

-rem Copyright by The HDF Group.

-rem Copyright by the Board of Trustees of the University of Illinois.

-rem All rights reserved.

-rem

-rem This file is part of HDF5.  The full HDF5 copyright notice, including

-rem terms governing use, modification, and redistribution, is contained in

-rem the files COPYING and Copyright.html.  COPYING can be found at the root

-rem of the source code distribution tree; Copyright.html can be found at the

-rem root level of an installed copy of the electronic HDF5 document set and

-rem is linked from the top-level documents page.  It can also be found at

-rem http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have

-rem access to either file, you may request a copy from help@hdfgroup.org.

-rem

-rem Tests for the h5ls tool

-rem

-rem    Created:  Scott Wegner, 8/28/07

-rem    Modified:

-rem

-

-setlocal enabledelayedexpansion

-pushd %~dp0

-

-rem The tool name

-set h5ls=h5ls%2

-rem The path of the tool binary

-set h5ls_bin=%CD%\..\%h5ls%\%1\%h5ls%

-

-rem Max. lines of output to display if test fails

-set nlines=20

-

-set nerrors=0

-set verbose=yes

-

-if not exist ..\testfiles mkdir ..\testfiles

-

-goto main

-

-

-rem Print a line-line message left justified in a field of 70 characters

-rem beginning with the word "Testing".

-rem

-:testing

-    set test_msg=Testing %h5ls%

-    for %%a in (%*) do (

-        if %%a neq PASSED (

-        if %%a neq *FAILED* (

-            set test_msg=!test_msg! %%~nxa

-        ) )

-    )

-    rem We need to replace PERCENT-ZERO here with "%0" for the tfamily test.

-    rem --SJW 8/24/07

-    set test_msg=!test_msg:PERCENT-ZERO=%%0!                                                                

-    echo.%test_msg:~0,69% %1

-    

-    exit /b

-

-    

-rem Run a test and print PASS or *FAIL*. For now, if h5ls can complete

-rem with exit status 0, consider it pass. If a test fails then increment

-rem the `nerrors' global variable and (if $verbose is set) display up to %nlines%

-rem lines of the actual output from the tool test.  The actual output is not

-rem removed if $HDF5_NOCLEANUP has a non-zero value.

-rem Arguemnts:

-rem %1 -- actual output filename to use

-rem %2 and on -- argument for the h5ls tool

-:tooltest

-    set expect=%CD%\..\testfiles\%1

-    set actual=%CD%\..\testfiles\%~n1.out

-    set actual_err=%CD%\..\testfiles\%~n1.err

-    

-    rem We define %params% here because Windows `shift` command doesn't affect

-    rem the %* variable.  --SJW 8/23/07

-    set params=%*

-    set params=%params:* =%

-    

-    rem Target the first variable in params, retvalexpect

-    for %%a in (%params%) do (

-        set retvalexpect=%%a

-        set params=%params:* =%

-        goto break1

-    )

-    :break1

-

-    rem Run test.

-    rem Stderr is included in stdout so that the diff can detect

-    rem any unexpected output from that stream too

-    (

-        echo.#############################

-        rem We strip out the parentesis here because echo on Linux does.

-        rem --SJW 8/28/07

-        echo. output for 'h5ls %params:"=%'

-        echo.#############################

-        pushd %CD%\..\testfiles

-        %h5ls_bin% %params%

-        popd

-    ) >%actual% 2>%actual_err%

-    

-    set exitcode=%errorlevel%

-    type %actual_err% >> %actual%

-    if "%exitcode%" neq "%retvalexpect%" (

-        call :testing *FAILED* %params%

-        set /a nerrors=!nerrors!+1

-        if "yes"=="%verbose%" (

-            echo.test returned with exit code !exitcode!

-            echo.test output: ^(up to %nlines% lines^)

-            rem Count lines echo'ed, and break out after 20.  --SJW 8/28/07

-            set line=0

-            for /f "tokens=* delims=" %%a in (%actual%) do (

-                if !line! geq %nlines% goto break2

-                echo.%%a

-                set /a line=!line!+1

-            )

-            :break2

-            echo.***end of test output***

-            echo.

-        )

-    rem Don't special case non-existing expected output as Linux does, because

-    rem we depend on it above to parse anyway.  It should be an error if it

-    rem doesn't exist.  --SJW 8/28/07

-    rem ) else if not exist %expect% (

-    rem     rem Create the expect file if it doesn't yet exist

-    rem     call :testing CREATED %params%

-    rem     copy %actual% %expect% > nul

-    ) else (

-        fc /w %expect% %actual% > nul

-        if !errorlevel! equ 0 (

-            call :testing PASSED %params%

-        ) else (

-            call :testing *FAILED* %params%

-            echo.    Expected result differs from actual result

-            set nerrors=!nerrors!+1

-            if "yes"=="%verbose%" fc %expect% %actual%

-        )

-    )

-    

-    rem Clean up output file

-    if not defined hdf5_nocleanup (

-        del /f %actual% %actual_err%

-    )

-    

-    exit /b

-    

-    

-rem ############################################################################

-rem ############################################################################

-rem #                       T H E   T E S T S                                ###

-rem ############################################################################

-rem ############################################################################

-:main

-    

-    rem Toss in a bunch of tests.  Not sure if they are the right kinds.

-    rem test the help syntax

-    call :tooltest help-1.ls 0 -w80 -h

-    call :tooltest help-2.ls 0 -w80 -help

-    call :tooltest help-3.ls 0 -w80 -?

-

-    rem test simple command

-    call :tooltest tall-1.ls 0 -w80 tall.h5

-    call :tooltest tall-2.ls 0 -w80 -r -d tall.h5

-    call :tooltest tgroup.ls 0 -w80 tgroup.h5

-    call :tooltest tgroup-3.ls 0 -w80 tgroup.h5/g1

-

-    rem test for displaying groups

-    call :tooltest tgroup-1.ls 1 -w80 -r -g tgroup.h5

-    call :tooltest tgroup-2.ls 0 -w80 -g tgroup.h5/g1

-

-    rem test for displaying simple space datasets

-    call :tooltest tdset-1.ls 0 -w80 -r -d tdset.h5

-

-    rem test for displaying soft links

-    call :tooltest tslink-1.ls 0 -w80 -r tslink.h5

-

-    rem test for displaying more soft links with --follow-symlinks

-    call :tooltest tsoftlinks-1.ls 0 --follow-symlinks tsoftlinks.h5

-    call :tooltest tsoftlinks-2.ls 0 --follow-symlinks -r tsoftlinks.h5

-    call :tooltest tsoftlinks-3.ls 0 --follow-symlinks tsoftlinks.h5/group1

-    call :tooltest tsoftlinks-4.ls 0 --follow-symlinks -r tsoftlinks.h5/group1

-    call :tooltest tsoftlinks-5.ls 0 --follow-symlinks tsoftlinks.h5/soft_dset1

-

-    rem test for displaying external and user-defined links with 

-    rem --follow-symlinks

-    call :tooltest textlink-1.ls 0 -w80 -r textlink.h5

-    call :tooltest textlinksrc-1.ls 0 -w80 --follow-symlinks -r textlinksrc.h5

-    call :tooltest textlinksrc-2.ls 0 -w80 --follow-symlinks -rv textlinksrc.h5/ext_link5

-    call :tooltest textlinksrc-3.ls 0 -w80 --follow-symlinks -r textlinksrc.h5/ext_link1

-    call :tooltest textlinksrc-4.ls 0 -w80 -r textlinksrc.h5

-    call :tooltest textlinksrc-5.ls 0 -w80 -r textlinksrc.h5/ext_link1

-    call :tooltest textlinksrc-6.ls 0 -w80 --follow-symlinks textlinksrc.h5

-    call :tooltest textlinksrc-7.ls 0 -w80 --follow-symlinks textlinksrc.h5/ext_link1

-    call :tooltest tudlink-1.ls 0 -w80 -r tudlink.h5

-

-    rem test for displaying external links with -E

-    rem the option -E will be depriciated but keep it for backward compatibility

-    call :tooltest textlinksrc-1-old.ls 0 -w80 -Er textlinksrc.h5

-    call :tooltest textlinksrc-2-old.ls 0 -w80 -Erv textlinksrc.h5/ext_link5

-    call :tooltest textlinksrc-3-old.ls 0 -w80 -Er textlinksrc.h5/ext_link1

-    call :tooltest textlinksrc-6-old.ls 0 -w80 -E textlinksrc.h5

-    call :tooltest textlinksrc-7-old.ls 0 -w80 -E textlinksrc.h5/ext_link1

-

-    rem tests for no-dangling-links 

-    rem if this option is given on dangling link, h5ls should return exit code 1

-    rem when used alone , expect to print out help and return exit code 1

-    call :tooltest textlinksrc-nodangle-1.ls 1 -w80 --no-dangling-links textlinksrc.h5

-    rem external dangling link - expected exit code 1

-    call :tooltest textlinksrc-nodangle-2.ls 1 -w80 --follow-symlinks --no-dangling-links textlinksrc.h5

-    rem soft dangling link - expected exit code 1

-    call :tooltest tsoftlinks-nodangle-1.ls 1 -w80 --follow-symlinks --no-dangling-links tsoftlinks.h5

-    rem when used file with no dangling links - expected exit code 0

-    call :tooltest thlinks-nodangle-1.ls 0 -w80 --follow-symlinks --no-dangling-links thlink.h5

-

-    rem tests for hard links

-    call :tooltest thlink-1.ls 0 -w80 thlink.h5

-

-    rem tests for compound data types

-    call :tooltest tcomp-1.ls 0 -w80 -r -d tcompound.h5

-

-    rem test for the nested compound type

-    call :tooltest tnestcomp-1.ls 0 -w80 -r -d tnestedcomp.h5

-    call :tooltest tnestcomp-2.ls 0 -w80 -r -d -S tnestedcomp.h5

-    call :tooltest tnestcomp-3.ls 0 -w80 -r -d -l tnestedcomp.h5

-    call :tooltest tnestcomp-4.ls 0 -w80 -r -d -l -S tnestedcomp.h5

-

-    rem test for loop detection

-    call :tooltest tloop-1.ls 0 -w80 -r -d tloop.h5

-

-    rem test for string 

-    call :tooltest tstr-1.ls 0 -w80 -r -d tstr.h5

-

-    rem test test file created from lib SAF team

-    call :tooltest tsaf.ls 0 -w80 -r -d tsaf.h5

-

-    rem test for variable length data types

-    call :tooltest tvldtypes1.ls 0 -w80 -r -d tvldtypes1.h5

-

-    rem test for array data types

-    call :tooltest tarray1.ls 0 -w80 -r -d tarray1.h5

-

-    rem test for empty data

-    call :tooltest tempty.ls 0 -w80 -d tempty.h5

-

-    rem test for all dataset types written to attributes

-    rem enable -S for avoiding printing NATIVE types

-    call :tooltest tattr2.ls 0 -w80 -v -S tattr2.h5

-

-    rem tests for error handling.

-    rem test for non-existing file

-    call :tooltest nosuchfile.ls 1 nosuchfile.h5

-

-    rem test for variable length data types in verbose mode 

-    call :tooltest tvldtypes2le.ls 0 -v tvldtypes1.h5

-

-    rem test for dataset region references data types in verbose mode 

-    call :tooltest tdataregle.ls 0 -v tdatareg.h5

-

-    if %nerrors% equ 0 (

-        echo.All h5ls tests passed.

-    )

-    

-    popd

-    endlocal & exit /b %nerrors%

-    

diff --git a/windows/tools/h5lsdll/h5lsdll.vcproj b/windows/tools/h5lsdll/h5lsdll.vcproj
deleted file mode 100644
index 7d1dc0e..0000000
--- a/windows/tools/h5lsdll/h5lsdll.vcproj
+++ /dev/null
@@ -1,388 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="h5lsdll"

-	ProjectGUID="{18FBE8C2-CD20-4D99-9E0B-63B408CE4850}"

-	RootNamespace="h5lsdll"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5lsdll/Debug/h5lsdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5lsdll/Debug/h5lsdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5lsdll/Debug/"

-				ObjectFile=".\../../../tools/h5lsdll/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5lsdll/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5lsdll/Debug/h5lsdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5lsdll/Debug/h5lsdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5lsdll/Debug/h5lsdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5lsdll/Debug/"

-				ObjectFile=".\../../../tools/h5lsdll/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5lsdll/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5lsdll/Debug/h5lsdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5lsdll/Release/h5lsdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5lsdll/Release/h5lsdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5lsdll/Release/"

-				ObjectFile=".\../../../tools/h5lsdll/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5lsdll/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../tools/h5lsdll/Release/h5lsdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5lsdll/Release/h5lsdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5lsdll/Release/h5lsdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5lsdll/Release/"

-				ObjectFile=".\../../../tools/h5lsdll/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5lsdll/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../tools/h5lsdll/Release/h5lsdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\..\tools\h5ls\h5ls.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/h5mkgrp/h5mkgrp.vcproj b/windows/tools/h5mkgrp/h5mkgrp.vcproj
deleted file mode 100644
index e6f8259..0000000
--- a/windows/tools/h5mkgrp/h5mkgrp.vcproj
+++ /dev/null
@@ -1,394 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="h5mkgrp"

-	ProjectGUID="{ABBF8F3E-F1B5-45FA-8FD0-50B167511EDF}"

-	RootNamespace="h5mkgrp"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5mkgrp/Release/h5mkgrp.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5mkgrp/Release/h5mkgrp.pch"

-				AssemblerListingLocation=".\../../../tools/h5mkgrp/Release/"

-				ObjectFile=".\../../../tools/h5mkgrp/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5mkgrp/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../tools/h5mkgrp/Release/h5mkgrp.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5mkgrp/Release/h5mkgrp.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5mkgrp/Release/h5mkgrp.pch"

-				AssemblerListingLocation=".\../../../tools/h5mkgrp/Release/"

-				ObjectFile=".\../../../tools/h5mkgrp/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5mkgrp/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../tools/h5mkgrp/Release/h5mkgrp.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5mkgrp/Debug/h5mkgrp.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5mkgrp/Debug/h5mkgrp.pch"

-				AssemblerListingLocation=".\../../../tools/h5mkgrp/Debug/"

-				ObjectFile=".\../../../tools/h5mkgrp/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5mkgrp/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5mkgrp/Debug/h5mkgrp.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5mkgrp/Debug/h5mkgrp.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5mkgrp/Debug/h5mkgrp.pch"

-				AssemblerListingLocation=".\../../../tools/h5mkgrp/Debug/"

-				ObjectFile=".\../../../tools/h5mkgrp/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5mkgrp/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5mkgrp/Debug/h5mkgrp.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\..\tools\misc\h5mkgrp.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/h5mkgrp/testh5mkgrp.bat b/windows/tools/h5mkgrp/testh5mkgrp.bat
deleted file mode 100644
index 15de2cd..0000000
--- a/windows/tools/h5mkgrp/testh5mkgrp.bat
+++ /dev/null
@@ -1,254 +0,0 @@
-@echo off

-rem

-rem Copyright by The HDF Group.

-rem Copyright by the Board of Trustees of the University of Illinois.

-rem All rights reserved.

-rem

-rem This file is part of HDF5.  The full HDF5 copyright notice, including

-rem terms governing use, modification, and redistribution, is contained in

-rem the files COPYING and Copyright.html.  COPYING can be found at the root

-rem of the source code distribution tree; Copyright.html can be found at the

-rem root level of an installed copy of the electronic HDF5 document set and

-rem is linked from the top-level documents page.  It can also be found at

-rem http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have

-rem access to either file, you may request a copy from help@hdfgroup.org.

-rem

-rem Tests for the h5mkgrp tool

-rem

-rem    Created:  Scott Wegner, 8/29/07

-rem    Modified: 

-rem

-

-rem We currently only build static version of h5mkgrp, but this batch file is

-rem setup for dll versions, in case we decide to build them in the future.

-rem --SJW 8/29/07

-

-setlocal enabledelayedexpansion

-pushd %~dp0

-

-rem The tool name

-set h5mkgrp=h5mkgrp%2

-rem The path of the tool binary

-set h5mkgrp_bin=%CD%\..\%h5mkgrp%\%1\%h5mkgrp%

-rem The h5ls tool name

-set h5ls=h5ls%2

-rem Arguments to the h5ls tool

-set h5ls_args=-vr

-rem The path of the h5ls tool binary

-set h5ls_bin=%CD%\..\%h5ls%\%1\%h5ls%

-

-set nerrors=0

-set verbose=yes

-

-set indir=%CD%\..\testfiles

-set outdir=%CD%\..\testfiles

-

-if not exist %outdir% mkdir %outdir%

-

-goto main

-

-rem Print a line-line message left justified in a field of 70 characters

-rem beginning with the word "Testing".

-rem

-:testing

-    set test_msg=Testing

-    for %%a in (%*) do (

-        if %%a neq PASSED (

-        if %%a neq *FAILED* (

-            set test_msg=!test_msg! %%~nxa

-        ) )

-    )

-    rem We need to replace PERCENT-ZERO here with "%0" for the tfamily test.

-    rem --SJW 8/24/07

-    set test_msg=!test_msg:PERCENT-ZERO=%%0!                                                                

-    echo.%test_msg:~0,69% %1

-    

-    exit /b

-

-    

-rem Print a line-line message left justified in a field of 70 characters

-rem beginning with the word "Verifying".

-rem

-:verify_h5ls

-    set test_msg=Verifying h5ls file structure

-    for %%a in (%*) do (

-        if %%a neq PASSED (

-        if %%a neq *FAILED* (

-            set test_msg=!test_msg! %%~nxa

-        ) )

-    )

-    rem We need to replace PERCENT-ZERO here with "%0" for the tfamily test.

-    rem --SJW 8/24/07

-    set test_msg=!test_msg:PERCENT-ZERO=%%0!                                                                

-    echo.%test_msg:~0,69% %1

-    

-    exit /b

-

-    

-rem Run a test and print PASS or *FAIL*. If h5mkgrp can complete

-rem with exit status 0, consider it pass. If a test fails then increment

-rem the `nerrors' global variable.

-rem Assumed arguments:

-rem %* arguments for h5mkgrp.

-:tooltest

-    (

-        echo.#############################

-        echo. output for 'h5mkgrp %*'

-        echo.#############################

-        %h5mkgrp_bin% %*

-    ) > output.out

-

-    if %errorlevel% neq 0 (

-        call :testing *FAILED* %*

-        echo.failed result is:

-        type output.out

-        set nerrors=!nerrors!+1

-    ) else (

-        call :testing PASSED %*

-    )

-    

-    rem Clean up output file

-    if not defined hdf5_nocleanup (

-        del /f output.out

-    )

-    

-    exit /b

-    

-    

-rem Call the h5ls tool to verify the correct output data in the destination file

-rem

-:h5lstest

-    set expect=%indir%\%~n1.ls

-    set expect_parsed=%expect%.parsed

-    set actual=%outdir%\%~n1.out

-    set actual_parsed=%actual%.parsed

-    

-    rem Stderr is included in stdout so that the diff can detect

-    rem any unexpected output from that stream too

-    (

-        echo.#############################

-        echo.Expected output from h5ls %*

-        echo.#############################

-        %h5ls_bin% %h5ls_args% %*

-    ) >%actual% 2>&1

-    rem Windows doesn't have "sed" command, and parsing the files line-by-line

-    rem to emulate Unix takes a very long time.  Instead, we simply remove lines

-    rem with "Modified".  Do this for actual and expected otput.  If there is a 

-    rem better alternative in the future, we should use it instead. --SJW 8/29/07

-    for %%a in (expect actual) do (

-        findstr /v /c:"    Modified:" !%%a! > tmp.txt

-        move /y tmp.txt !%%a_parsed! > nul

-    )

-

-    rem Don't special case non-existing expected output as Linux does, because

-    rem we depend on it above to parse anyway.  It should be an error if it

-    rem doesn't exist.  --SJW 8/29/07

-    rem if not exist %expect% (

-    rem     call :verify_h5ls CREATED %*

-    rem     copy %actual% %expect%

-    rem )

-    

-    fc /w %expect_parsed% %expect_parsed% > nul

-    if %errorlevel% equ 0 (

-        call :verify_h5ls PASSED %*

-    ) else ( 

-        call :verify_h5ls *FAILED* %*

-        echo.    Expected result ^(*.ls^) differs from actual result ^(*.out^)

-        set /a nerrors=!nerrors!+1

-        if "%verbose%"=="yes" fc %epect% %actual%

-    )

-    

-    rem Clean up output file

-    if not defined hdf5_nocleanup (

-        del /f %actual% %actual_parsed% %expect_parsed%

-    )

-    

-    exit /b

-    

-    

-rem Single run of tool

-rem

-rem Assumed arguments:

-rem %1 is test file name

-rem %2 is h5mkgrp options

-rem %* are groups to create

-:runtest

-

-    set fileout=%outdir%\%1

-    shift

-    set h5mkgrp_args=%1

-    rem Filter out quotes

-    set h5mkgrp_args=%h5mkgrp_args:"=%

-    shift

-    

-    rem Remove any output file left over from previous test run

-    del /f %fileout% 2> nul

-    

-    rem On Windows, the shift command doesn't actually affect %*, so we must

-    rem manipulate a params variable.  We need to be careful of how we iterate

-    rem through them, because the " " parameter is tricky on Windows. 

-    rem --SJW 8/29/07

-    set params=

-    if not "%1"=="" (

-        set p_num=1

-        for %%a in (%*) do (

-            if !p_num! geq 3 (

-                set params=!params! %%a

-            )

-            set /a p_num=!p_num!+1

-        )

-        rem Remove leading space

-        set params=!params:* =!

-    )

-    

-    rem Run test

-    call :tooltest %h5mkgrp_args% %fileout% %params%

-    

-    rem Verify that the file created above is correct

-    call :h5lstest %fileout%

-    

-    rem Remove output file created, if the "no cleanup" environment variable is

-    rem not defined.

-    rem Why do we echo FILEOUT on Linux?  --SJW 8/29/07

-    rem echo.FILEOUT= %fileout%

-    if not defined hdf5_nocleanup (

-        del /f %fileout% 2> nul

-    )

-    

-    exit /b

-    

-    

-rem ############################################################################

-rem #           T H E   T E S T S                                            ###

-rem ############################################################################

-:main

-    rem Check that help & version is displayed properly

-    call :runtest h5mkgrp_help.h5 "-h"

-    call :runtest h5mkgrp_version.h5 "-V"

-

-    rem Create single group at root level

-    call :runtest h5mkgrp_single.h5 " " single

-    call :runtest h5mkgrp_single.h5 "-v" single

-    call :runtest h5mkgrp_single.h5 "-p" single

-    call :runtest h5mkgrp_single_latest.h5 "-l" latest

-

-    rem Create several groups at root level

-    call :runtest h5mkgrp_several.h5 " " one two

-    call :runtest h5mkgrp_several.h5 "-v" one two

-    call :runtest h5mkgrp_several.h5 "-p" one two

-    call :runtest h5mkgrp_several_latest.h5 "-l" one two

-

-    rem Create various nested groups 

-    call :runtest h5mkgrp_nested.h5 "-p" /one/two

-    call :runtest h5mkgrp_nested_latest.h5 "-lp" /one/two

-    call :runtest h5mkgrp_nested_mult.h5 "-p" /one/two /three/four

-    call :runtest h5mkgrp_nested_mult_latest.h5 "-lp" /one/two /three/four

-

-    

-    if %nerrors% equ 0 (

-        echo.All h5mkgrp tests passed.

-    )

-    

-    popd

-    endlocal & exit /b %nerrors%

-    

diff --git a/windows/tools/h5repack/h5repack.bat b/windows/tools/h5repack/h5repack.bat
deleted file mode 100644
index 7fb426d..0000000
--- a/windows/tools/h5repack/h5repack.bat
+++ /dev/null
@@ -1,802 +0,0 @@
-@echo off

-rem

-rem Copyright by The HDF Group.

-rem Copyright by the Board of Trustees of the University of Illinois.

-rem All rights reserved.

-rem

-rem This file is part of HDF5.  The full HDF5 copyright notice, including

-rem terms governing use, modification, and redistribution, is contained in

-rem the files COPYING and Copyright.html.  COPYING can be found at the root

-rem of the source code distribution tree; Copyright.html can be found at the

-rem root level of an installed copy of the electronic HDF5 document set and

-rem is linked from the top-level documents page.  It can also be found at

-rem http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have

-rem access to either file, you may request a copy from help@hdfgroup.org.

-rem

-rem Tests for the h5repack tool

-rem

-rem    Created:  Scott Wegner, 8/28/07

-rem    Modified:

-rem

-

-setlocal enabledelayedexpansion

-pushd %~dp0

-

-set h5pubconf=%CD%\..\..\src\h5pubconf.h

-

-rem On Windows, the function :detect_filter sets these for us

-call :detect_filter szip

-call :detect_filter deflate

-call :detect_filter shuffle

-call :detect_filter fletcher32

-call :detect_filter nbit

-call :detect_filter scaleoffset

-

-rem The tool name

-set h5repack=h5repack%2

-rem The path of the tool binary

-set h5repack_bin=%CD%\..\%h5repack%\%1\%h5repack%

-

-rem The h5diff tool name

-set h5diff=..\h5diff%2\%1\h5diff%2

-rem The path of the h5diff tool binary

-set h5diff_bin=%CD%\%h5diff%

-

-rem The h5dump tool name

-set h5dump=..\h5dump%2\%1\h5dump%2

-rem The path of the h5dump tool binary

-set h5dump_bin=%CD%\%h5dump%

-

-set h5detectszip=testh5repack_detect_szip%2

-set h5detectszip_bin=%CD%\..\testfiles\%h5detectszip%\%1\%h5detectszip%

-

-

-set info_file=testfiles\h5repack.info

-

-set file0=h5repack_fill.h5

-set file1=h5repack_objs.h5

-set file2=h5repack_attr.h5

-set file3=h5repack_hlink.h5

-set file4=h5repack_layout.h5

-set file5=h5repack_early.h5

-set file7=h5repack_szip.h5

-set file8=h5repack_deflate.h5

-set file9=h5repack_shuffle.h5

-set file10=h5repack_fletcher.h5

-set file11=h5repack_filters.h5

-set file12=h5repack_nbit.h5

-set file13=h5repack_soffset.h5

-rem A file with an older version of the layout message (copy of test/tlayouto.h5)

-set file14=h5repack_layouto.h5

-set file15=h5repack_named_dtypes.h5

-rem located in common testfiles folder

-set file16=tfamilyPERCENT05d.h5

-set file18=h5repack_layout2.h5

-

-

-set nerrors=0

-set verbose=yes

-

-

-goto main

-

-

-rem Print a line-line message left justified in a field of 70 characters

-rem beginning with the word "Testing".

-rem

-:testing

-    set test_msg=Testing

-    for %%a in (%*) do (

-        if %%a neq PASSED (

-        if %%a neq *FAILED* (

-            set test_msg=!test_msg! %%~nxa

-        ) )

-    )

-    rem We need to replace PERCENT here with "%" for tests that use a percent

-    rem sign.  --SJW 5/12/08

-    set test_msg=!test_msg:PERCENT=%%!                                                                

-    echo.%test_msg:~0,69% %1

-    

-    exit /b

-

-    

-rem Print a line-line message left justified in a field of 70 characters

-rem beginning with the word "Verifying".

-rem

-:verify

-    set test_msg=Verifying h5diff output

-    for %%a in (%*) do (

-        if %%a neq PASSED (

-        if %%a neq *FAILED* (

-            set test_msg=!test_msg! %%~nxa

-        ) )

-    )

-    rem We need to replace PERCENT here with "%" for tests that use a percent

-    rem sign.  --SJW 5/12/08

-    set test_msg=!test_msg:PERCENT=%%!                                                                

-    echo.%test_msg:~0,69% %1

-    

-    exit /b

-

-    

-rem Print a message that a test has been skipped (because a required filter

-rem was unavailable)

-:skip

-    call :testing -SKIP- %h5repack% %*

-    exit /b

-    

-    

-rem Call the h5diff tool

-rem

-:difftest

-    set params=%*

-    %h5diff_bin% -q !params:PERCENT=%%!

-    if !errorlevel! neq 0 (

-        call :verify *FAILED* %*

-        set /a nerrors=!nerrors!+1

-    ) else (

-        call :verify PASSED %*

-    )

-    

-    exit /b

-    

-    

-rem Call h5repack

-rem

-

-rem call TOOLTEST_MAIN and delete $output file

-:tooltest

-

-    call :tooltest_main %*

-    set outfile=%CD%\out.%1

-    del /f %outfile%

-    

-    exit /b

-

-rem TOOLTEST main function, doesn't delete $output file

-:tooltest_main

-

-    rem Run test.

-    set infile=%CD%\testfiles\%1

-    rem Linux uses a $path variable here, but it is unneccessary, and will

-    rem corrupt our Windows PATH if we use it.  --SJW 8/28/07

-    rem set path=%CD%

-    rem set outfile=%path%\out.%1

-    set outfile=%CD%\out.%1

-    

-    rem We define %params% here because Windows `shift` command doesn't affect

-    rem the %* variable.  --SJW 8/28/07

-    if "%2"=="" (

-        set params=

-    ) else (

-        set params=%*

-        set params=!params:* =!

-    )

-    %h5repack_bin% %params% %infile% %outfile%

-    

-    if !errorlevel! neq 0 (

-        call :testing *FAILED* %*

-        set /a nerrors=!nerrors!+1

-    ) else (

-        call :testing PASSED %*

-        call :difftest %infile% %outfile%

-    )

-    

-    exit /b

-

-rem ------------------------------------------

-rem Verifying layouts of a dataset 

-:verify_layout_dset

-

-    rem Run test.

-    set outfile=%CD%\out.%1

-    set layoutfile=%CD%\layout.%1

-    set dset=%2

-    set expectlayout=%3

-    

-    rem ---------------------------------

-    rem check the layout from a dataset

-    %h5dump_bin% -d %dset% -pH %outfile% > %layoutfile%

-    findstr /c:"%expectlayout%" %layoutfile% > nul

-    if !errorlevel! neq 0 (

-        call :verify *FAILED* %*

-        set /a nerrors=!nerrors!+1

-    ) else (

-        call :verify PASSED %*

-    )

-

-    rem clean up tmp files

-    del /f %outfile%

-    del /f %layoutfile%

-    

-    exit /b

-

-rem----------------------------------------

-rem Verifying layouts from entire file

-:verify_layout_all

-

-    rem Run test.

-    set outfile=%CD%\out.%1

-    set layoutfile=%CD%\layout.%1

-    set expectlayout=%2

-    

-    rem ---------------------------------

-    rem check the layout from a dataset

-    rem check if the other layouts still exsit

-        rem if CONTIGUOUS

-        if "%expectlayout%"=="CONTIGUOUS" (

-            %h5dump_bin% -pH %outfile% > %layoutfile%

-            findstr /c:"COMPACT" %layoutfile% > nul

-            if !errorlevel! neq 0 (

-                findstr /c:"CHUNKED" %layoutfile% > nul

-                if !errorlevel! equ 0 (

-                    call :verify *FAILED* %*

-                    set /a nerrors=!nerrors!+1

-                ) else (

-                    call :verify PASSED %*

-                )

-            ) else (

-                call :verify *FAILED* %*

-                set /a nerrors=!nerrors!+1

-            )

-        ) else (

-            rem if COMPACT

-            if "%expectlayout%"=="COMPACT" (

-                %h5dump_bin% -pH %outfile% > %layoutfile%

-                findstr /c:"CHUNKED" %layoutfile% > nul

-                if !errorlevel! neq 0 (

-                    findstr /c:"CONTIGUOUS" %layoutfile% > nul

-                    if !errorlevel! equ 0 (

-                        call :verify *FAILED* %*

-                        set /a nerrors=!nerrors!+1

-                    ) else (

-                        call :verify PASSED %*

-                    )

-                ) else (

-                    call :verify *FAILED* %*

-                    set /a nerrors=!nerrors!+1

-                )

-            ) else (

-                rem if CHUNKED

-                if "%expectlayout%"=="CHUNKED" (

-                    %h5dump_bin% -pH %outfile% > %layoutfile%

-                    findstr/c:"CONTIGUOUS" %layoutfile% > nul

-                    if !errorlevel! neq 0 (

-                        findstr /c:"COMPACT" %layoutfile% > nul

-                        if !errorlevel! equ 0 (

-                            call :verify *FAILED* %*

-                            set /a nerrors=!nerrors!+1

-                        ) else (

-                            call :verify PASSED %*

-                        )

-                    ) else (

-                        call :verify *FAILED* %*

-                        set /a nerrors=!nerrors!+1

-                    )

-                )

-           )

-        )

-

-    rem clean up tmp files

-    del /f %outfile%

-    del /f %layoutfile%

-    

-    exit /b

-    

-rem Call h5repack with old syntax

-rem

-:tooltest0

-

-    rem Run test.

-    set infile=%CD%\testfiles\%1

-    rem Linux uses a $path variable here, but it is unneccessary, and will

-    rem corrupt our Windows PATH if we use it.  --SJW 8/28/07

-    rem set path=%CD%

-    rem set outfile=%path%\out.%1

-    set outfile=%CD%\out.%1

-    

-    rem We define %params% here because Windows `shift` command doesn't affect

-    rem the %* variable.  --SJW 8/28/07

-    if "%2"=="" (

-        set params=

-    ) else (

-        set params=%*

-        set params=!params:* =!

-    )

-    %h5repack_bin% -i %infile% -o %outfile% %params%

-    

-    if !errorlevel! neq 0 (

-        call :testing *FAILED* %*

-        set /a nerrors=!nerrors!+1

-    ) else (

-        call :testing PASSED %*

-        call :difftest %infile% %outfile%

-    )

-    del /f %outfile%

-    

-    exit /b

-    

-rem same as TOOLTEST, but it uses the common testfiles at $srcdir/../testfiles/

-rem used to test the family driver, where these files reside

-rem

-:tooltest1 

-

-    rem Run test.

-    set infile=%CD%\..\testfiles\%1

-    rem Linux uses a $path variable here, but it is unneccessary, and will

-    rem corrupt our Windows PATH if we use it.  --SJW 8/28/07

-    rem set path=%CD%

-    rem set outfile=%path%\out.%1

-    set outfile=%CD%\out.%1

-    

-    rem We define %params% here because Windows `shift` command doesn't affect

-    rem the %* variable.  --SJW 8/28/07

-    if "%2"=="" (

-        set params=

-    ) else (

-        set params=%*

-        set params=!params:* =!

-    )

-    %h5repack_bin% %params% !infile:PERCENT=%%! !outfile:PERCENT=%%!

-    

-    if !errorlevel! neq 0 (

-        call :testing *FAILED* %*

-        set /a nerrors=!nerrors!+1

-    ) else (

-        call :testing PASSED %*

-        call :difftest %infile% %outfile%

-    )

-    del /f !outfile:PERCENT=%%!

-    

-    exit /b

-

-    

-rem This is a Windows-specific function that detects if the filter passed

-rem should be enabled for this test script.  It searches H5pubconf.h for the

-rem string "#define H5_HAVE_FILTER_%1" and sets the variable "use_filter_%1"

-rem accordingly.  On other platforms, this variable is set in the Makefile.

-rem If we find a better way to test this in the future, we should use it.

-rem --SJW 9/4/07

-:detect_filter

-    findstr /b /i /c:"#define H5_HAVE_FILTER_%1" %h5pubconf% > nul

-    if !errorlevel! equ 0 (

-        set use_filter_%1=yes

-    ) else (

-        set use_filter_%1=no

-    )

-    

-    exit /b

-

-

-rem

-rem The tests

-rem We use the files generated by h5repacktst

-rem Each run generates "<file>.out.h5" and the tool h5diff is used to

-rem compare the input and output files

-rem

-rem the tests are the same as the program h5repacktst, but run from the CLI 

-rem

-:main

-

-    rem See which filters are usable (and skip tests for filters we

-    rem don't have).  Do this by searching H5pubconf.h to see which

-    rem filters are defined.

-

-    rem detect whether the encoder is present. 

-    set use_filter_szip_encoder=no

-    if "%use_filter_szip%"=="yes" (

-        for /f %%a in ('%h5detectszip_bin%') do set use_filter_szip_encoder=%%a

-    )

-

-    rem copy files (these files have no filters) 

-    call :tooltest %file0%

-    call :tooltest %file1%

-    call :tooltest %file2%

-    call :tooltest %file3%

-    call :tooltest %file4%

-    call :tooltest %file5%

-

-

-    rem use %file4% to write some filters  (this file has  no filters)

-

-    rem gzip with individual object

-    set arg=%file4% -f dset1:GZIP=1  -l dset1:CHUNK=20x10

-    if not "%use_filter_deflate%"=="yes" (

-        call :skip %arg%

-    ) else (

-        call :tooltest %arg%

-    )

-      

-    rem gzip for all 

-    set arg=%file4% -f GZIP=1

-    if not "%use_filter_deflate%"=="yes" (

-        call :skip %arg%

-    ) else (

-        call :tooltest %arg%

-    )

-

-    rem szip with individual object

-    set arg=%file4% -f dset2:SZIP=8,EC  -l dset2:CHUNK=20x10

-    if not "%use_filter_szip_encoder%"=="yes" (

-        call :skip %arg%

-    ) else if not "%use_filter_szip%"=="yes" (

-        call :skip %arg%

-    ) else (

-        call :tooltest %arg%

-    )

-

-    rem szip for all

-    set arg=%file4% -f SZIP=8,NN

-    if not "%use_filter_szip_encoder%"=="yes" (

-        call :skip %arg%

-    ) else if not "%use_filter_szip%"=="yes" (

-        call :skip %arg%

-    ) else (

-        call :tooltest %arg% 

-    )

-

-    rem shuffle with individual object

-    set arg=%file4% -f dset2:SHUF  -l dset2:CHUNK=20x10

-    if not "%use_filter_shuffle%"=="yes" (

-        call :skip %arg%

-    ) else (

-        call :tooltest %arg% 

-    )

-      

-

-    rem shuffle for all

-    set arg=%file4% -f SHUF

-    if not "%use_filter_shuffle%"=="yes" (

-        call :skip %arg%

-    ) else (

-        call :tooltest %arg%

-    )

-      

-    rem fletcher32  with individual object

-    set arg=%file4% -f dset2:FLET  -l dset2:CHUNK=20x10

-    if not "%use_filter_fletcher32%"=="yes" (

-        call :skip %arg%

-    ) else (

-        call :tooltest %arg%

-    )

-

-    rem fletcher32 for all

-    set arg=%file4% -f FLET

-    if not "%use_filter_fletcher32%"=="yes" (

-        call :skip %arg%

-    ) else (

-        call :tooltest %arg%

-    )

-

-    rem all filters

-    set arg=%file4% -f dset2:SHUF -f dset2:FLET -f dset2:SZIP=8,NN -f dset2:GZIP=1 -l dset2:CHUNK=20x10

-    rem On Windows we must check each filter individually, because we don't have

-    rem -o flag like Linux.  --SJW 8/28/07

-    if not "%use_filter_szip_encoder%"=="yes" (

-        call :skip %arg%

-    ) else if not "%use_filter_szip%"=="yes" (

-        call :skip %arg%

-    ) else if not "%use_filter_shuffle%"=="yes" (

-        call :skip %arg%

-    ) else if not "%use_filter_fletcher32%"=="yes" (

-        call :skip %arg%

-    ) else if not "%use_filter_deflate%"=="yes" (

-        call :skip %arg%

-    ) else (

-        call :tooltest %arg%

-    )

-      

-    rem ##########################################################

-    rem  the following tests assume the input files have filters

-    rem ##########################################################

-

-    rem szip copy

-    set arg=%file7%

-    if not "%use_filter_szip_encoder%"=="yes" (

-        call :skip %arg%

-    ) else if not "%use_filter_szip%"=="yes" (

-        call :skip %arg%

-    ) else (

-        call :tooltest %arg%

-    )

-      

-    rem szip remove

-    set arg=%file7% --filter=dset_szip:NONE

-    if not "%use_filter_szip_encoder%"=="yes" (

-        call :skip %arg%

-    ) else if not "%use_filter_szip%"=="yes" (

-        call :skip %arg%

-    ) else (

-        call :tooltest %arg%

-    )

-      

-    rem deflate copy

-    set arg=%file8%

-    if not "%use_filter_deflate%"=="yes" (

-        call :skip %arg%

-    ) else (

-        call :tooltest %arg%

-    )

-

-    rem deflate remove

-    set arg=%file8% -f dset_deflate:NONE

-    if not "%use_filter_deflate%"=="yes" (

-        call :skip %arg%

-    ) else (

-        call :tooltest %arg%

-    )

-        

-    rem shuffle copy

-    set arg=%file9%

-    if not "%use_filter_shuffle%"=="yes" (

-        call :skip %arg%

-    ) else (

-        call :tooltest %arg%

-    )

-

-    rem shuffle remove

-    set arg=%file9% -f dset_shuffle:NONE

-    if not "%use_filter_shuffle%"=="yes" (

-        call :skip %arg%

-    ) else (

-        call :tooltest %arg%

-    )

-

-    rem fletcher32 copy

-    set arg=%file10%

-    if not "%use_filter_fletcher32%"=="yes" (

-        call :skip %arg%

-    ) else (

-        call :tooltest %arg%

-    )

-

-    rem fletcher32 remove

-    set arg=%file10% -f dset_fletcher32:NONE

-    if not "%use_filter_fletcher32%"=="yes" (

-        call :skip %arg%

-    ) else (

-        call :tooltest %arg%

-    )

-

-    rem nbit copy

-    set arg=%file12%

-    if not "%use_filter_nbit%"=="yes" (

-        call :skip %arg%

-    ) else (

-        call :tooltest %arg%

-    )

-

-    rem nbit remove

-    set arg=%file12% -f dset_nbit:NONE

-    if not "%use_filter_nbit%"=="yes" (

-        call :skip %arg%

-    ) else (

-        call :tooltest %arg%

-    )

-

-    rem nbit add

-    set arg=%file12% -f dset_int31:NBIT

-    if not "%use_filter_nbit%"=="yes" (

-        call :skip %arg%

-    ) else (

-        call :tooltest %arg%

-    )

-

-    rem scaleoffset copy

-    set arg=%file13%

-    if not "%use_filter_scaleoffset%"=="yes" (

-        call :skip %arg%

-    ) else (

-        call :tooltest %arg%

-    )

-

-    rem scaleoffset add

-    set arg=%file13% -f dset_none:SOFF=31,IN

-    if not "%use_filter_scaleoffset%"=="yes" (

-        call :skip %arg%

-    ) else (

-        call :tooltest %arg%

-    )

-

-    rem scaleoffset remove

-    set arg=%file13% -f dset_scaleoffset:NONE

-    if not "%use_filter_scaleoffset%"=="yes" (

-        call :skip %arg%

-    ) else (

-        call :tooltest %arg%

-    )

-

-    rem remove all  filters

-    set arg=%file11% -f NONE

-    if not "%use_filter_fletcher32%"=="yes" (

-        call :skip %arg%

-    ) else if not "%use_filter_deflate%"=="yes" (

-        call :skip %arg%

-    ) else if not "%use_filter_szip%"=="yes" (

-        call :skip %arg%

-    ) else if not "%use_filter_szip_encoder%"=="yes" (

-        call :skip %arg%

-    ) else if not "%use_filter_shuffle%"=="yes" (

-        call :skip %arg%

-    ) else if not "%use_filter_nbit%"=="yes" (

-        call :skip %arg%

-    ) else if not "%use_filter_scaleoffset%"=="yes" (

-        call :skip %arg%

-    ) else (

-        call :tooltest %arg%

-    )

-

-    rem filter conversions

-

-    set arg=%file8% -f dset_deflate:SZIP=8,NN

-    if not "%use_filter_szip_encoder%"=="yes" (

-        call :skip %arg%

-    ) else if not "%use_filter_szip%"=="yes" (

-        call :skip %arg%

-    ) else if not "%use_filter_deflate%"=="yes" (

-        call :skip %arg%

-    ) else (

-        call :tooltest %arg% 

-    )

-

-    set arg=%file7% -f dset_szip:GZIP=1

-    if not "%use_filter_szip_encoder%"=="yes" (

-        call :skip %arg%

-    ) else if not "%use_filter_szip%"=="yes" (

-        call :skip %arg%

-    ) else if not "%use_filter_deflate%"=="yes" (

-        call :skip %arg%

-    ) else (

-        call :tooltest %arg% 

-    )

-

-

-    rem limit

-    set arg=%file4% -f GZIP=1 -m 1024

-    if not "%use_filter_deflate%"=="yes" (

-        call :skip %arg%

-    ) else (

-        call :tooltest %arg%

-    )

-

-    rem file

-    set arg=%file4% -e %info_file%

-    if not "%use_filter_deflate%"=="yes" (

-        call :skip %arg%

-    ) else (

-        call :tooltest %arg%

-    )

-

-

-    rem ########################################################

-    rem  layout options (these files have no filters)

-    rem ########################################################

-

-    call :tooltest_main %file4% --layout=dset2:CHUNK=20x10

-    call :verify_layout_dset %file4% dset2 CHUNKED

-    call :tooltest_main %file4% -l CHUNK=20x10

-    call :verify_layout_all %file4% CHUNKED

-    call :tooltest_main %file4% -l dset2:CONTI

-    call :verify_layout_dset %file4% dset2 CONTIGUOUS

-    call :tooltest_main %file4% -l CONTI

-    call :verify_layout_all %file4% CONTIGUOUS

-    call :tooltest_main %file4% -l dset2:COMPA

-    call :verify_layout_dset %file4% dset2 COMPACT

-    call :tooltest_main %file4% -l COMPA

-    call :verify_layout_all %file4% COMPACT

-

-

-    rem ###############################################################

-    rem  layout conversions (file has no filters)

-    rem ##############################################################

-

-    set arg1=%file4% -l dset_compact:CONTI

-    set arg2=%file4% -l dset_compact:CHUNK=2x5

-    set arg3=%file4% -l dset_compact:COMPA

-    set arg4=%file4% -l dset_contiguous:COMPA

-    set arg5=%file4% -l dset_contiguous:CHUNK=3x6

-    set arg6=%file4% -l dset_contiguous:CONTI

-    set arg7=%file4% -l dset_chunk:COMPA

-    set arg8=%file4% -l dset_chunk:CONTI

-    set arg9=%file4% -l dset_chunk:CHUNK=18x13

-    call :tooltest_main %arg1%

-    call :verify_layout_dset %file4% dset_compact CONTIGUOUS

-    call :tooltest_main %arg2%

-    call :verify_layout_dset %file4% dset_compact CHUNKED

-    call :tooltest_main %arg3%

-    call :verify_layout_dset %file4% dset_compact COMPACT

-    call :tooltest_main %arg4%

-    call :verify_layout_dset %file4% dset_contiguous COMPACT

-    call :tooltest_main %arg5%

-    call :verify_layout_dset %file4% dset_contiguous CHUNKED

-    call :tooltest_main %arg6%

-    call :verify_layout_dset %file4% dset_contiguous CONTIGUOUS

-    call :tooltest_main %arg7%

-    call :verify_layout_dset %file4% dset_chunk COMPACT

-    call :tooltest_main %arg8%

-    call :verify_layout_dset %file4% dset_chunk CONTIGUOUS

-    call :tooltest_main %arg9%

-    call :verify_layout_dset %file4% dset_chunk CHUNKED

-

-    rem test convert small size dataset ( < 1k) to compact layout without -m

-    call :tooltest_main %file18% -l contig_small:COMPA

-    call :verify_layout_dset %file18% contig_small COMPACT

-

-    call :tooltest_main %file18% -l chunked_small_fixed:COMPA

-    call :verify_layout_dset %file18% chunked_small_fixed COMPACT

-

-    rem Native option

-    rem Do not use FILE1, as the named dtype will be converted to native, and h5diff will

-    rem report a difference.

-    call :tooltest %file0% -n

-    call :tooltest %file2% -n

-

-

-    rem latest file format with long switches. use FILE4=h5repack_layout.h5 (no filters)

-    set arg=%file4% --layout CHUNK=20x10 --filter GZIP=1 --minimum=10 --native --latest --compact=8 --indexed=6 --ssize=8[:dtype]

-    if not "%use_filter_deflate%"=="yes" (

-       call :skip %arg%

-    ) else (

-       call :tooltest_main %arg%

-       call :verify_layout_all %file4% CHUNKED

-    )

-

-    rem latest file format with short switches. use FILE4=h5repack_layout.h5 (no filters)

-    set arg=%file4% -l CHUNK=20x10 -f GZIP=1 -m 10 -n -L -c 8 -d 6 -s 8[:dtype]

-    if not "%use_filter_deflate%"=="yes" (

-       call :skip %arg%

-    ) else (

-       call :tooltest_main %arg%

-       call :verify_layout_all %file4% CHUNKED

-    )

-    

-    rem several global filters

-

-    set arg=%file4% --filter GZIP=1 --filter SHUF

-    if not "%use_filter_deflate%"=="yes" (

-        call :skip %arg%

-    ) else if not "%use_filter_shuffle%"=="yes" (

-        call :skip %arg%

-    ) else (

-        call :tooltest %arg%

-    )

-

-    rem syntax of -i infile -o outfile

-    rem latest file format with short switches. use FILE4=h5repack_layout.h5 (no filters)

-    set arg=%file4% -l CHUNK=20x10 -f GZIP=1 -m 10 -n -L -c 8 -d 6 -s 8[:dtype]

-    if not "%use_filter_deflate%"=="yes" (

-        call :skip %arg%

-    ) else (

-        call :tooltest0 %arg%

-    )

-    

-    rem add a userblock to file

-    set arg=%file1% -u testfiles\ublock.bin -b 2048

-    call :tooltest %arg%

-    

-    rem add alignment

-    set arg=%file1% -t 1 -a 1

-    call :tooltest %arg%

-

-    rem Check repacking file with old version of layout message (should get upgraded

-    rem       to new version and be readable, etc.)

-    call :tooltest %file14%

-    

-    rem test for datum size > H5TOOLS_MALLOCSIZE

-    set arg=%file1% -f GZIP=1

-    call :tooltest %arg%

-    

-    rem Check repacking file with committed datatypes in odd configurations

-    call :tooltest %file15%

-

-    rem tests family driver (file is located in common testfiles folder, uses TOOLTEST1

-    call :tooltest1 %file16%

-

-    

-    if %nerrors% equ 0 (

-        echo.All %h5repack% tests passed.

-    )

-    

-    popd

-    endlocal & exit /b %nerrors%

-    

diff --git a/windows/tools/h5repack/h5repack.vcproj b/windows/tools/h5repack/h5repack.vcproj
deleted file mode 100644
index 5025431..0000000
--- a/windows/tools/h5repack/h5repack.vcproj
+++ /dev/null
@@ -1,444 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="h5repack"

-	ProjectGUID="{411D221C-9FA1-417E-8A2B-DF746F4C7E07}"

-	RootNamespace="h5repack"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5repack/Release/h5repack.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib,..\..\..\test"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5repack/Release/h5repack.pch"

-				AssemblerListingLocation=".\../../../tools/h5repack/Release/"

-				ObjectFile=".\../../../tools/h5repack/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5repack/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				ProgramDatabaseFile=".\../../../tools/h5repack/Release/h5repack.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5repack/Release/h5repack.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib,..\..\..\test"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5repack/Release/h5repack.pch"

-				AssemblerListingLocation=".\../../../tools/h5repack/Release/"

-				ObjectFile=".\../../../tools/h5repack/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5repack/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				ProgramDatabaseFile=".\../../../tools/h5repack/Release/h5repack.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5repack/Debug/h5repack.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib,..\..\..\test"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5repack/Debug/h5repack.pch"

-				AssemblerListingLocation=".\../../../tools/h5repack/Debug/"

-				ObjectFile=".\../../../tools/h5repack/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5repack/Debug/"

-				BrowseInformation="1"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories=""

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5repack/Debug/h5repack.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5repack/Debug/h5repack.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib,..\..\..\test"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5repack/Debug/h5repack.pch"

-				AssemblerListingLocation=".\../../../tools/h5repack/Debug/"

-				ObjectFile=".\../../../tools/h5repack/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5repack/Debug/"

-				BrowseInformation="1"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories=""

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5repack/Debug/h5repack.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"

-			>

-			<File

-				RelativePath="..\..\..\tools\h5repack\h5repack.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\h5repack\h5repack_copy.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\h5repack\h5repack_filters.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\h5repack\h5repack_main.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\h5repack\h5repack_opttable.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\h5repack\h5repack_parse.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\h5repack\h5repack_refs.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\h5repack\h5repack_verify.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd"

-			>

-			<File

-				RelativePath="..\..\..\tools\h5repack\h5repack.h"

-				>

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/h5repackdll/h5repackdll.vcproj b/windows/tools/h5repackdll/h5repackdll.vcproj
deleted file mode 100644
index cde7ab3..0000000
--- a/windows/tools/h5repackdll/h5repackdll.vcproj
+++ /dev/null
@@ -1,432 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="h5repackdll"

-	ProjectGUID="{854F7E09-CEB5-44CD-B924-3FFAC7936323}"

-	RootNamespace="h5repackdll"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5repackdll/Debug/h5repackdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib,..\..\..\test"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5repackdll/Debug/h5repackdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5repackdll/Debug/"

-				ObjectFile=".\../../../tools/h5repackdll/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5repackdll/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5repackdll/Debug/h5repackdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5repackdll/Debug/h5repackdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib,..\..\..\test"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5repackdll/Debug/h5repackdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5repackdll/Debug/"

-				ObjectFile=".\../../../tools/h5repackdll/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5repackdll/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5repackdll/Debug/h5repackdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5repackdll/Release/h5repackdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib,..\..\..\test"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5repackdll/Release/h5repackdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5repackdll/Release/"

-				ObjectFile=".\../../../tools/h5repackdll/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5repackdll/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../tools/h5repackdll/Release/h5repackdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5repackdll/Release/h5repackdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib,..\..\..\test"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5repackdll/Release/h5repackdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5repackdll/Release/"

-				ObjectFile=".\../../../tools/h5repackdll/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5repackdll/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../tools/h5repackdll/Release/h5repackdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"

-			>

-			<File

-				RelativePath="..\..\..\tools\h5repack\h5repack.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\h5repack\h5repack_copy.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\h5repack\h5repack_filters.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\h5repack\h5repack_main.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\h5repack\h5repack_opttable.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\h5repack\h5repack_parse.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\h5repack\h5repack_refs.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\h5repack\h5repack_verify.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd"

-			>

-			<File

-				RelativePath="..\..\..\tools\h5repack\h5repack.h"

-				>

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/h5repart/h5repart.vcproj b/windows/tools/h5repart/h5repart.vcproj
deleted file mode 100644
index 19fb2c0..0000000
--- a/windows/tools/h5repart/h5repart.vcproj
+++ /dev/null
@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="h5repart"

-	ProjectGUID="{F2E38A8C-F3A3-4DA4-B9C2-11C753FF51BF}"

-	RootNamespace="h5repart"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5repart/Release/h5repart.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5repart/Release/h5repart.pch"

-				AssemblerListingLocation=".\../../../tools/h5repart/Release/"

-				ObjectFile=".\../../../tools/h5repart/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5repart/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				ProgramDatabaseFile=".\../../../tools/h5repart/Release/h5repart.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5repart/Release/h5repart.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5repart/Release/h5repart.pch"

-				AssemblerListingLocation=".\../../../tools/h5repart/Release/"

-				ObjectFile=".\../../../tools/h5repart/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5repart/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				ProgramDatabaseFile=".\../../../tools/h5repart/Release/h5repart.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5repart/Debug/h5repart.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5repart/Debug/h5repart.pch"

-				AssemblerListingLocation=".\../../../tools/h5repart/Debug/"

-				ObjectFile=".\../../../tools/h5repart/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5repart/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5repart/Debug/h5repart.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5repart/Debug/h5repart.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5repart/Debug/h5repart.pch"

-				AssemblerListingLocation=".\../../../tools/h5repart/Debug/"

-				ObjectFile=".\../../../tools/h5repart/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5repart/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5repart/Debug/h5repart.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\..\tools\misc\h5repart.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/h5repart/testh5repart.bat b/windows/tools/h5repart/testh5repart.bat
deleted file mode 100644
index 70ad229..0000000
--- a/windows/tools/h5repart/testh5repart.bat
+++ /dev/null
@@ -1,148 +0,0 @@
-@echo off

-rem

-rem Copyright by The HDF Group.

-rem Copyright by the Board of Trustees of the University of Illinois.

-rem All rights reserved.

-rem

-rem This file is part of HDF5.  The full HDF5 copyright notice, including

-rem terms governing use, modification, and redistribution, is contained in

-rem the files COPYING and Copyright.html.  COPYING can be found at the root

-rem of the source code distribution tree; Copyright.html can be found at the

-rem root level of an installed copy of the electronic HDF5 document set and

-rem is linked from the top-level documents page.  It can also be found at

-rem http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have

-rem access to either file, you may request a copy from help@hdfgroup.org.

-rem

-rem Tests for the h5repart tool

-rem

-rem    Created:  Scott Wegner, 8/29/07

-rem    Modified:

-rem

-

-setlocal enabledelayedexpansion

-pushd %~dp0

-

-rem The tool name

-set repart=h5repart%2

-rem The path of the tool library

-set repart_bin=%CD%\..\%repart%\%1\%repart%

-

-rem The test name

-set reparted_fam=h5reparttst

-rem The path of the test binary

-set reparted_fam_bin=%CD%\..\testfiles\%reparted_fam%\%1\%reparted_fam%

-

-set nerrors=0

-set verbose=yes

-

-if not exist ..\testfiles mkdir ..\testfiles

-

-set actual_dir=%CD%\..\testfiles

-

-goto main

-

-

-rem Print a line-line message left justified in a field of 70 characters

-rem beginning with the word "Testing".

-rem

-:testing

-    set test_msg=Testing %dumper%

-    for %%a in (%*) do (

-        if %%a neq PASSED (

-        if %%a neq *FAILED* (

-            set test_msg=!test_msg! %%~nxa

-        ) )

-    )

-    rem We need to replace PERCENT-ZERO here with "%0" for the tfamily test.

-    rem --SJW 9/4/07

-    set test_msg=!test_msg:PERCENT-ZERO=%%0!                                                                

-    echo.%test_msg:~0,69% %1

-    

-    exit /b

-

-    

-rem Run a test and print PASS or *FAIL*.  If a test fails then increment

-rem the `nerrors' global variable.

-rem

-:tooltest

-    rem Run tool test.

-    (

-        rem We need to replace PERCENT-ZERO here with "%0" for the tfamily test.

-        rem --SJW 9/4/07

-        set params=%*

-        set params=!params:PERCENT-ZERO=%%0!

-        pushd %CD%\..\testfiles

-        %repart_bin% !params!

-        popd

-    )

-    

-    if %errorlevel% equ 0 (

-        call :testing PASSED %repart% %*

-    ) else (

-        call :testing *FAILED* %repart% %*

-        set /a nerrors=!nerrors!+1

-    )

-    

-    exit /b

-    

-    

-:outputtest

-    rem Run test program

-    (

-        pushd %actual_dir%

-        %reparted_fam_bin% %*

-        popd

-    )

-    

-    if %errorlevel% equ 0 (

-        call :testing PASSED %reparted_fam% %*

-    ) else (

-        call :testing *FAILED* %reparted_fam% %*

-        set /a nerrors=!nerrors!+1

-    )

-    

-    exit /b

-    

-    

-rem Print a "SKIP" message

-:skip

-    call :testing -SKIP- %*

-    exit /b

-    

-    

-rem ############################################################################

-rem ############################################################################

-rem #			  T H E   T E S T S                                ###

-rem ############################################################################

-rem ############################################################################

-:main

-

-    rem On Windows, we pass "PERCENT-ZERO", and let other calls replace it with

-    rem the "%0".  We cannot pass "%0" directly because Windows interprets it as

-    rem the name of the script.  --SJW 9/4/07

-    

-    rem repartition family member size to 20,000 bytes.

-    call :tooltest -m 20000 family_filePERCENT-ZERO5d.h5 %actual_dir%\fst_familyPERCENT-ZERO5d.h5

-    rem repartition family member size to 5 KB.

-    call :tooltest -m 5k family_filePERCENT-ZERO5d.h5 %actual_dir%\scd_familyPERCENT-ZERO5d.h5

-    rem convert family file to sec2 file of 20,000 bytes

-    call :tooltest -m 20000 -family_to_sec2 family_filePERCENT-ZERO5d.h5 %actual_dir%\family_to_sec2.h5

-

-    rem test the output files repartitioned above.

-    call :outputtest

-    echo.

-

-    if %nerrors% equ 0 (

-        echo.All %repart% tests passed.

-    )

-    

-    rem Clean up output file

-    if not defined hdf5_nocleanup (

-        pushd %actual_dir%

-        del /f fst_family*.h5 scd_family*.h5 family_to_sec2.h5

-        popd

-    )

-    

-    popd

-    endlocal & exit /b %nerrors%

-    
\ No newline at end of file
diff --git a/windows/tools/h5repartdll/h5repartdll.vcproj b/windows/tools/h5repartdll/h5repartdll.vcproj
deleted file mode 100644
index 498b38f..0000000
--- a/windows/tools/h5repartdll/h5repartdll.vcproj
+++ /dev/null
@@ -1,388 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="h5repartdll"

-	ProjectGUID="{89DA820B-7A3B-46FA-AE09-971A739BEEFD}"

-	RootNamespace="h5repartdll"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5repartdll/Debug/h5repartdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5repartdll/Debug/h5repartdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5repartdll/Debug/"

-				ObjectFile=".\../../../tools/h5repartdll/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5repartdll/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5repartdll/Debug/h5repartdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5repartdll/Debug/h5repartdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5repartdll/Debug/h5repartdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5repartdll/Debug/"

-				ObjectFile=".\../../../tools/h5repartdll/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5repartdll/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5repartdll/Debug/h5repartdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5repartdll/Release/h5repartdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5repartdll/Release/h5repartdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5repartdll/Release/"

-				ObjectFile=".\../../../tools/h5repartdll/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5repartdll/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../tools/h5repartdll/Release/h5repartdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5repartdll/Release/h5repartdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5repartdll/Release/h5repartdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5repartdll/Release/"

-				ObjectFile=".\../../../tools/h5repartdll/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5repartdll/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../tools/h5repartdll/Release/h5repartdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\..\tools\misc\h5repart.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/h5stat/h5stat.vcproj b/windows/tools/h5stat/h5stat.vcproj
deleted file mode 100644
index f9b5d12..0000000
--- a/windows/tools/h5stat/h5stat.vcproj
+++ /dev/null
@@ -1,394 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="h5stat"

-	ProjectGUID="{405F6F0A-DBE6-4A4E-AAE2-D4D514BA0CF5}"

-	RootNamespace="h5stat"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5stat/Debug/h5stat.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5stat/Debug/h5stat.pch"

-				AssemblerListingLocation=".\../../../tools/h5stat/Debug/"

-				ObjectFile=".\../../../tools/h5stat/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5stat/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5stat/Debug/h5stat.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5stat/Debug/h5stat.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5stat/Debug/h5stat.pch"

-				AssemblerListingLocation=".\../../../tools/h5stat/Debug/"

-				ObjectFile=".\../../../tools/h5stat/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5stat/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5stat/Debug/h5stat.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5stat/Release/h5stat.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5stat/Release/h5stat.pch"

-				AssemblerListingLocation=".\../../../tools/h5stat/Release/"

-				ObjectFile=".\../../../tools/h5stat/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5stat/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../tools/h5stat/Release/h5stat.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5stat/Release/h5stat.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5stat/Release/h5stat.pch"

-				AssemblerListingLocation=".\../../../tools/h5stat/Release/"

-				ObjectFile=".\../../../tools/h5stat/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5stat/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../tools/h5stat/Release/h5stat.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\..\tools\h5stat\h5stat.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/h5stat/testh5stat.bat b/windows/tools/h5stat/testh5stat.bat
deleted file mode 100644
index 3969c7e..0000000
--- a/windows/tools/h5stat/testh5stat.bat
+++ /dev/null
@@ -1,183 +0,0 @@
-@echo off

-rem

-rem Copyright by The HDF Group.

-rem Copyright by the Board of Trustees of the University of Illinois.

-rem All rights reserved.

-rem

-rem This file is part of HDF5.  The full HDF5 copyright notice, including

-rem terms governing use, modification, and redistribution, is contained in

-rem the files COPYING and Copyright.html.  COPYING can be found at the root

-rem of the source code distribution tree; Copyright.html can be found at the

-rem root level of an installed copy of the electronic HDF5 document set and

-rem is linked from the top-level documents page.  It can also be found at

-rem http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have

-rem access to either file, you may request a copy from help@hdfgroup.org.

-rem

-rem Tests for the h5stat tool

-rem

-rem    Created:  Scott Wegner, 8/28/07

-rem    Modified:

-rem

-

-setlocal enabledelayedexpansion

-pushd %~dp0

-

-set EXIT_SUCCESS=0

-set EXIT_FAILURE=1

-

-set h5pubconf=%CD%\..\..\src\h5pubconf.h

-

-rem Determine which filters are available

-rem On Windows, the function :detect_filter sets these for us

-call :detect_filter szip

-call :detect_filter deflate

-call :detect_filter shuffle

-call :detect_filter fletcher32

-call :detect_filter nbit

-call :detect_filter scaleoffset

-

-rem The tool name

-set stat=h5stat%2

-rem The path of the tool binary

-set stat_bin=%CD%\..\%stat%\%1\%stat%

-

-set nerrors=0

-set verbose=yes

-

-if not exist .\testfiles mkdir .\testfiles

-

-goto main

-

-

-rem Print a line-line message left justified in a field of 70 characters

-rem beginning with the word "Testing".

-rem

-:testing

-    set test_msg=Testing

-    for %%a in (%*) do (

-        if %%a neq PASSED (

-        if %%a neq *FAILED* (

-            set test_msg=!test_msg! %%~nxa

-        ) )

-    )

-    set test_msg=!test_msg!                                                                

-    echo.%test_msg:~0,69% %1

-    

-    exit /b

-

-    

-rem Run a test and print PASS or *FAIL*.  If a test fails then increment

-rem the `nerrors' global variable and (if %verbose% is set) display the

-rem difference between the actual output and the expected output. The

-rem expected output is given as the first argument to this function and

-rem the actual output file is calculated by replacing the `.ddl' with

-rem `.out'.  The actual output is not removed if %HDF5_NOCLEANUP% has a

-rem non-zero value.

-rem

-:tooltest

-    set expect=%CD%\testfiles\%1

-    set actual=%CD%\testfiles\%~n1.out

-    set actual_err=%CD%\testfiles\%~n1.err

-    

-    rem We define %params% here because Windows `shift` command doesn't affect

-    rem the %* variable.  --SJW 8/28/07

-    set params=%*

-    set params=%params:* =%

-    

-    rem Run test.

-    (

-        echo.#############################

-        rem Filter out quotes because they do on Linux.  --SJW 8/28/07

-        echo.Expected output for 'h5stat %params:"=%'

-        echo.#############################

-        pushd %CD%\testfiles

-        %stat_bin% %params%

-        popd

-    ) > %actual% 2> %actual_err%

-    type %actual_err% >> %actual%

-    

-    

-    if not exist %expect% (

-        rem Create the expect file if it doesn't yet exist

-        call :testing CREATED %stat% %params%

-        copy /y %actual% %expect%

-    ) else (

-        fc /w %expect% %actual% > nul

-        if !errorlevel! equ 0 (

-            call :testing PASSED %stat% %params%

-        ) else (

-            call :testing *FAILED* %stat% %params%

-            echo.    Expected results ^(*.ddl^) differs from actual result ^(*.out^)

-            set /a nerrors=!nerrors!+1

-            if "yes"=="%verbose%" fc %expect% %actual%

-        )

-    )

-    

-    rem Clean up output file

-    if not defined hdf5_nocleanup (

-        del /f %actual% %actual_err%

-    )

-    

-    exit /b

-    

-    

-rem This is a Windows-specific function that detects if the filter passed

-rem should be enabled for this test script.  It searches H5pubconf.h for the

-rem string "#define H5_HAVE_FILTER_%1" and sets the variable "use_filter_%1"

-rem accordingly.  On other platforms, this variable is set in the Makefile.

-rem If we find a better way to test this in the future, we should use it.

-rem --SJW 9/4/07

-:detect_filter

-    findstr /b /i /c:"#define H5_HAVE_FILTER_%1" %h5pubconf% > nul

-    if %errorlevel% equ 0 (

-        set use_filter_%1=yes

-    ) else (

-        set use_filter_%1=no

-    )

-    

-    exit /b

-

-

-rem Print a "SKIP" message

-:skip

-    call :testing -SKIP- %*

-    exit /b

-

-    

-rem ############################################################################

-rem ############################################################################

-rem #                       T H E   T E S T S                                ###

-rem ############################################################################

-rem ############################################################################

-:main

-

-    rem Test for help flag

-    call :tooltest h5stat_help1.ddl -h

-    call :tooltest h5stat_help2.ddl --help

-

-    rem Test file with groups, compressed datasets, user-applied fileters, etc.

-    rem h5stat_filters.h5 is a copy of ../../testfiles/tfilters.h5 as of release 1.8.0-alpha4

-    call :tooltest h5stat_filters.ddl h5stat_filters.h5

-    call :tooltest h5stat_filters-file.ddl  -f   h5stat_filters.h5

-    call :tooltest h5stat_filters-F.ddl  -F   h5stat_filters.h5

-    call :tooltest h5stat_filters-d.ddl  -d   h5stat_filters.h5

-    call :tooltest h5stat_filters-g.ddl  -g   h5stat_filters.h5

-    call :tooltest h5stat_filters-dT.ddl -dT  h5stat_filters.h5

-    call :tooltest h5stat_filters-UD.ddl -D  h5stat_filters.h5

-    call :tooltest h5stat_filters-UT.ddl -T  h5stat_filters.h5

-    rem h5stat_tsohm.h5 is a copy of ../../../test/tsohm.h5 generated by tsohm.c 

-    rem as of release 1.8.0-alpha4

-    call :tooltest h5stat_tsohm.ddl h5stat_tsohm.h5

-    rem h5stat_newgrat.h5 is generated by h5stat_gentest.c

-    call :tooltest h5stat_newgrat.ddl h5stat_newgrat.h5

-    call :tooltest h5stat_newgrat-UG.ddl -G h5stat_newgrat.h5

-    call :tooltest h5stat_newgrat-UA.ddl -A h5stat_newgrat.h5

-    echo.

-    

-    if %nerrors% equ 0 (

-        echo.All %stat% tests passed.

-    )

-    

-    popd

-    endlocal & exit /b %nerrors%

-    

diff --git a/windows/tools/h5statdll/h5statdll.vcproj b/windows/tools/h5statdll/h5statdll.vcproj
deleted file mode 100644
index 265de0e..0000000
--- a/windows/tools/h5statdll/h5statdll.vcproj
+++ /dev/null
@@ -1,392 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="h5statdll"

-	ProjectGUID="{165195D1-B742-4030-8B12-3FE94B829D45}"

-	RootNamespace="h5statdll"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5statdll/Debug/h5statdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5statdll/Debug/h5statdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5statdll/Debug/"

-				ObjectFile=".\../../../tools/h5statdll/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5statdll/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5statdll/Debug/h5statdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5statdll/Debug/h5statdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5statdll/Debug/h5statdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5statdll/Debug/"

-				ObjectFile=".\../../../tools/h5statdll/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5statdll/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5statdll/Debug/h5statdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5statdll/Release/h5statdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5statdll/Release/h5statdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5statdll/Release/"

-				ObjectFile=".\../../../tools/h5statdll/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5statdll/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../tools/h5statdll/Release/h5statdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5statdll/Release/h5statdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5statdll/Release/h5statdll.pch"

-				AssemblerListingLocation=".\../../../tools/h5statdll/Release/"

-				ObjectFile=".\../../../tools/h5statdll/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5statdll/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../tools/h5statdll/Release/h5statdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\..\tools\h5stat\h5stat.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/h5unjam/h5unjam.vcproj b/windows/tools/h5unjam/h5unjam.vcproj
deleted file mode 100644
index c547869..0000000
--- a/windows/tools/h5unjam/h5unjam.vcproj
+++ /dev/null
@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="h5unjam"

-	ProjectGUID="{52E83C17-2B68-44B5-881D-4F6338FB14C7}"

-	RootNamespace="h5unjam"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5unjam/Release/h5unjam.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5unjam/Release/h5unjam.pch"

-				AssemblerListingLocation=".\../../../tools/h5unjam/Release/"

-				ObjectFile=".\../../../tools/h5unjam/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5unjam/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../tools/h5unjam/Release/h5unjam.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5unjam/Release/h5unjam.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5unjam/Release/h5unjam.pch"

-				AssemblerListingLocation=".\../../../tools/h5unjam/Release/"

-				ObjectFile=".\../../../tools/h5unjam/Release/"

-				ProgramDataBaseFileName=".\../../../tools/h5unjam/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../tools/h5unjam/Release/h5unjam.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/h5unjam/Debug/h5unjam.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5unjam/Debug/h5unjam.pch"

-				AssemblerListingLocation=".\../../../tools/h5unjam/Debug/"

-				ObjectFile=".\../../../tools/h5unjam/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5unjam/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5unjam/Debug/h5unjam.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/h5unjam/Debug/h5unjam.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/h5unjam/Debug/h5unjam.pch"

-				AssemblerListingLocation=".\../../../tools/h5unjam/Debug/"

-				ObjectFile=".\../../../tools/h5unjam/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/h5unjam/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/h5unjam/Debug/h5unjam.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\..\tools\h5jam\h5unjam.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/talign/talign.vcproj b/windows/tools/talign/talign.vcproj
deleted file mode 100644
index 48d7cce..0000000
--- a/windows/tools/talign/talign.vcproj
+++ /dev/null
@@ -1,398 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="talign"

-	ProjectGUID="{E6A9BFE8-84DE-46C0-A372-72087598018E}"

-	RootNamespace="talign"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/talign/Debug/talign.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\tools\misc,..\..\..\src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/talign/Debug/talign.pch"

-				AssemblerListingLocation=".\../../../tools/talign/Debug/"

-				ObjectFile=".\../../../tools/talign/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/talign/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/talign/Debug/talign.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/talign/Debug/talign.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\tools\misc,..\..\..\src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/talign/Debug/talign.pch"

-				AssemblerListingLocation=".\../../../tools/talign/Debug/"

-				ObjectFile=".\../../../tools/talign/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/talign/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/talign/Debug/talign.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/talign/Release/talign.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\tools\misc,..\..\..\src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/talign/Release/talign.pch"

-				AssemblerListingLocation=".\../../../tools/talign/Release/"

-				ObjectFile=".\../../../tools/talign/Release/"

-				ProgramDataBaseFileName=".\../../../tools/talign/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				ProgramDatabaseFile=".\../../../tools/talign/Release/talign.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/talign/Release/talign.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\tools\misc,..\..\..\src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/talign/Release/talign.pch"

-				AssemblerListingLocation=".\../../../tools/talign/Release/"

-				ObjectFile=".\../../../tools/talign/Release/"

-				ProgramDataBaseFileName=".\../../../tools/talign/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				ProgramDatabaseFile=".\../../../tools/talign/Release/talign.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\..\tools\misc\talign.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/taligndll/taligndll.vcproj b/windows/tools/taligndll/taligndll.vcproj
deleted file mode 100644
index 479457d..0000000
--- a/windows/tools/taligndll/taligndll.vcproj
+++ /dev/null
@@ -1,394 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="taligndll"

-	ProjectGUID="{3BBA31F8-2679-4655-975D-52FDA5ABD5C4}"

-	RootNamespace="taligndll"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/taligndll/Release/taligndll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\tools\misc,..\..\..\src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/taligndll/Release/taligndll.pch"

-				AssemblerListingLocation=".\../../../tools/taligndll/Release/"

-				ObjectFile=".\../../../tools/taligndll/Release/"

-				ProgramDataBaseFileName=".\../../../tools/taligndll/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../tools/taligndll/Release/taligndll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/taligndll/Release/taligndll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\tools\misc,..\..\..\src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/taligndll/Release/taligndll.pch"

-				AssemblerListingLocation=".\../../../tools/taligndll/Release/"

-				ObjectFile=".\../../../tools/taligndll/Release/"

-				ProgramDataBaseFileName=".\../../../tools/taligndll/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../tools/taligndll/Release/taligndll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../tools/taligndll/Debug/taligndll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\tools\misc,..\..\..\src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/taligndll/Debug/taligndll.pch"

-				AssemblerListingLocation=".\../../../tools/taligndll/Debug/"

-				ObjectFile=".\../../../tools/taligndll/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/taligndll/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/taligndll/Debug/taligndll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../tools/taligndll/Debug/taligndll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\tools\misc,..\..\..\src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../tools/taligndll/Debug/taligndll.pch"

-				AssemblerListingLocation=".\../../../tools/taligndll/Debug/"

-				ObjectFile=".\../../../tools/taligndll/Debug/"

-				ProgramDataBaseFileName=".\../../../tools/taligndll/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../tools/taligndll/Debug/taligndll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\..\tools\misc\talign.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/testfiles/binread/binread.vcproj b/windows/tools/testfiles/binread/binread.vcproj
deleted file mode 100644
index 428e949..0000000
--- a/windows/tools/testfiles/binread/binread.vcproj
+++ /dev/null
@@ -1,382 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="binread"

-	ProjectGUID="{BE9A4A65-F25B-4DCF-8B55-06B3D0C685CB}"

-	RootNamespace="binread"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../tools/testfiles/binread/Release/binread.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/binread/Release/binread.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/binread/Release/"

-				ObjectFile=".\../../../../tools/testfiles/binread/Release/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/binread/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/binread/Release/binread.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../../tools/testfiles/binread/Release/binread.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/binread/Release/binread.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/binread/Release/"

-				ObjectFile=".\../../../../tools/testfiles/binread/Release/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/binread/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/binread/Release/binread.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../tools/testfiles/binread/Debug/binread.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/binread/Debug/binread.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/binread/Debug/"

-				ObjectFile=".\../../../../tools/testfiles/binread/Debug/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/binread/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/binread/Debug/binread.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../../tools/testfiles/binread/Debug/binread.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/binread/Debug/binread.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/binread/Debug/"

-				ObjectFile=".\../../../../tools/testfiles/binread/Debug/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/binread/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/binread/Debug/binread.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\..\..\tools\h5dump\binread.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/testfiles/h5difftst/h5difftst.vcproj b/windows/tools/testfiles/h5difftst/h5difftst.vcproj
deleted file mode 100644
index 6b0bc49..0000000
--- a/windows/tools/testfiles/h5difftst/h5difftst.vcproj
+++ /dev/null
@@ -1,416 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="h5difftst"

-	ProjectGUID="{1F80CDF7-B1CB-4303-B282-A21EDC2BDCB4}"

-	RootNamespace="h5difftst"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../tools/testfiles/h5difftst/Release/h5difftst.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/h5difftst/Release/h5difftst.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/h5difftst/Release/"

-				ObjectFile=".\../../../../tools/testfiles/h5difftst/Release/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/h5difftst/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				ProgramDatabaseFile=".\../../../../tools/testfiles/h5difftst/Release/h5difftst.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../../tools/testfiles/h5difftst/Release/h5difftst.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/h5difftst/Release/h5difftst.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/h5difftst/Release/"

-				ObjectFile=".\../../../../tools/testfiles/h5difftst/Release/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/h5difftst/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				ProgramDatabaseFile=".\../../../../tools/testfiles/h5difftst/Release/h5difftst.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../tools/testfiles/h5difftst/Debug/h5difftst.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/h5difftst/Debug/h5difftst.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/h5difftst/Debug/"

-				ObjectFile=".\../../../../tools/testfiles/h5difftst/Debug/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/h5difftst/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/h5difftst/Debug/h5difftst.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../../tools/testfiles/h5difftst/Debug/h5difftst.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/h5difftst/Debug/h5difftst.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/h5difftst/Debug/"

-				ObjectFile=".\../../../../tools/testfiles/h5difftst/Debug/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/h5difftst/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/h5difftst/Debug/h5difftst.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"

-			>

-			<File

-				RelativePath="..\..\..\..\tools\h5diff\h5diffgentest.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd"

-			>

-			<File

-				RelativePath="..\..\..\..\tools\lib\h5tools.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\tools\h5diff\testh5diff.h"

-				>

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/testfiles/h5dumptst/h5dumptst.vcproj b/windows/tools/testfiles/h5dumptst/h5dumptst.vcproj
deleted file mode 100644
index 6fc9d0a..0000000
--- a/windows/tools/testfiles/h5dumptst/h5dumptst.vcproj
+++ /dev/null
@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="h5dumptst"

-	ProjectGUID="{0A33B4FE-A2C9-4B7F-ACEC-D251308182ED}"

-	RootNamespace="h5dumptst"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../tools/testfiles/h5dumptst/Debug/h5dumptst.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/h5dumptst/Debug/h5dumptst.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/h5dumptst/Debug/"

-				ObjectFile=".\../../../../tools/testfiles/h5dumptst/Debug/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/h5dumptst/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/h5dumptst/Debug/h5dumptst.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../../tools/testfiles/h5dumptst/Debug/h5dumptst.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/h5dumptst/Debug/h5dumptst.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/h5dumptst/Debug/"

-				ObjectFile=".\../../../../tools/testfiles/h5dumptst/Debug/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/h5dumptst/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/h5dumptst/Debug/h5dumptst.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../tools/testfiles/h5dumptst/Release/h5dumptst.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/h5dumptst/Release/h5dumptst.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/h5dumptst/Release/"

-				ObjectFile=".\../../../../tools/testfiles/h5dumptst/Release/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/h5dumptst/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				ProgramDatabaseFile=".\../../../../tools/testfiles/h5dumptst/Release/h5dumptst.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../../tools/testfiles/h5dumptst/Release/h5dumptst.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/h5dumptst/Release/h5dumptst.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/h5dumptst/Release/"

-				ObjectFile=".\../../../../tools/testfiles/h5dumptst/Release/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/h5dumptst/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				ProgramDatabaseFile=".\../../../../tools/testfiles/h5dumptst/Release/h5dumptst.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\..\..\tools\h5dump\h5dumpgentest.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/testfiles/h5importtst/h5importtst.vcproj b/windows/tools/testfiles/h5importtst/h5importtst.vcproj
deleted file mode 100644
index 81bc060..0000000
--- a/windows/tools/testfiles/h5importtst/h5importtst.vcproj
+++ /dev/null
@@ -1,390 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="h5importtst"

-	ProjectGUID="{AF696934-5004-4C1D-90C3-B434E92AFB89}"

-	RootNamespace="h5importtst"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../tools/testfiles/h5importtst/Debug/h5importtst.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/h5importtst/Debug/h5importtst.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/h5importtst/Debug/"

-				ObjectFile=".\../../../../tools/testfiles/h5importtst/Debug/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/h5importtst/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/h5importtst/Debug/h5importtst.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../../tools/testfiles/h5importtst/Debug/h5importtst.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/h5importtst/Debug/h5importtst.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/h5importtst/Debug/"

-				ObjectFile=".\../../../../tools/testfiles/h5importtst/Debug/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/h5importtst/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/h5importtst/Debug/h5importtst.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../tools/testfiles/h5importtst/Release/h5importtst.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\..\src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/h5importtst/Release/h5importtst.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/h5importtst/Release/"

-				ObjectFile=".\../../../../tools/testfiles/h5importtst/Release/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/h5importtst/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/h5importtst/Release/h5importtst.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../../tools/testfiles/h5importtst/Release/h5importtst.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\..\src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/h5importtst/Release/h5importtst.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/h5importtst/Release/"

-				ObjectFile=".\../../../../tools/testfiles/h5importtst/Release/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/h5importtst/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/h5importtst/Release/h5importtst.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\..\..\tools\h5import\h5importtest.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/testfiles/h5jamtst/h5jamtst.vcproj b/windows/tools/testfiles/h5jamtst/h5jamtst.vcproj
deleted file mode 100644
index 44284e1..0000000
--- a/windows/tools/testfiles/h5jamtst/h5jamtst.vcproj
+++ /dev/null
@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="h5jamtst"

-	ProjectGUID="{E8896FEE-8601-4AFC-91EA-6F9698574174}"

-	RootNamespace="h5jamtst"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../tools/testfiles/h5jamtst/Debug/h5jamtst.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/h5jamtst/Debug/h5jamtst.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/h5jamtst/Debug/"

-				ObjectFile=".\../../../../tools/testfiles/h5jamtst/Debug/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/h5jamtst/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/h5jamtst/Debug/h5jamtst.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../../tools/testfiles/h5jamtst/Debug/h5jamtst.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/h5jamtst/Debug/h5jamtst.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/h5jamtst/Debug/"

-				ObjectFile=".\../../../../tools/testfiles/h5jamtst/Debug/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/h5jamtst/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/h5jamtst/Debug/h5jamtst.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../tools/testfiles/h5jamtst/Release/h5jamtst.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\..\src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/h5jamtst/Release/h5jamtst.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/h5jamtst/Release/"

-				ObjectFile=".\../../../../tools/testfiles/h5jamtst/Release/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/h5jamtst/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/h5jamtst/Release/h5jamtst.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../../tools/testfiles/h5jamtst/Release/h5jamtst.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\..\src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/h5jamtst/Release/h5jamtst.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/h5jamtst/Release/"

-				ObjectFile=".\../../../../tools/testfiles/h5jamtst/Release/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/h5jamtst/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/h5jamtst/Release/h5jamtst.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\..\..\tools\h5jam\h5jamgentest.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/testfiles/h5repacktst/h5repacktst.vcproj b/windows/tools/testfiles/h5repacktst/h5repacktst.vcproj
deleted file mode 100644
index 8f65ad5..0000000
--- a/windows/tools/testfiles/h5repacktst/h5repacktst.vcproj
+++ /dev/null
@@ -1,440 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="h5repacktst"

-	ProjectGUID="{AC4C582B-B27D-4E57-A59F-6FF0E833C6E5}"

-	RootNamespace="h5repacktst"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../tools/testfiles/h5repacktst/Debug/h5repacktst.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\test,..\..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/h5repacktst/Debug/h5repacktst.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/h5repacktst/Debug/"

-				ObjectFile=".\../../../../tools/testfiles/h5repacktst/Debug/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/h5repacktst/Debug/"

-				BrowseInformation="1"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/h5repacktst/Debug/h5repacktst.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../../tools/testfiles/h5repacktst/Debug/h5repacktst.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\test,..\..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/h5repacktst/Debug/h5repacktst.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/h5repacktst/Debug/"

-				ObjectFile=".\../../../../tools/testfiles/h5repacktst/Debug/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/h5repacktst/Debug/"

-				BrowseInformation="1"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/h5repacktst/Debug/h5repacktst.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../tools/testfiles/h5repacktst/Release/h5repacktst.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\test,..\..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/h5repacktst/Release/h5repacktst.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/h5repacktst/Release/"

-				ObjectFile=".\../../../../tools/testfiles/h5repacktst/Release/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/h5repacktst/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/h5repacktst/Release/h5repacktst.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../../tools/testfiles/h5repacktst/Release/h5repacktst.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\test,..\..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/h5repacktst/Release/h5repacktst.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/h5repacktst/Release/"

-				ObjectFile=".\../../../../tools/testfiles/h5repacktst/Release/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/h5repacktst/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/h5repacktst/Release/h5repacktst.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"

-			>

-			<File

-				RelativePath="..\..\..\..\tools\h5repack\h5repack.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\tools\h5repack\h5repack_copy.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\tools\h5repack\h5repack_filters.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\tools\h5repack\h5repack_opttable.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\tools\h5repack\h5repack_parse.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\tools\h5repack\h5repack_refs.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\tools\h5repack\h5repack_verify.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\tools\h5repack\h5repacktst.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd"

-			>

-			<File

-				RelativePath="..\..\..\..\tools\h5repack\h5repack.h"

-				>

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/testfiles/h5repart_gentest/h5repart_gentest.vcproj b/windows/tools/testfiles/h5repart_gentest/h5repart_gentest.vcproj
deleted file mode 100644
index dbcf62d..0000000
--- a/windows/tools/testfiles/h5repart_gentest/h5repart_gentest.vcproj
+++ /dev/null
@@ -1,394 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="h5repart_gentest"

-	ProjectGUID="{EBF7C380-5F58-462D-993D-75B53F83FA81}"

-	RootNamespace="h5repart_gentest"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../tools/testfiles/h5repart_gentest/Debug/h5repart_gentest.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/h5repart_gentest/Debug/h5repart_gentest.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/h5repart_gentest/Debug/"

-				ObjectFile=".\../../../../tools/testfiles/h5repart_gentest/Debug/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/h5repart_gentest/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/h5repart_gentest/Debug/h5repart_gentest.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../../tools/testfiles/h5repart_gentest/Debug/h5repart_gentest.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/h5repart_gentest/Debug/h5repart_gentest.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/h5repart_gentest/Debug/"

-				ObjectFile=".\../../../../tools/testfiles/h5repart_gentest/Debug/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/h5repart_gentest/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/h5repart_gentest/Debug/h5repart_gentest.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../tools/testfiles/h5repart_gentest/Release/h5repart_gentest.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\..\src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/h5repart_gentest/Release/h5repart_gentest.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/h5repart_gentest/Release/"

-				ObjectFile=".\../../../../tools/testfiles/h5repart_gentest/Release/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/h5repart_gentest/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/h5repart_gentest/Release/h5repart_gentest.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../../tools/testfiles/h5repart_gentest/Release/h5repart_gentest.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\..\src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/h5repart_gentest/Release/h5repart_gentest.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/h5repart_gentest/Release/"

-				ObjectFile=".\../../../../tools/testfiles/h5repart_gentest/Release/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/h5repart_gentest/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/h5repart_gentest/Release/h5repart_gentest.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\..\..\tools\misc\h5repart_gentest.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/testfiles/h5reparttst/h5reparttst.vcproj b/windows/tools/testfiles/h5reparttst/h5reparttst.vcproj
deleted file mode 100644
index a01dac7..0000000
--- a/windows/tools/testfiles/h5reparttst/h5reparttst.vcproj
+++ /dev/null
@@ -1,394 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="h5reparttst"

-	ProjectGUID="{53022A9D-F5B2-407C-9A29-3AC71B3E6DDC}"

-	RootNamespace="h5reparttst"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../tools/testfiles/h5reparttst/Debug/h5reparttst.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/h5reparttst/Debug/h5reparttst.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/h5reparttst/Debug/"

-				ObjectFile=".\../../../../tools/testfiles/h5reparttst/Debug/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/h5reparttst/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/h5reparttst/Debug/h5reparttst.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory=".\../../../../tools/testfiles/h5reparttst/Debug"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../../tools/testfiles/h5reparttst/Debug/h5reparttst.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/h5reparttst/Debug/h5reparttst.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/h5reparttst/Debug/"

-				ObjectFile=".\../../../../tools/testfiles/h5reparttst/Debug/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/h5reparttst/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/h5reparttst/Debug/h5reparttst.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\../../../../tools/testfiles/h5reparttst/Release"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../tools/testfiles/h5reparttst/Release/h5reparttst.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\..\src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/h5reparttst/Release/h5reparttst.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/h5reparttst/Release/"

-				ObjectFile=".\../../../../tools/testfiles/h5reparttst/Release/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/h5reparttst/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/h5reparttst/Release/h5reparttst.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory=".\../../../../tools/testfiles/h5reparttst/Release"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../../tools/testfiles/h5reparttst/Release/h5reparttst.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\..\src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/h5reparttst/Release/h5reparttst.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/h5reparttst/Release/"

-				ObjectFile=".\../../../../tools/testfiles/h5reparttst/Release/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/h5reparttst/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/h5reparttst/Release/h5reparttst.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\..\..\tools\misc\repart_test.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.vcproj b/windows/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.vcproj
deleted file mode 100644
index dc6c4ba..0000000
--- a/windows/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.vcproj
+++ /dev/null
@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="testh5repack_detect_szip"

-	ProjectGUID="{5EA5BDAD-3AE9-4BCA-AC1A-93B3B8499C30}"

-	RootNamespace="testh5repack_detect_szip"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../tools/testfiles/testh5repack_detect_szip/Release/testh5repack_detect_szip.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\test,..\..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/testh5repack_detect_szip/Release/testh5repack_detect_szip.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/testh5repack_detect_szip/Release/"

-				ObjectFile=".\../../../../tools/testfiles/testh5repack_detect_szip/Release/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/testh5repack_detect_szip/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/testh5repack_detect_szip/Release/testh5repack_detect_szip.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../../tools/testfiles/testh5repack_detect_szip/Release/testh5repack_detect_szip.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\test,..\..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/testh5repack_detect_szip/Release/testh5repack_detect_szip.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/testh5repack_detect_szip/Release/"

-				ObjectFile=".\../../../../tools/testfiles/testh5repack_detect_szip/Release/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/testh5repack_detect_szip/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/testh5repack_detect_szip/Release/testh5repack_detect_szip.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../tools/testfiles/testh5repack_detect_szip/Debug/testh5repack_detect_szip.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\test,..\..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/testh5repack_detect_szip/Debug/testh5repack_detect_szip.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/testh5repack_detect_szip/Debug/"

-				ObjectFile=".\../../../../tools/testfiles/testh5repack_detect_szip/Debug/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/testh5repack_detect_szip/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/testh5repack_detect_szip/Debug/testh5repack_detect_szip.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../../tools/testfiles/testh5repack_detect_szip/Debug/testh5repack_detect_szip.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\test,..\..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/testh5repack_detect_szip/Debug/testh5repack_detect_szip.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/testh5repack_detect_szip/Debug/"

-				ObjectFile=".\../../../../tools/testfiles/testh5repack_detect_szip/Debug/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/testh5repack_detect_szip/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/testh5repack_detect_szip/Debug/testh5repack_detect_szip.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\..\..\tools\h5repack\testh5repack_detect_szip.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.vcproj b/windows/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.vcproj
deleted file mode 100644
index 00c0808..0000000
--- a/windows/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.vcproj
+++ /dev/null
@@ -1,390 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="testh5repack_detect_szipdll"

-	ProjectGUID="{E75602FF-F4E6-4F45-AD0D-EA49C0C66DEF}"

-	RootNamespace="testh5repack_detect_szipdll"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Release/testh5repack_detect_szipdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\test,..\..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Release/testh5repack_detect_szipdll.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Release/"

-				ObjectFile=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Release/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Release/testh5repack_detect_szipdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Release/testh5repack_detect_szipdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\test,..\..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Release/testh5repack_detect_szipdll.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Release/"

-				ObjectFile=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Release/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Release/testh5repack_detect_szipdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Debug/testh5repack_detect_szipdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\test,..\..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Debug/testh5repack_detect_szipdll.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Debug/"

-				ObjectFile=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Debug/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Debug/testh5repack_detect_szipdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Debug/testh5repack_detect_szipdll.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\test,..\..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Debug/testh5repack_detect_szipdll.pch"

-				AssemblerListingLocation=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Debug/"

-				ObjectFile=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Debug/"

-				ProgramDataBaseFileName=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Debug/testh5repack_detect_szipdll.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\..\..\tools\h5repack\testh5repack_detect_szip.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/toolslib/toolslib.vcproj b/windows/tools/toolslib/toolslib.vcproj
deleted file mode 100644
index e459fbe..0000000
--- a/windows/tools/toolslib/toolslib.vcproj
+++ /dev/null
@@ -1,399 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="toolslib"

-	ProjectGUID="{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_WINDOWS"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\tools\toolslib\Debug/toolslib.pch"

-				AssemblerListingLocation=".\..\..\..\tools\toolslib\Debug/"

-				ObjectFile=".\..\..\..\tools\toolslib\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\tools\toolslib\Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)\$(ProjectName)d.lib"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_WINDOWS"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\tools\toolslib\Debug/toolslib.pch"

-				AssemblerListingLocation=".\..\..\..\tools\toolslib\Debug/"

-				ObjectFile=".\..\..\..\tools\toolslib\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\tools\toolslib\Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)\$(ProjectName)d.lib"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_WINDOWS"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\tools\toolslib\Release/toolslib.pch"

-				AssemblerListingLocation=".\..\..\..\tools\toolslib\Release/"

-				ObjectFile=".\..\..\..\tools\toolslib\Release/"

-				ProgramDataBaseFileName=".\..\..\..\tools\toolslib\Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)\$(ProjectName).lib"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_WINDOWS"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\tools\toolslib\Release/toolslib.pch"

-				AssemblerListingLocation=".\..\..\..\tools\toolslib\Release/"

-				ObjectFile=".\..\..\..\tools\toolslib\Release/"

-				ProgramDataBaseFileName=".\..\..\..\tools\toolslib\Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)\$(ProjectName).lib"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="source"

-			Filter="*.c"

-			>

-			<File

-				RelativePath="..\..\..\tools\lib\h5diff.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5diff_array.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5diff_attr.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5diff_dset.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5diff_util.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5tools.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5tools_filters.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5tools_ref.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5tools_str.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5tools_type.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5tools_utils.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5trav.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="headers"

-			Filter="*.h"

-			>

-			<File

-				RelativePath="..\..\..\tools\lib\h5diff.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5tools.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5tools_ref.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5tools_str.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5tools_utils.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5trav.h"

-				>

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/tools/toolslibdll/toolslibdll.vcproj b/windows/tools/toolslibdll/toolslibdll.vcproj
deleted file mode 100644
index 0d163ab..0000000
--- a/windows/tools/toolslibdll/toolslibdll.vcproj
+++ /dev/null
@@ -1,398 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="toolslibdll"

-	ProjectGUID="{832DD776-BC7F-40B5-90D0-E6448014CA5B}"

-	RootNamespace="toolslibdll"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\tools\toolslibdll\Debug/toolslibdll.pch"

-				AssemblerListingLocation=".\..\..\..\tools\toolslibdll\Debug/"

-				ObjectFile=".\..\..\..\tools\toolslibdll\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\tools\toolslibdll\Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)\toolslibddll.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\tools\toolslibdll\Debug/toolslibdll.pch"

-				AssemblerListingLocation=".\..\..\..\tools\toolslibdll\Debug/"

-				ObjectFile=".\..\..\..\tools\toolslibdll\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\tools\toolslibdll\Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)\toolslibddll.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_WINDOWS;_HDF5USEDLL_"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\tools\toolslibdll\Release/toolslibdll.pch"

-				AssemblerListingLocation=".\..\..\..\tools\toolslibdll\Release/"

-				ObjectFile=".\..\..\..\tools\toolslibdll\Release/"

-				ProgramDataBaseFileName=".\..\..\..\tools\toolslibdll\Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)\toolslibdll.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_WINDOWS;_HDF5USEDLL_"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\tools\toolslibdll\Release/toolslibdll.pch"

-				AssemblerListingLocation=".\..\..\..\tools\toolslibdll\Release/"

-				ObjectFile=".\..\..\..\tools\toolslibdll\Release/"

-				ProgramDataBaseFileName=".\..\..\..\tools\toolslibdll\Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)\toolslibdll.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="source"

-			Filter="*.c"

-			>

-			<File

-				RelativePath="..\..\..\tools\lib\h5diff.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5diff_array.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5diff_attr.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5diff_dset.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5diff_util.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5tools.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5tools_filters.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5tools_ref.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5tools_str.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5tools_type.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5tools_utils.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5trav.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="headers"

-			Filter="*.h"

-			>

-			<File

-				RelativePath="..\..\..\tools\lib\h5diff.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5tools.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5tools_ref.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5tools_str.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5tools_utils.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\tools\lib\h5trav.h"

-				>

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>