sources from main repository

CppUnit/CppUnit_vs71.sln

@@ -11,17 +11,29 @@ EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		debug_shared = debug_shared
+		debug_static = debug_static
 		release_shared = release_shared
+		release_static = release_static
+	EndGlobalSection
+	GlobalSection(ProjectDependencies) = postSolution
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared.ActiveCfg = debug_shared|Win32
 		{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared.Build.0 = debug_shared|Win32
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static.ActiveCfg = debug_static|Win32
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static.Build.0 = debug_static|Win32
 		{138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared.ActiveCfg = release_shared|Win32
 		{138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared.Build.0 = release_shared|Win32
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static.ActiveCfg = release_static|Win32
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static.Build.0 = release_static|Win32
 		{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared.ActiveCfg = debug_shared|Win32
 		{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared.Build.0 = debug_shared|Win32
+		{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static.ActiveCfg = debug_static|Win32
+		{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static.Build.0 = debug_static|Win32
 		{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared.ActiveCfg = release_shared|Win32
 		{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared.Build.0 = release_shared|Win32
+		{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static.ActiveCfg = release_static|Win32
+		{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static.Build.0 = release_static|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection

CppUnit/CppUnit_vs71.vcproj

@@ -4,8 +4,6 @@
 	Version="7.10"
 	Name="CppUnit"
 	ProjectGUID="{138BB448-808A-4FE5-A66D-78D1F8770F59}"
-	SccProjectName="CppUnit"
-	SccLocalPath="."
 	Keyword="MFCProj">
 	<Platforms>
 		<Platform
@@ -157,6 +155,133 @@
 			<Tool
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
+		<Configuration
+			Name="debug_static|Win32"
+			OutputDirectory=".\obj\debug_static"
+			IntermediateDirectory=".\obj\debug_static"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="0"
+				EnableIntrinsicFunctions="FALSE"
+				AdditionalIncludeDirectories="include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC"
+				StringPooling="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/vc70.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"
+				ShowIncludes="FALSE"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\CppUnitmtd.lib"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\lib/CppUnit.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="3079"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="release_static|Win32"
+			OutputDirectory=".\obj\release_static"
+			IntermediateDirectory=".\obj\release_static"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="4"
+				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="TRUE"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="TRUE"
+				AdditionalIncludeDirectories="include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;CppUnit_EXPORTS"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="FALSE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/vc70.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\CppUnitmt.lib"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\lib/CppUnit.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="3079"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -178,6 +303,18 @@
 						Name="VCCLCompilerTool"
 						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="debug_static|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="release_static|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="src\TestCase.cpp">

CppUnit/CppUnit_vs80.sln

@@ -10,17 +10,27 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		debug_shared|Win32 = debug_shared|Win32
+		debug_static|Win32 = debug_static|Win32
 		release_shared|Win32 = release_shared|Win32
+		release_static|Win32 = release_static|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.Build.0 = debug_shared|Win32
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static|Win32.ActiveCfg = debug_static|Win32
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static|Win32.Build.0 = debug_static|Win32
 		{138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.ActiveCfg = release_shared|Win32
 		{138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.Build.0 = release_shared|Win32
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static|Win32.ActiveCfg = release_static|Win32
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static|Win32.Build.0 = release_static|Win32
 		{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|Win32.Build.0 = debug_shared|Win32
+		{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static|Win32.ActiveCfg = debug_static|Win32
+		{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static|Win32.Build.0 = debug_static|Win32
 		{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|Win32.ActiveCfg = release_shared|Win32
 		{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|Win32.Build.0 = release_shared|Win32
+		{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static|Win32.ActiveCfg = release_static|Win32
+		{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static|Win32.Build.0 = release_static|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

CppUnit/CppUnit_vs80.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="8,00"
 	Name="CppUnit"
 	ProjectGUID="{138BB448-808A-4FE5-A66D-78D1F8770F59}"
 	Keyword="MFCProj"
@@ -219,6 +219,179 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="debug_static|Win32"
+			OutputDirectory=".\obj\debug_static"
+			IntermediateDirectory=".\obj\debug_static"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="2"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\lib/CppUnit.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="0"
+				EnableIntrinsicFunctions="false"
+				AdditionalIncludeDirectories="include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE"
+				StringPooling="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/vc80.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="0"
+				ShowIncludes="false"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="3079"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\CppUnitmtd.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="release_static|Win32"
+			OutputDirectory=".\obj\release_static"
+			IntermediateDirectory=".\obj\release_static"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\lib/CppUnit.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="4"
+				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/vc70.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="3079"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\CppUnitmt.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -246,6 +419,22 @@
 						ObjectFile="$(IntDir)/$(InputName)1.obj"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="debug_static|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/$(InputName)1.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="release_static|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/$(InputName)1.obj"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="src\TestCase.cpp"

CppUnit/Makefile

@@ -1,7 +1,7 @@
 #
 # Makefile
 #
-# $Id: //poco/1.3/CppUnit/Makefile#1 $
+# $Id: //poco/Main/CppUnit/Makefile#10 $
 #
 # Makefile for Poco CppUnit
 #

CppUnit/WinTestRunner/WinTestRunner_vs71.vcproj

@@ -4,8 +4,6 @@
 	Version="7.10"
 	Name="WinTestRunner"
 	ProjectGUID="{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}"
-	SccProjectName="WinTestRunner"
-	SccLocalPath="."
 	Keyword="MFCProj">
 	<Platforms>
 		<Platform
@@ -159,6 +157,131 @@
 			<Tool
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
+		<Configuration
+			Name="debug_static|Win32"
+			OutputDirectory=".\obj\debug_static"
+			IntermediateDirectory=".\obj\debug_static"
+			ConfigurationType="4"
+			UseOfMFC="2"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="0"
+				EnableIntrinsicFunctions="FALSE"
+				AdditionalIncludeDirectories="include;..\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc70.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"
+				ShowIncludes="FALSE"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\WinTestRunnermtd.lib"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\lib\wintestrunner.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="3079"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="release_static|Win32"
+			OutputDirectory=".\obj\release_static"
+			IntermediateDirectory=".\obj\release_static"
+			ConfigurationType="4"
+			UseOfMFC="2"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="4"
+				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="TRUE"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="TRUE"
+				AdditionalIncludeDirectories="include;..\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="FALSE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)/vc70.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\WinTestRunnermt.lib"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\lib\wintestrunner.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="3079"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>

CppUnit/WinTestRunner/WinTestRunner_vs80.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="8,00"
 	Name="WinTestRunner"
 	ProjectGUID="{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}"
 	Keyword="MFCProj"
@@ -221,6 +221,177 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="debug_static|Win32"
+			OutputDirectory=".\obj\debug_static"
+			IntermediateDirectory=".\obj\debug_static"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="2"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\lib\wintestrunner.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="0"
+				EnableIntrinsicFunctions="false"
+				AdditionalIncludeDirectories="include;..\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc70.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="0"
+				ShowIncludes="false"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="3079"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\WinTestRunnermtd.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="release_static|Win32"
+			OutputDirectory=".\obj\release_static"
+			IntermediateDirectory=".\obj\release_static"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="2"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\lib\wintestrunner.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="4"
+				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="include;..\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)/vc70.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="3079"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\WinTestRunnermt.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>

CppUnit/WinTestRunner/include/WinTestRunner/WinTestRunner.h

@@ -1,7 +1,7 @@
 //
 // WinTestRunner.h
 //
-// $Id: //poco/1.3/CppUnit/WinTestRunner/include/WinTestRunner/WinTestRunner.h#1 $
+// $Id: //poco/Main/CppUnit/WinTestRunner/include/WinTestRunner/WinTestRunner.h#8 $
 //
 // Application shell for CppUnit's TestRunner dialog.
 //
@@ -11,11 +11,15 @@
 #define WinTestRunner_H_INCLUDED
 
 
+#if !defined(POCO_STATIC)
 #if defined(WinTestRunner_EXPORTS)
 #define WinTestRunner_API __declspec(dllexport)
 #else
 #define WinTestRunner_API __declspec(dllimport)
 #endif
+#else
+#define WinTestRunner_API
+#endif
 
 
 #include "CppUnit/CppUnit.h"

CppUnit/WinTestRunner/src/ActiveTest.cpp

@@ -1,7 +1,7 @@
 //
 // ActiveTest.cpp
 //
-// $Id: //poco/1.3/CppUnit/WinTestRunner/src/ActiveTest.cpp#1 $
+// $Id: //poco/Main/CppUnit/WinTestRunner/src/ActiveTest.cpp#7 $
 //
 
 

CppUnit/WinTestRunner/src/ActiveTest.h

@@ -1,7 +1,7 @@
 //
 // ActiveTest.h
 //
-// $Id: //poco/1.3/CppUnit/WinTestRunner/src/ActiveTest.h#1 $
+// $Id: //poco/Main/CppUnit/WinTestRunner/src/ActiveTest.h#8 $
 //
 
 

CppUnit/WinTestRunner/src/DLLMain.cpp

@@ -1,7 +1,7 @@
 //
 // DLLMain.cpp
 //
-// $Id: //poco/1.3/CppUnit/WinTestRunner/src/DLLMain.cpp#1 $
+// $Id: //poco/Main/CppUnit/WinTestRunner/src/DLLMain.cpp#5 $
 //
 
 

CppUnit/WinTestRunner/src/GUITestResult.cpp

@@ -1,7 +1,7 @@
 //
 // GUITestResult.cpp
 //
-// $Id: //poco/1.3/CppUnit/WinTestRunner/src/GUITestResult.cpp#1 $
+// $Id: //poco/Main/CppUnit/WinTestRunner/src/GUITestResult.cpp#6 $
 //
 
 

CppUnit/WinTestRunner/src/GUITestResult.h

@@ -1,7 +1,7 @@
 //
 // GUITestResult.h
 //
-// $Id: //poco/1.3/CppUnit/WinTestRunner/src/GUITestResult.h#1 $
+// $Id: //poco/Main/CppUnit/WinTestRunner/src/GUITestResult.h#7 $
 //
 
 

CppUnit/WinTestRunner/src/ProgressBar.cpp

@@ -1,7 +1,7 @@
 //
 // ProgressBar.cpp
 //
-// $Id: //poco/1.3/CppUnit/WinTestRunner/src/ProgressBar.cpp#1 $
+// $Id: //poco/Main/CppUnit/WinTestRunner/src/ProgressBar.cpp#6 $
 //
 
 

CppUnit/WinTestRunner/src/ProgressBar.h

@@ -1,7 +1,7 @@
 //
 // ProgressBar.h
 //
-// $Id: //poco/1.3/CppUnit/WinTestRunner/src/ProgressBar.h#1 $
+// $Id: //poco/Main/CppUnit/WinTestRunner/src/ProgressBar.h#7 $
 //
 
 

CppUnit/WinTestRunner/src/TestRunnerDlg.cpp

@@ -1,7 +1,7 @@
 //
 // TestRunnerDlg.cpp
 //
-// $Id: //poco/1.3/CppUnit/WinTestRunner/src/TestRunnerDlg.cpp#1 $
+// $Id: //poco/Main/CppUnit/WinTestRunner/src/TestRunnerDlg.cpp#6 $
 //
 
 

CppUnit/WinTestRunner/src/TestRunnerDlg.h

@@ -1,7 +1,7 @@
 //
 // TestRunnerDlg.h
 //
-// $Id: //poco/1.3/CppUnit/WinTestRunner/src/TestRunnerDlg.h#1 $
+// $Id: //poco/Main/CppUnit/WinTestRunner/src/TestRunnerDlg.h#7 $
 //
 
 

CppUnit/WinTestRunner/src/WinTestRunner.cpp

@@ -1,7 +1,7 @@
 //
 // WinTestRunner.cpp
 //
-// $Id: //poco/1.3/CppUnit/WinTestRunner/src/WinTestRunner.cpp#1 $
+// $Id: //poco/Main/CppUnit/WinTestRunner/src/WinTestRunner.cpp#6 $
 //
 
 

CppUnit/include/CppUnit/CppUnit.h

@@ -1,7 +1,7 @@
 //
 // CppUnit.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/CppUnit.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/CppUnit.h#9 $
 //
 
 

CppUnit/include/CppUnit/CppUnitException.h

@@ -1,7 +1,7 @@
 //
 // CppUnitException.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/CppUnitException.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/CppUnitException.h#8 $
 //
 
 

CppUnit/include/CppUnit/Guards.h

@@ -1,7 +1,7 @@
 //
 // Guards.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/Guards.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/Guards.h#5 $
 //
 
 

CppUnit/include/CppUnit/Orthodox.h

@@ -1,7 +1,7 @@
 //
 // Orthodox.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/Orthodox.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/Orthodox.h#7 $
 //
 
 

CppUnit/include/CppUnit/RepeatedTest.h

@@ -1,7 +1,7 @@
 //
 // RepeatedTest.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/RepeatedTest.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/RepeatedTest.h#7 $
 //
 
 

CppUnit/include/CppUnit/Test.h

@@ -1,7 +1,7 @@
 //
 // Test.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/Test.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/Test.h#7 $
 //
 
 

CppUnit/include/CppUnit/TestCaller.h

@@ -1,7 +1,7 @@
 //
 // TestCaller.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/TestCaller.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/TestCaller.h#8 $
 //
 
 

CppUnit/include/CppUnit/TestCase.h

@@ -1,7 +1,7 @@
 //
 // TestCase.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/TestCase.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/TestCase.h#8 $
 //
 
 

CppUnit/include/CppUnit/TestDecorator.h

@@ -1,7 +1,7 @@
 //
 // TestDecorator.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/TestDecorator.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/TestDecorator.h#7 $
 //
 
 

CppUnit/include/CppUnit/TestFailure.h

@@ -1,7 +1,7 @@
 //
 // TestFailure.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/TestFailure.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/TestFailure.h#7 $
 //
 
 

CppUnit/include/CppUnit/TestResult.h

@@ -1,7 +1,7 @@
 //
 // TestResult.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/TestResult.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/TestResult.h#7 $
 //
 
 

CppUnit/include/CppUnit/TestRunner.h

@@ -1,7 +1,7 @@
 //
 // TestRunner.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/TestRunner.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/TestRunner.h#7 $
 //
 
 

CppUnit/include/CppUnit/TestSetup.h

@@ -1,7 +1,7 @@
 //
 // TestSetup.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/TestSetup.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/TestSetup.h#7 $
 //
 
 

CppUnit/include/CppUnit/TestSuite.h

@@ -1,7 +1,7 @@
 //
 // TestSuite.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/TestSuite.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/TestSuite.h#7 $
 //
 
 

CppUnit/include/CppUnit/TextTestResult.h

@@ -1,7 +1,7 @@
 //
 // TextTestResult.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/TextTestResult.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/TextTestResult.h#7 $
 //
 
 

CppUnit/include/CppUnit/estring.h

@@ -1,7 +1,7 @@
 //
 // estring.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/estring.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/estring.h#7 $
 //
 
 

CppUnit/src/CppUnitException.cpp

@@ -1,7 +1,7 @@
 //
 // CppUnitException.cpp
 //
-// $Id: //poco/1.3/CppUnit/src/CppUnitException.cpp#1 $
+// $Id: //poco/Main/CppUnit/src/CppUnitException.cpp#6 $
 //
 
 

CppUnit/src/TestCase.cpp

@@ -1,7 +1,7 @@
 //
 // TestCase.cpp
 //
-// $Id: //poco/1.3/CppUnit/src/TestCase.cpp#1 $
+// $Id: //poco/Main/CppUnit/src/TestCase.cpp#8 $
 //
 
 

CppUnit/src/TestDecorator.cpp

@@ -1,7 +1,7 @@
 //
 // TestDecorator.cpp
 //
-// $Id: //poco/1.3/CppUnit/src/TestDecorator.cpp#1 $
+// $Id: //poco/Main/CppUnit/src/TestDecorator.cpp#6 $
 //
 
 

CppUnit/src/TestFailure.cpp

@@ -1,7 +1,7 @@
 //
 // TestFailure.cpp
 //
-// $Id: //poco/1.3/CppUnit/src/TestFailure.cpp#1 $
+// $Id: //poco/Main/CppUnit/src/TestFailure.cpp#6 $
 //
 
 

CppUnit/src/TestResult.cpp

@@ -1,7 +1,7 @@
 //
 // TestResult.cpp
 //
-// $Id: //poco/1.3/CppUnit/src/TestResult.cpp#1 $
+// $Id: //poco/Main/CppUnit/src/TestResult.cpp#6 $
 //
 
 

CppUnit/src/TestRunner.cpp

@@ -1,7 +1,7 @@
 //
 // TestRunner.cpp
 //
-// $Id: //poco/1.3/CppUnit/src/TestRunner.cpp#1 $
+// $Id: //poco/Main/CppUnit/src/TestRunner.cpp#6 $
 //
 
 

CppUnit/src/TestSuite.cpp

@@ -1,7 +1,7 @@
 //
 // TestSuite.cpp
 //
-// $Id: //poco/1.3/CppUnit/src/TestSuite.cpp#1 $
+// $Id: //poco/Main/CppUnit/src/TestSuite.cpp#6 $
 //
 
 

CppUnit/src/TextTestResult.cpp

@@ -1,7 +1,7 @@
 //
 // TextTestResult.cpp
 //
-// $Id: //poco/1.3/CppUnit/src/TextTestResult.cpp#1 $
+// $Id: //poco/Main/CppUnit/src/TextTestResult.cpp#7 $
 //