From e039e5125c8a741570ce55ba7f9089e02362591a Mon Sep 17 00:00:00 2001 From: Scott Wegner Date: Fri, 10 Aug 2007 10:19:56 -0500 Subject: [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 --- MANIFEST | 10 +- release_docs/INSTALL_Windows.txt | 11 +- .../H5fortran_detect_gen/H5fortran_detect_gen.sln | 23 --- .../H5fortran_detect_gen.vfproj | 29 ---- .../misc/fortrantypegen/H5fortran_detect.vfproj | 29 ---- windows/misc/fortrantypegen/fortrantypegen.sln | 23 --- windows/misc/matchtypegen/H5match_types.vcproj | 169 -------------------- windows/misc/matchtypegen/matchtypegen.sln | 23 --- .../h5fort_type_defines/h5fort_type_defines.vfproj | 29 ++++ .../h5fortran_detect/h5fortran_detect.vfproj | 29 ++++ .../typegen/h5match_types/h5match_types.vcproj | 175 +++++++++++++++++++++ windows/misc/typegen/h5tinit/h5tinit.vcproj | 11 +- windows/misc/typegen/typegen_fortran.sln | 49 ++++++ 13 files changed, 297 insertions(+), 313 deletions(-) delete mode 100644 windows/misc/H5fortran_detect_gen/H5fortran_detect_gen.sln delete mode 100644 windows/misc/H5fortran_detect_gen/H5fortran_detect_gen.vfproj delete mode 100644 windows/misc/fortrantypegen/H5fortran_detect.vfproj delete mode 100644 windows/misc/fortrantypegen/fortrantypegen.sln delete mode 100644 windows/misc/matchtypegen/H5match_types.vcproj delete mode 100644 windows/misc/matchtypegen/matchtypegen.sln create mode 100644 windows/misc/typegen/h5fort_type_defines/h5fort_type_defines.vfproj create mode 100644 windows/misc/typegen/h5fortran_detect/h5fortran_detect.vfproj create mode 100644 windows/misc/typegen/h5match_types/h5match_types.vcproj create mode 100644 windows/misc/typegen/typegen_fortran.sln 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/H5match_types.vcproj b/windows/misc/matchtypegen/H5match_types.vcproj deleted file mode 100644 index 01db658..0000000 --- a/windows/misc/matchtypegen/H5match_types.vcproj +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windows/misc/typegen/h5match_types/h5match_types.vcproj b/windows/misc/typegen/h5match_types/h5match_types.vcproj new file mode 100644 index 0000000..1654047 --- /dev/null +++ b/windows/misc/typegen/h5match_types/h5match_types.vcproj @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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=""> @@ -37,7 +38,7 @@ Name="VCCustomBuildTool"/> + Name="VCPostBuildEventTool" + Description="Generating H5tinit.c" + CommandLine="$(TargetPath) >$(TargetDir)H5tinit.c"/> + Name="VCPostBuildEventTool" + Description="Generating H5tinit.c" + CommandLine="$(TargetPath) >$(TargetDir)H5tinit.c"/>