[svn-r14066] Purpose: Streamline Windows typegen projects

Description:
Previously the process of generating h5tinit.c, as well as the Fortran type files, was very manual on Windows.  For Fortran, the process included opening 4 different solutions, and running 4 different commands from the prompt.  I've made things very much more automated, and now only requires only building one project for either C or C/Fortran.  Running the commands to generate the file is done automatically.

Tested: VS.NET

12 files changed, 134 insertions, 150 deletions

diff --git a/MANIFEST b/MANIFEST
index 48cd676..a3aa31d 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1806,13 +1806,11 @@
 ./windows/hl/tools/gifconvdll/h52gifdll.vcproj
 
 # Misc. Projects
-./windows/misc/fortrantypegen/fortrantypegen.sln
-./windows/misc/fortrantypegen/H5fortran_detect.vfproj
-./windows/misc/H5fortran_detect_gen/H5fortran_detect_gen.sln
-./windows/misc/H5fortran_detect_gen/H5fortran_detect_gen.vfproj
-./windows/misc/matchtypegen/H5match_types.vcproj
-./windows/misc/matchtypegen/matchtypegen.sln
 ./windows/misc/typegen/typegen.sln
+./windows/misc/typegen/typegen_fortran.sln
+./windows/misc/typegen/h5fort_type_defines/h5fort_type_defines.vfproj
+./windows/misc/typegen/h5fortran_detect/h5fortran_detect.vfproj
+./windows/misc/typegen/h5match_types/h5match_types.vcproj
 ./windows/misc/typegen/h5tinit/h5tinit.vcproj
 
 # Project Files
diff --git a/release_docs/INSTALL_Windows.txt b/release_docs/INSTALL_Windows.txt
index 84eec13..0759ce4 100644
--- a/release_docs/INSTALL_Windows.txt
+++ b/release_docs/INSTALL_Windows.txt
@@ -1916,16 +1916,11 @@ To generate your own H5tinit.c, follow the steps below.
         
     1. Open the solution typegen.sln from the folder .\windows\misc\typgen.
         
-    2. Build H5tinit.exe
+    2. Build H5tinit.exe and create H5tinit.c
     
         Make sure your configuration is set to Debug, and build the project.  
-        This will generate H5tinit.exe in the .\src folder.
-        
-    3. Create H5tinit.c
-    
-        From a command prompt, go to the .\src directory and issue the command:
-            .\H5tinit.exe > H5tinit.c
-        This will generate our H5tinit.c file.
+        This will generate H5tinit.exe in the .\src folder.  The build process
+        will also run this program to generate H5tinit.c automatically.
         
 
 Note:
diff --git a/windows/misc/H5fortran_detect_gen/H5fortran_detect_gen.sln b/windows/misc/H5fortran_detect_gen/H5fortran_detect_gen.sln
deleted file mode 100644
index 2ef0e4c..0000000
--- a/windows/misc/H5fortran_detect_gen/H5fortran_detect_gen.sln
+++ /dev/null
@@ -1,23 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00

-Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "H5fortran_detect_gen", "H5fortran_detect_gen.vfproj", "{4505FF13-2C16-4348-8989-BB10AF85FB95}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Global

-	GlobalSection(SolutionConfiguration) = preSolution

-		Debug = Debug

-		Release = Release

-	EndGlobalSection

-	GlobalSection(ProjectDependencies) = postSolution

-	EndGlobalSection

-	GlobalSection(ProjectConfiguration) = postSolution

-		{4505FF13-2C16-4348-8989-BB10AF85FB95}.Debug.ActiveCfg = Debug|Win32

-		{4505FF13-2C16-4348-8989-BB10AF85FB95}.Debug.Build.0 = Debug|Win32

-		{4505FF13-2C16-4348-8989-BB10AF85FB95}.Release.ActiveCfg = Release|Win32

-		{4505FF13-2C16-4348-8989-BB10AF85FB95}.Release.Build.0 = Release|Win32

-	EndGlobalSection

-	GlobalSection(ExtensibilityGlobals) = postSolution

-	EndGlobalSection

-	GlobalSection(ExtensibilityAddIns) = postSolution

-	EndGlobalSection

-EndGlobal

diff --git a/windows/misc/H5fortran_detect_gen/H5fortran_detect_gen.vfproj b/windows/misc/H5fortran_detect_gen/H5fortran_detect_gen.vfproj
deleted file mode 100644
index a477a23..0000000
--- a/windows/misc/H5fortran_detect_gen/H5fortran_detect_gen.vfproj
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application - Converted from CVF" Version="9.10" ProjectIdGuid="{4505FF13-2C16-4348-8989-BB10AF85FB95}">

-	<Platforms>

-		<Platform Name="Win32"/></Platforms>

-	<Configurations>

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

-				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/H5fortran_detect_gen.tlb"/>

-				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" CompileOnly="true"/>

-				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OUTDIR)/H5fortran_detect_gen.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/H5fortran_detect_gen.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

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

-		<Configuration Name="Debug|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true" Command="c:\hdf\hdf5-18\vnet\dep_vs6\fortran\src\H5fortran_detect_gen.exe">

-				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/H5fortran_detect_gen.tlb"/>

-				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtSingleThreadedDebug" CompileOnly="true"/>

-				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="../../../fortran/src/H5fortran_detect_gen.exe" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/H5fortran_detect_gen.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

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

-	<Files>

-		<Filter Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

-		<File RelativePath="..\..\..\fortran\src\H5test_kind.f90"/></Filter>

-		<Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;fi;fd"/>

-		<Filter Name="Resource Files" Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/></Files>

-	<Globals/></VisualStudioProject>

diff --git a/windows/misc/fortrantypegen/H5fortran_detect.vfproj b/windows/misc/fortrantypegen/H5fortran_detect.vfproj
deleted file mode 100644
index 51c1517..0000000
--- a/windows/misc/fortrantypegen/H5fortran_detect.vfproj
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application - Converted from CVF" Version="9.10" ProjectIdGuid="{4D3CE514-F22D-4FBC-82FF-7A3BE15DAE10}">

-	<Platforms>

-		<Platform Name="Win32"/></Platforms>

-	<Configurations>

-		<Configuration Name="Debug|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true" Command="c:\hdf\hdf5-18\vnet\dep_vs6\fortran\src\H5fortran_detect.exe">

-				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/H5fortran_detect.tlb"/>

-				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtSingleThreadedDebug" CompileOnly="true"/>

-				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="../../../fortran/src/H5fortran_detect.exe" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/H5fortran_detect.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

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

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

-				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/H5fortran_detect.tlb"/>

-				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" CompileOnly="true"/>

-				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OUTDIR)/H5fortran_detect.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/H5fortran_detect.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

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

-	<Files>

-		<Filter Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

-		<File RelativePath="..\..\..\fortran\src\H5fortran_detect.f90"/></Filter>

-		<Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;fi;fd"/>

-		<Filter Name="Resource Files" Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/></Files>

-	<Globals/></VisualStudioProject>

diff --git a/windows/misc/fortrantypegen/fortrantypegen.sln b/windows/misc/fortrantypegen/fortrantypegen.sln
deleted file mode 100644
index 87d0368..0000000
--- a/windows/misc/fortrantypegen/fortrantypegen.sln
+++ /dev/null
@@ -1,23 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00

-Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "H5fortran_detect", "H5fortran_detect.vfproj", "{4D3CE514-F22D-4FBC-82FF-7A3BE15DAE10}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Global

-	GlobalSection(SolutionConfiguration) = preSolution

-		Debug = Debug

-		Release = Release

-	EndGlobalSection

-	GlobalSection(ProjectDependencies) = postSolution

-	EndGlobalSection

-	GlobalSection(ProjectConfiguration) = postSolution

-		{4D3CE514-F22D-4FBC-82FF-7A3BE15DAE10}.Debug.ActiveCfg = Debug|Win32

-		{4D3CE514-F22D-4FBC-82FF-7A3BE15DAE10}.Debug.Build.0 = Debug|Win32

-		{4D3CE514-F22D-4FBC-82FF-7A3BE15DAE10}.Release.ActiveCfg = Release|Win32

-		{4D3CE514-F22D-4FBC-82FF-7A3BE15DAE10}.Release.Build.0 = Release|Win32

-	EndGlobalSection

-	GlobalSection(ExtensibilityGlobals) = postSolution

-	EndGlobalSection

-	GlobalSection(ExtensibilityAddIns) = postSolution

-	EndGlobalSection

-EndGlobal

diff --git a/windows/misc/matchtypegen/matchtypegen.sln b/windows/misc/matchtypegen/matchtypegen.sln
deleted file mode 100644
index 3f60b72..0000000
--- a/windows/misc/matchtypegen/matchtypegen.sln
+++ /dev/null
@@ -1,23 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "H5match_types", "H5match_types.vcproj", "{188C8929-D747-45EC-9D71-AAA58C8C6FC1}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Global

-	GlobalSection(SolutionConfiguration) = preSolution

-		Debug = Debug

-		Release = Release

-	EndGlobalSection

-	GlobalSection(ProjectDependencies) = postSolution

-	EndGlobalSection

-	GlobalSection(ProjectConfiguration) = postSolution

-		{188C8929-D747-45EC-9D71-AAA58C8C6FC1}.Debug.ActiveCfg = Debug|Win32

-		{188C8929-D747-45EC-9D71-AAA58C8C6FC1}.Debug.Build.0 = Debug|Win32

-		{188C8929-D747-45EC-9D71-AAA58C8C6FC1}.Release.ActiveCfg = Release|Win32

-		{188C8929-D747-45EC-9D71-AAA58C8C6FC1}.Release.Build.0 = Release|Win32

-	EndGlobalSection

-	GlobalSection(ExtensibilityGlobals) = postSolution

-	EndGlobalSection

-	GlobalSection(ExtensibilityAddIns) = postSolution

-	EndGlobalSection

-EndGlobal

diff --git a/windows/misc/typegen/h5fort_type_defines/h5fort_type_defines.vfproj b/windows/misc/typegen/h5fort_type_defines/h5fort_type_defines.vfproj
new file mode 100644
index 0000000..baaa72b
--- /dev/null
+++ b/windows/misc/typegen/h5fort_type_defines/h5fort_type_defines.vfproj
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application - Converted from CVF" Version="9.10" ProjectIdGuid="{4D3CE514-F22D-4FBC-82FF-7A3BE15DAE10}">

+	<Platforms>

+		<Platform Name="Win32"/></Platforms>

+	<Configurations>

+		<Configuration Name="Debug|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

+				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/H5fortran_detect.tlb"/>

+				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtSingleThreadedDebug" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)H5fort_type_defines.h" Description="Generating H5fort_type_defines.h"/>

+				<Tool Name="VFCustomBuildTool"/>

+				<Tool Name="VFLinkerTool" OutputFile="../../../../fortran/src/H5fort_type_defines.exe" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/H5fortran_detect.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

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

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

+		<Configuration Name="Release|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

+				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/H5fortran_detect.tlb"/>

+				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)H5fort_type_defines.h" Description="Generating H5fort_type_defines.h"/>

+				<Tool Name="VFCustomBuildTool"/>

+				<Tool Name="VFLinkerTool" OutputFile="../../../../fortran/src/H5fort_type_defines.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/H5fortran_detect.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

+				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

+	<Files>

+		<Filter Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

+		<File RelativePath="..\..\..\..\fortran\src\H5fortran_detect.f90"/></Filter>

+		<Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;fi;fd"/>

+		<Filter Name="Resource Files" Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/></Files>

+	<Globals/></VisualStudioProject>

diff --git a/windows/misc/typegen/h5fortran_detect/h5fortran_detect.vfproj b/windows/misc/typegen/h5fortran_detect/h5fortran_detect.vfproj
new file mode 100644
index 0000000..a503de4
--- /dev/null
+++ b/windows/misc/typegen/h5fortran_detect/h5fortran_detect.vfproj
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application - Converted from CVF" Version="9.10" ProjectIdGuid="{4505FF13-2C16-4348-8989-BB10AF85FB95}">

+	<Platforms>

+		<Platform Name="Win32"/></Platforms>

+	<Configurations>

+		<Configuration Name="Release|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

+				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/h5fortran_detect.tlb"/>

+				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)H5fortran_detect.f90" Description="Generating H5fortran_detect.f90"/>

+				<Tool Name="VFCustomBuildTool"/>

+				<Tool Name="VFLinkerTool" OutputFile="../../../../fortran/src/h5fortran_detect.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/h5fortran_detect.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

+				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

+		<Configuration Name="Debug|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

+				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/h5fortran_detect.tlb"/>

+				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtSingleThreadedDebug" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)H5fortran_detect.f90" Description="Generating H5fortran_detect.f90"/>

+				<Tool Name="VFCustomBuildTool"/>

+				<Tool Name="VFLinkerTool" OutputFile="../../../../fortran/src/h5fortran_detect.exe" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/h5fortran_detect.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

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

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

+	<Files>

+		<Filter Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

+		<File RelativePath="..\..\..\..\fortran\src\H5test_kind.f90"/></Filter>

+		<Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;fi;fd"/>

+		<Filter Name="Resource Files" Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/></Files>

+	<Globals/></VisualStudioProject>

diff --git a/windows/misc/matchtypegen/H5match_types.vcproj b/windows/misc/typegen/h5match_types/h5match_types.vcproj
index 01db658..1654047 100644
--- a/windows/misc/matchtypegen/H5match_types.vcproj
+++ b/windows/misc/typegen/h5match_types/h5match_types.vcproj
@@ -3,6 +3,7 @@
 	ProjectType="Visual C++"

 	Version="7.10"

 	Name="H5match_types"

+	ProjectGUID="{B6430FB3-3BEF-48C3-84DD-98106C6F6113}"

 	SccProjectName=""

 	SccLocalPath="">

 	<Platforms>

@@ -21,7 +22,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../../fortran/src,../../../src"

+				AdditionalIncludeDirectories="../../../../fortran/src,../../../../src"

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="5"

@@ -38,7 +39,7 @@
 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile="../../../fortran/src/H5match_types.exe"

+				OutputFile="../../../../fortran/src/H5match_types.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

 				GenerateDebugInformation="TRUE"

@@ -50,7 +51,9 @@
 				TypeLibraryName=".\Debug/H5match_types.tlb"

 				HeaderFileName=""/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPostBuildEventTool"

+				Description="Generating H5f90i_gen.h and H5fortran_types.f90"

+				CommandLine="$(TargetPath)"/>

 			<Tool

 				Name="VCPreBuildEventTool"/>

 			<Tool

@@ -82,6 +85,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="../../../../fortran/src,../../../../src"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

 				StringPooling="TRUE"

 				RuntimeLibrary="4"

@@ -97,7 +101,7 @@
 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile=".\Release/H5match_types.exe"

+				OutputFile="../../../../fortran/src/H5match_types.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

 				ProgramDatabaseFile=".\Release/H5match_types.pdb"

@@ -108,7 +112,9 @@
 				TypeLibraryName=".\Release/H5match_types.tlb"

 				HeaderFileName=""/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPostBuildEventTool"

+				Description="Generating H5f90i_gen.h and H5fortran_types.f90"

+				CommandLine="$(TargetPath)"/>

 			<Tool

 				Name="VCPreBuildEventTool"/>

 			<Tool

@@ -136,7 +142,7 @@
 			Name="Source Files"

 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

 			<File

-				RelativePath="..\..\..\fortran\src\H5match_types.c">

+				RelativePath="..\..\..\..\fortran\src\H5match_types.c">

 				<FileConfiguration

 					Name="Debug|Win32">

 					<Tool

diff --git a/windows/misc/typegen/h5tinit/h5tinit.vcproj b/windows/misc/typegen/h5tinit/h5tinit.vcproj
index ca4667f..de23561 100644
--- a/windows/misc/typegen/h5tinit/h5tinit.vcproj
+++ b/windows/misc/typegen/h5tinit/h5tinit.vcproj
@@ -3,6 +3,7 @@
 	ProjectType="Visual C++"

 	Version="7.10"

 	Name="h5tinit"

+	RootNamespace="h5tinit"

 	SccProjectName=""

 	SccLocalPath="">

 	<Platforms>

@@ -37,7 +38,7 @@
 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile=".\Release/h5tinit.exe"

+				OutputFile="../../../../src/h5tinit.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

 				ProgramDatabaseFile=".\Release/h5tinit.pdb"

@@ -48,7 +49,9 @@
 				TypeLibraryName=".\Release/h5tinit.tlb"

 				HeaderFileName=""/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPostBuildEventTool"

+				Description="Generating H5tinit.c"

+				CommandLine="$(TargetPath) &gt;$(TargetDir)H5tinit.c"/>

 			<Tool

 				Name="VCPreBuildEventTool"/>

 			<Tool

@@ -107,7 +110,9 @@
 				TypeLibraryName=".\Debug/h5tinit.tlb"

 				HeaderFileName=""/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPostBuildEventTool"

+				Description="Generating H5tinit.c"

+				CommandLine="$(TargetPath) &gt;$(TargetDir)H5tinit.c"/>

 			<Tool

 				Name="VCPreBuildEventTool"/>

 			<Tool

diff --git a/windows/misc/typegen/typegen_fortran.sln b/windows/misc/typegen/typegen_fortran.sln
new file mode 100644
index 0000000..d1824e3
--- /dev/null
+++ b/windows/misc/typegen/typegen_fortran.sln
@@ -0,0 +1,49 @@
+Microsoft Visual Studio Solution File, Format Version 8.00

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5tinit", "h5tinit\h5tinit.vcproj", "{B123D196-2F43-4FEB-80B5-990F06DED319}"

+	ProjectSection(ProjectDependencies) = postProject

+	EndProjectSection

+EndProject

+Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "h5fortran_detect", "h5fortran_detect\h5fortran_detect.vfproj", "{4505FF13-2C16-4348-8989-BB10AF85FB95}"

+	ProjectSection(ProjectDependencies) = postProject

+	EndProjectSection

+EndProject

+Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "h5fort_type_defines", "h5fort_type_defines\h5fort_type_defines.vfproj", "{4D3CE514-F22D-4FBC-82FF-7A3BE15DAE10}"

+	ProjectSection(ProjectDependencies) = postProject

+		{4505FF13-2C16-4348-8989-BB10AF85FB95} = {4505FF13-2C16-4348-8989-BB10AF85FB95}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "H5match_types", "h5match_types\h5match_types.vcproj", "{B6430FB3-3BEF-48C3-84DD-98106C6F6113}"

+	ProjectSection(ProjectDependencies) = postProject

+		{4D3CE514-F22D-4FBC-82FF-7A3BE15DAE10} = {4D3CE514-F22D-4FBC-82FF-7A3BE15DAE10}

+	EndProjectSection

+EndProject

+Global

+	GlobalSection(SolutionConfiguration) = preSolution

+		Debug = Debug

+		Release = Release

+	EndGlobalSection

+	GlobalSection(ProjectDependencies) = postSolution

+	EndGlobalSection

+	GlobalSection(ProjectConfiguration) = postSolution

+		{B123D196-2F43-4FEB-80B5-990F06DED319}.Debug.ActiveCfg = Debug|Win32

+		{B123D196-2F43-4FEB-80B5-990F06DED319}.Debug.Build.0 = Debug|Win32

+		{B123D196-2F43-4FEB-80B5-990F06DED319}.Release.ActiveCfg = Release|Win32

+		{B123D196-2F43-4FEB-80B5-990F06DED319}.Release.Build.0 = Release|Win32

+		{4505FF13-2C16-4348-8989-BB10AF85FB95}.Debug.ActiveCfg = Debug|Win32

+		{4505FF13-2C16-4348-8989-BB10AF85FB95}.Debug.Build.0 = Debug|Win32

+		{4505FF13-2C16-4348-8989-BB10AF85FB95}.Release.ActiveCfg = Release|Win32

+		{4505FF13-2C16-4348-8989-BB10AF85FB95}.Release.Build.0 = Release|Win32

+		{4D3CE514-F22D-4FBC-82FF-7A3BE15DAE10}.Debug.ActiveCfg = Debug|Win32

+		{4D3CE514-F22D-4FBC-82FF-7A3BE15DAE10}.Debug.Build.0 = Debug|Win32

+		{4D3CE514-F22D-4FBC-82FF-7A3BE15DAE10}.Release.ActiveCfg = Release|Win32

+		{4D3CE514-F22D-4FBC-82FF-7A3BE15DAE10}.Release.Build.0 = Release|Win32

+		{B6430FB3-3BEF-48C3-84DD-98106C6F6113}.Debug.ActiveCfg = Debug|Win32

+		{B6430FB3-3BEF-48C3-84DD-98106C6F6113}.Debug.Build.0 = Debug|Win32

+		{B6430FB3-3BEF-48C3-84DD-98106C6F6113}.Release.ActiveCfg = Release|Win32

+		{B6430FB3-3BEF-48C3-84DD-98106C6F6113}.Release.Build.0 = Release|Win32

+	EndGlobalSection

+	GlobalSection(ExtensibilityGlobals) = postSolution

+	EndGlobalSection

+	GlobalSection(ExtensibilityAddIns) = postSolution

+	EndGlobalSection

+EndGlobal