summaryrefslogtreecommitdiffstats
path: root/windows_vnet
diff options
context:
space:
mode:
authorScott Wegner <swegner@hdfgroup.org>2008-09-03 15:09:10 (GMT)
committerScott Wegner <swegner@hdfgroup.org>2008-09-03 15:09:10 (GMT)
commit779b0a7dfb59a8cf2f3ca39bc41360f04ef9e480 (patch)
tree6fedad5ea726a6b4f173259d4ea52fda8d8642f2 /windows_vnet
parente9256348abe0a50523118392f45feb52f1d6013d (diff)
downloadhdf5-779b0a7dfb59a8cf2f3ca39bc41360f04ef9e480.zip
hdf5-779b0a7dfb59a8cf2f3ca39bc41360f04ef9e480.tar.gz
hdf5-779b0a7dfb59a8cf2f3ca39bc41360f04ef9e480.tar.bz2
[svn-r15584] Purpose: Add new extensible array source code and test project for Windows
Description: In revision 15549, new source code was added for the extensible array interface. This checkin adds the source code to Windows, along with the new test project, earray. Note: The new H5EA interface causes compilation errors on Windows, and will need to be fixed in the source.
Diffstat (limited to 'windows_vnet')
-rw-r--r--windows_vnet/proj/all/all.sln32
-rw-r--r--windows_vnet/proj/hdf5/hdf5.vcproj21
-rw-r--r--windows_vnet/proj/hdf5dll/hdf5dll.vcproj21
-rw-r--r--windows_vnet/test/earray/earray.vcproj136
-rw-r--r--windows_vnet/test/earraydll/earraydll.vcproj136
5 files changed, 346 insertions, 0 deletions
diff --git a/windows_vnet/proj/all/all.sln b/windows_vnet/proj/all/all.sln
index c1f96c7..52e5736 100644
--- a/windows_vnet/proj/all/all.sln
+++ b/windows_vnet/proj/all/all.sln
@@ -51,6 +51,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "all", "all.vcproj", "{BF2DE
{1DBF8E60-A92A-4DAE-9E55-94A167C9C673} = {1DBF8E60-A92A-4DAE-9E55-94A167C9C673}
{C858A861-3751-40F4-9078-C345FFE7E06F} = {C858A861-3751-40F4-9078-C345FFE7E06F}
{2A17BE61-F7D3-4661-8E18-03FC32C6D69A} = {2A17BE61-F7D3-4661-8E18-03FC32C6D69A}
+ {A998D763-D74D-41F3-8D82-A30529EB5E9C} = {A998D763-D74D-41F3-8D82-A30529EB5E9C}
{9CF8F063-D3D3-47D1-A405-096C618C595F} = {9CF8F063-D3D3-47D1-A405-096C618C595F}
{652D4166-51D6-4AD5-B552-2DE9D0D4696D} = {652D4166-51D6-4AD5-B552-2DE9D0D4696D}
{99251C69-C5DD-4886-85F3-A33ACE4CDB94} = {99251C69-C5DD-4886-85F3-A33ACE4CDB94}
@@ -104,6 +105,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "all", "all.vcproj", "{BF2DE
{3FBF2FAE-6316-4CEE-99D2-2EEEC6E48792} = {3FBF2FAE-6316-4CEE-99D2-2EEEC6E48792}
{F8AB92B1-77D4-49FA-AB4D-816511BBBF57} = {F8AB92B1-77D4-49FA-AB4D-816511BBBF57}
{79318EB2-5E32-4B97-9C97-7F8522CCFAFD} = {79318EB2-5E32-4B97-9C97-7F8522CCFAFD}
+ {8E3298B2-DAA9-427D-9508-792DC9D8A320} = {8E3298B2-DAA9-427D-9508-792DC9D8A320}
{ACD3E3B3-6C24-4BB0-A49A-B5FCE3F493CF} = {ACD3E3B3-6C24-4BB0-A49A-B5FCE3F493CF}
{01E307B5-C861-467E-85FE-7B86611B720C} = {01E307B5-C861-467E-85FE-7B86611B720C}
{50D621B7-BC01-497D-8A49-1301D13C5700} = {50D621B7-BC01-497D-8A49-1301D13C5700}
@@ -121,7 +123,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "all", "all.vcproj", "{BF2DE
{232F93C6-1E7B-4484-A451-47DB4CB7BE73} = {232F93C6-1E7B-4484-A451-47DB4CB7BE73}
{EDC9E0C6-8E66-45F4-BACA-709B185BEF70} = {EDC9E0C6-8E66-45F4-BACA-709B185BEF70}
{EDAE78C7-8D3F-49F2-85B8-F965EF843A67} = {EDAE78C7-8D3F-49F2-85B8-F965EF843A67}
+ {F99F5FC8-29C2-407E-BC74-AB2623686017} = {F99F5FC8-29C2-407E-BC74-AB2623686017}
{1A754BC9-BFB4-49F1-8142-D66754C783D0} = {1A754BC9-BFB4-49F1-8142-D66754C783D0}
+ {4E8449CA-3833-49AA-B12E-7A59BA6A2D14} = {4E8449CA-3833-49AA-B12E-7A59BA6A2D14}
{20276CCF-2478-4FAA-98A9-A485038E00F6} = {20276CCF-2478-4FAA-98A9-A485038E00F6}
{87670DD1-8236-4A2B-8A7D-3508E2726E43} = {87670DD1-8236-4A2B-8A7D-3508E2726E43}
{847B1CD1-1D30-493B-88CC-AD93E76C9852} = {847B1CD1-1D30-493B-88CC-AD93E76C9852}
@@ -1071,6 +1075,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "app_refdll", "..\..\test\ap
{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "earray", "..\..\test\earray\earray.vcproj", "{A998D763-D74D-41F3-8D82-A30529EB5E9C}"
+ ProjectSection(ProjectDependencies) = postProject
+ {BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+ {76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "earraydll", "..\..\test\earraydll\earraydll.vcproj", "{8E3298B2-DAA9-427D-9508-792DC9D8A320}"
+ ProjectSection(ProjectDependencies) = postProject
+ {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+ {B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
AlphaDbg = AlphaDbg
@@ -2335,6 +2351,22 @@ Global
{49D70E88-6911-4A96-815F-83891D7A0080}.Debug.Build.0 = Debug|Win32
{49D70E88-6911-4A96-815F-83891D7A0080}.Release.ActiveCfg = Release|Win32
{49D70E88-6911-4A96-815F-83891D7A0080}.Release.Build.0 = Release|Win32
+ {A998D763-D74D-41F3-8D82-A30529EB5E9C}.AlphaDbg.ActiveCfg = Release|Win32
+ {A998D763-D74D-41F3-8D82-A30529EB5E9C}.AlphaDbg.Build.0 = Release|Win32
+ {A998D763-D74D-41F3-8D82-A30529EB5E9C}.AlphaRel.ActiveCfg = Release|Win32
+ {A998D763-D74D-41F3-8D82-A30529EB5E9C}.AlphaRel.Build.0 = Release|Win32
+ {A998D763-D74D-41F3-8D82-A30529EB5E9C}.Debug.ActiveCfg = Debug|Win32
+ {A998D763-D74D-41F3-8D82-A30529EB5E9C}.Debug.Build.0 = Debug|Win32
+ {A998D763-D74D-41F3-8D82-A30529EB5E9C}.Release.ActiveCfg = Release|Win32
+ {A998D763-D74D-41F3-8D82-A30529EB5E9C}.Release.Build.0 = Release|Win32
+ {8E3298B2-DAA9-427D-9508-792DC9D8A320}.AlphaDbg.ActiveCfg = Release|Win32
+ {8E3298B2-DAA9-427D-9508-792DC9D8A320}.AlphaDbg.Build.0 = Release|Win32
+ {8E3298B2-DAA9-427D-9508-792DC9D8A320}.AlphaRel.ActiveCfg = Release|Win32
+ {8E3298B2-DAA9-427D-9508-792DC9D8A320}.AlphaRel.Build.0 = Release|Win32
+ {8E3298B2-DAA9-427D-9508-792DC9D8A320}.Debug.ActiveCfg = Debug|Win32
+ {8E3298B2-DAA9-427D-9508-792DC9D8A320}.Debug.Build.0 = Debug|Win32
+ {8E3298B2-DAA9-427D-9508-792DC9D8A320}.Release.ActiveCfg = Release|Win32
+ {8E3298B2-DAA9-427D-9508-792DC9D8A320}.Release.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
diff --git a/windows_vnet/proj/hdf5/hdf5.vcproj b/windows_vnet/proj/hdf5/hdf5.vcproj
index e86ef9e..0ea43b7 100644
--- a/windows_vnet/proj/hdf5/hdf5.vcproj
+++ b/windows_vnet/proj/hdf5/hdf5.vcproj
@@ -1436,6 +1436,21 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\..\..\src\H5EA.c">
+ </File>
+ <File
+ RelativePath="..\..\..\src\H5EAcache.c">
+ </File>
+ <File
+ RelativePath="..\..\..\src\H5EAhdr.c">
+ </File>
+ <File
+ RelativePath="..\..\..\src\H5EAint.c">
+ </File>
+ <File
+ RelativePath="..\..\..\src\H5EAtest.c">
+ </File>
+ <File
RelativePath="..\..\..\src\H5Edeprec.c">
<FileConfiguration
Name="Debug|Win32">
@@ -7741,6 +7756,12 @@
RelativePath="..\..\..\src\H5Dpublic.h">
</File>
<File
+ RelativePath="..\..\..\src\H5EApkg.h">
+ </File>
+ <File
+ RelativePath="..\..\..\src\H5EAprivate.h">
+ </File>
+ <File
RelativePath="..\..\..\src\H5Epkg.h">
</File>
<File
diff --git a/windows_vnet/proj/hdf5dll/hdf5dll.vcproj b/windows_vnet/proj/hdf5dll/hdf5dll.vcproj
index 16ca5a6..3bd6c63 100644
--- a/windows_vnet/proj/hdf5dll/hdf5dll.vcproj
+++ b/windows_vnet/proj/hdf5dll/hdf5dll.vcproj
@@ -1491,6 +1491,21 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\..\..\src\H5EA.c">
+ </File>
+ <File
+ RelativePath="..\..\..\src\H5EAcache.c">
+ </File>
+ <File
+ RelativePath="..\..\..\src\H5EAhdr.c">
+ </File>
+ <File
+ RelativePath="..\..\..\src\H5EAint.c">
+ </File>
+ <File
+ RelativePath="..\..\..\src\H5EAtest.c">
+ </File>
+ <File
RelativePath="..\..\..\src\H5Edeprec.c">
<FileConfiguration
Name="Debug|Win32">
@@ -7757,6 +7772,12 @@
<File
RelativePath="..\..\..\src\H5ACprivate.h">
</File>
+ <File
+ RelativePath="..\..\..\src\H5EApkg.h">
+ </File>
+ <File
+ RelativePath="..\..\..\src\H5EAprivate.h">
+ </File>
</Filter>
<File
RelativePath="..\..\..\src\H5ACpublic.h">
diff --git a/windows_vnet/test/earray/earray.vcproj b/windows_vnet/test/earray/earray.vcproj
new file mode 100644
index 0000000..068fe00
--- /dev/null
+++ b/windows_vnet/test/earray/earray.vcproj
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="earray"
+ ProjectGUID="{A998D763-D74D-41F3-8D82-A30529EB5E9C}"
+ Keyword="Win32Proj">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory=".\../../../test/earray/Debug"
+ IntermediateDirectory=".\../../../test/earray/Debug"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="TRUE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="5"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="WS2_32.lib"
+ OutputFile="$(OutDir)/earray.exe"
+ LinkIncremental="2"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/earray.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\../../../test/earray/Release"
+ IntermediateDirectory=".\../../../test/earray/Release"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\..\src"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="4"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="WS2_32.lib"
+ OutputFile="$(OutDir)/earray.exe"
+ LinkIncremental="1"
+ GenerateDebugInformation="TRUE"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ <File
+ RelativePath="..\..\..\test\earray.c">
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/windows_vnet/test/earraydll/earraydll.vcproj b/windows_vnet/test/earraydll/earraydll.vcproj
new file mode 100644
index 0000000..31c49a1
--- /dev/null
+++ b/windows_vnet/test/earraydll/earraydll.vcproj
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="earraydll"
+ ProjectGUID="{8E3298B2-DAA9-427D-9508-792DC9D8A320}"
+ Keyword="Win32Proj">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory=".\../../../test/earraydll/Debug"
+ IntermediateDirectory=".\../../../test/earraydll/Debug"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5TESTUSEDLL_"
+ MinimalRebuild="TRUE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="WS2_32.lib"
+ OutputFile="$(OutDir)/earraydll.exe"
+ LinkIncremental="2"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/earraydll.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\../../../test/earraydll/Release"
+ IntermediateDirectory=".\../../../test/earraydll/Release"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\..\src"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5TESTUSEDLL_"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="WS2_32.lib"
+ OutputFile="$(OutDir)/earraydll.exe"
+ LinkIncremental="1"
+ GenerateDebugInformation="TRUE"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ <File
+ RelativePath="..\..\..\test\earray.c">
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>