Index: ch.vc90.sln =================================================================== diff -u -rd24ff711b841cd4f458f775e53fe49beaac76f25 -r2e23b5892ef4d4bb1ee2c6cde893004a71a11510 --- ch.vc90.sln (.../ch.vc90.sln) (revision d24ff711b841cd4f458f775e53fe49beaac76f25) +++ ch.vc90.sln (.../ch.vc90.sln) (revision 2e23b5892ef4d4bb1ee2c6cde893004a71a11510) @@ -5,201 +5,183 @@ {CBBF380B-7B16-4A1E-8194-758DAD7D8011} = {CBBF380B-7B16-4A1E-8194-758DAD7D8011} {5510B933-046F-4F75-8B46-5E8279C8CCDE} = {5510B933-046F-4F75-8B46-5E8279C8CCDE} {DD1F3242-7EE4-4F41-8B8D-D833300C445F} = {DD1F3242-7EE4-4F41-8B8D-D833300C445F} + {D98F2D98-2352-4303-93EE-A5430C4E98AB} = {D98F2D98-2352-4303-93EE-A5430C4E98AB} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chext", "src\chext\chext.vc90.vcproj", "{7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}" ProjectSection(ProjectDependencies) = postProject {CBBF380B-7B16-4A1E-8194-758DAD7D8011} = {CBBF380B-7B16-4A1E-8194-758DAD7D8011} {5510B933-046F-4F75-8B46-5E8279C8CCDE} = {5510B933-046F-4F75-8B46-5E8279C8CCDE} + {D98F2D98-2352-4303-93EE-A5430C4E98AB} = {D98F2D98-2352-4303-93EE-A5430C4E98AB} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libicpf", "src\libicpf\libicpf.vc90.vcproj", "{5510B933-046F-4F75-8B46-5E8279C8CCDE}" + ProjectSection(ProjectDependencies) = postProject + {D98F2D98-2352-4303-93EE-A5430C4E98AB} = {D98F2D98-2352-4303-93EE-A5430C4E98AB} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libictranslate", "src\libictranslate\libictranslate.vc90.vcproj", "{DD1F3242-7EE4-4F41-8B8D-D833300C445F}" ProjectSection(ProjectDependencies) = postProject {5510B933-046F-4F75-8B46-5E8279C8CCDE} = {5510B933-046F-4F75-8B46-5E8279C8CCDE} + {D98F2D98-2352-4303-93EE-A5430C4E98AB} = {D98F2D98-2352-4303-93EE-A5430C4E98AB} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rc2lng", "src\rc2lng\rc2lng.vc90.vcproj", "{10FB6B7E-81A1-47F9-BC6F-7017E5695D3A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ictranslate", "src\ictranslate\ictranslate.vc90.vcproj", "{B0292250-B70C-4395-9859-F181FB113DA8}" ProjectSection(ProjectDependencies) = postProject {5510B933-046F-4F75-8B46-5E8279C8CCDE} = {5510B933-046F-4F75-8B46-5E8279C8CCDE} + {DD1F3242-7EE4-4F41-8B8D-D833300C445F} = {DD1F3242-7EE4-4F41-8B8D-D833300C445F} + {D98F2D98-2352-4303-93EE-A5430C4E98AB} = {D98F2D98-2352-4303-93EE-A5430C4E98AB} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ictranslate", "src\ictranslate\ictranslate.vc90.vcproj", "{B0292250-B70C-4395-9859-F181FB113DA8}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchcore", "src\libchcore\libchcore.vc90.vcproj", "{CBBF380B-7B16-4A1E-8194-758DAD7D8011}" ProjectSection(ProjectDependencies) = postProject {5510B933-046F-4F75-8B46-5E8279C8CCDE} = {5510B933-046F-4F75-8B46-5E8279C8CCDE} + {D98F2D98-2352-4303-93EE-A5430C4E98AB} = {D98F2D98-2352-4303-93EE-A5430C4E98AB} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchcore_test", "tests\libchcore_test\libchcore_test.vcproj", "{2AF37846-09E7-46EB-83AE-1E4C67742EE7}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock", "ext\gmock\gmock.vcproj", "{D98F2D98-2352-4303-93EE-A5430C4E98AB}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chcmd", "src\chcmd\chcmd.vc90.vcproj", "{51018F43-12D4-4A47-9F71-5E1A8CE3EA0C}" + ProjectSection(ProjectDependencies) = postProject + {D98F2D98-2352-4303-93EE-A5430C4E98AB} = {D98F2D98-2352-4303-93EE-A5430C4E98AB} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - DebugTests|Win32 = DebugTests|Win32 - DebugTests|x64 = DebugTests|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 - ReleaseTests|Win32 = ReleaseTests|Win32 - ReleaseTests|x64 = ReleaseTests|x64 + Testing Debug|Win32 = Testing Debug|Win32 + Testing Debug|x64 = Testing Debug|x64 + Testing Release|Win32 = Testing Release|Win32 + Testing Release|x64 = Testing Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {4B215B9A-58CA-4987-AC95-7DFC3043E100}.Debug|Win32.ActiveCfg = Debug|Win32 {4B215B9A-58CA-4987-AC95-7DFC3043E100}.Debug|Win32.Build.0 = Debug|Win32 {4B215B9A-58CA-4987-AC95-7DFC3043E100}.Debug|x64.ActiveCfg = Debug|x64 {4B215B9A-58CA-4987-AC95-7DFC3043E100}.Debug|x64.Build.0 = Debug|x64 - {4B215B9A-58CA-4987-AC95-7DFC3043E100}.DebugTests|Win32.ActiveCfg = Debug|Win32 - {4B215B9A-58CA-4987-AC95-7DFC3043E100}.DebugTests|Win32.Build.0 = Debug|Win32 - {4B215B9A-58CA-4987-AC95-7DFC3043E100}.DebugTests|x64.ActiveCfg = Debug|x64 - {4B215B9A-58CA-4987-AC95-7DFC3043E100}.DebugTests|x64.Build.0 = Debug|x64 {4B215B9A-58CA-4987-AC95-7DFC3043E100}.Release|Win32.ActiveCfg = Release|Win32 {4B215B9A-58CA-4987-AC95-7DFC3043E100}.Release|Win32.Build.0 = Release|Win32 {4B215B9A-58CA-4987-AC95-7DFC3043E100}.Release|x64.ActiveCfg = Release|x64 {4B215B9A-58CA-4987-AC95-7DFC3043E100}.Release|x64.Build.0 = Release|x64 - {4B215B9A-58CA-4987-AC95-7DFC3043E100}.ReleaseTests|Win32.ActiveCfg = Release|Win32 - {4B215B9A-58CA-4987-AC95-7DFC3043E100}.ReleaseTests|Win32.Build.0 = Release|Win32 - {4B215B9A-58CA-4987-AC95-7DFC3043E100}.ReleaseTests|x64.ActiveCfg = Release|x64 - {4B215B9A-58CA-4987-AC95-7DFC3043E100}.ReleaseTests|x64.Build.0 = Release|x64 + {4B215B9A-58CA-4987-AC95-7DFC3043E100}.Testing Debug|Win32.ActiveCfg = Testing Debug|Win32 + {4B215B9A-58CA-4987-AC95-7DFC3043E100}.Testing Debug|Win32.Build.0 = Testing Debug|Win32 + {4B215B9A-58CA-4987-AC95-7DFC3043E100}.Testing Debug|x64.ActiveCfg = Testing Debug|x64 + {4B215B9A-58CA-4987-AC95-7DFC3043E100}.Testing Debug|x64.Build.0 = Testing Debug|x64 + {4B215B9A-58CA-4987-AC95-7DFC3043E100}.Testing Release|Win32.ActiveCfg = Testing Release|Win32 + {4B215B9A-58CA-4987-AC95-7DFC3043E100}.Testing Release|Win32.Build.0 = Testing Release|Win32 + {4B215B9A-58CA-4987-AC95-7DFC3043E100}.Testing Release|x64.ActiveCfg = Testing Release|x64 + {4B215B9A-58CA-4987-AC95-7DFC3043E100}.Testing Release|x64.Build.0 = Testing Release|x64 {7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.Debug|Win32.ActiveCfg = Debug|Win32 {7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.Debug|Win32.Build.0 = Debug|Win32 {7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.Debug|x64.ActiveCfg = Debug|x64 {7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.Debug|x64.Build.0 = Debug|x64 - {7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.DebugTests|Win32.ActiveCfg = Debug|Win32 - {7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.DebugTests|Win32.Build.0 = Debug|Win32 - {7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.DebugTests|x64.ActiveCfg = Debug|x64 - {7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.DebugTests|x64.Build.0 = Debug|x64 {7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.Release|Win32.ActiveCfg = Release|Win32 {7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.Release|Win32.Build.0 = Release|Win32 {7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.Release|x64.ActiveCfg = Release|x64 {7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.Release|x64.Build.0 = Release|x64 - {7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.ReleaseTests|Win32.ActiveCfg = Release|Win32 - {7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.ReleaseTests|Win32.Build.0 = Release|Win32 - {7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.ReleaseTests|x64.ActiveCfg = Release|x64 - {7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.ReleaseTests|x64.Build.0 = Release|x64 + {7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.Testing Debug|Win32.ActiveCfg = Testing Debug|Win32 + {7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.Testing Debug|Win32.Build.0 = Testing Debug|Win32 + {7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.Testing Debug|x64.ActiveCfg = Testing Debug|x64 + {7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.Testing Debug|x64.Build.0 = Testing Debug|x64 + {7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.Testing Release|Win32.ActiveCfg = Testing Release|Win32 + {7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.Testing Release|Win32.Build.0 = Testing Release|Win32 + {7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.Testing Release|x64.ActiveCfg = Testing Release|x64 + {7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.Testing Release|x64.Build.0 = Testing Release|x64 {5510B933-046F-4F75-8B46-5E8279C8CCDE}.Debug|Win32.ActiveCfg = Debug|Win32 {5510B933-046F-4F75-8B46-5E8279C8CCDE}.Debug|Win32.Build.0 = Debug|Win32 {5510B933-046F-4F75-8B46-5E8279C8CCDE}.Debug|x64.ActiveCfg = Debug|x64 {5510B933-046F-4F75-8B46-5E8279C8CCDE}.Debug|x64.Build.0 = Debug|x64 - {5510B933-046F-4F75-8B46-5E8279C8CCDE}.DebugTests|Win32.ActiveCfg = Debug|Win32 - {5510B933-046F-4F75-8B46-5E8279C8CCDE}.DebugTests|Win32.Build.0 = Debug|Win32 - {5510B933-046F-4F75-8B46-5E8279C8CCDE}.DebugTests|x64.ActiveCfg = Debug|x64 - {5510B933-046F-4F75-8B46-5E8279C8CCDE}.DebugTests|x64.Build.0 = Debug|x64 {5510B933-046F-4F75-8B46-5E8279C8CCDE}.Release|Win32.ActiveCfg = Release|Win32 {5510B933-046F-4F75-8B46-5E8279C8CCDE}.Release|Win32.Build.0 = Release|Win32 {5510B933-046F-4F75-8B46-5E8279C8CCDE}.Release|x64.ActiveCfg = Release|x64 {5510B933-046F-4F75-8B46-5E8279C8CCDE}.Release|x64.Build.0 = Release|x64 - {5510B933-046F-4F75-8B46-5E8279C8CCDE}.ReleaseTests|Win32.ActiveCfg = Release|Win32 - {5510B933-046F-4F75-8B46-5E8279C8CCDE}.ReleaseTests|Win32.Build.0 = Release|Win32 - {5510B933-046F-4F75-8B46-5E8279C8CCDE}.ReleaseTests|x64.ActiveCfg = Release|x64 - {5510B933-046F-4F75-8B46-5E8279C8CCDE}.ReleaseTests|x64.Build.0 = Release|x64 + {5510B933-046F-4F75-8B46-5E8279C8CCDE}.Testing Debug|Win32.ActiveCfg = Testing Debug|Win32 + {5510B933-046F-4F75-8B46-5E8279C8CCDE}.Testing Debug|Win32.Build.0 = Testing Debug|Win32 + {5510B933-046F-4F75-8B46-5E8279C8CCDE}.Testing Debug|x64.ActiveCfg = Testing Debug|x64 + {5510B933-046F-4F75-8B46-5E8279C8CCDE}.Testing Debug|x64.Build.0 = Testing Debug|x64 + {5510B933-046F-4F75-8B46-5E8279C8CCDE}.Testing Release|Win32.ActiveCfg = Testing Release|Win32 + {5510B933-046F-4F75-8B46-5E8279C8CCDE}.Testing Release|Win32.Build.0 = Testing Release|Win32 + {5510B933-046F-4F75-8B46-5E8279C8CCDE}.Testing Release|x64.ActiveCfg = Testing Release|x64 + {5510B933-046F-4F75-8B46-5E8279C8CCDE}.Testing Release|x64.Build.0 = Testing Release|x64 {DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Debug|Win32.ActiveCfg = Debug|Win32 {DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Debug|Win32.Build.0 = Debug|Win32 {DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Debug|x64.ActiveCfg = Debug|x64 {DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Debug|x64.Build.0 = Debug|x64 - {DD1F3242-7EE4-4F41-8B8D-D833300C445F}.DebugTests|Win32.ActiveCfg = Debug|Win32 - {DD1F3242-7EE4-4F41-8B8D-D833300C445F}.DebugTests|Win32.Build.0 = Debug|Win32 - {DD1F3242-7EE4-4F41-8B8D-D833300C445F}.DebugTests|x64.ActiveCfg = Debug|x64 - {DD1F3242-7EE4-4F41-8B8D-D833300C445F}.DebugTests|x64.Build.0 = Debug|x64 {DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Release|Win32.ActiveCfg = Release|Win32 {DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Release|Win32.Build.0 = Release|Win32 {DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Release|x64.ActiveCfg = Release|x64 {DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Release|x64.Build.0 = Release|x64 - {DD1F3242-7EE4-4F41-8B8D-D833300C445F}.ReleaseTests|Win32.ActiveCfg = Release|Win32 - {DD1F3242-7EE4-4F41-8B8D-D833300C445F}.ReleaseTests|Win32.Build.0 = Release|Win32 - {DD1F3242-7EE4-4F41-8B8D-D833300C445F}.ReleaseTests|x64.ActiveCfg = Release|x64 - {DD1F3242-7EE4-4F41-8B8D-D833300C445F}.ReleaseTests|x64.Build.0 = Release|x64 - {10FB6B7E-81A1-47F9-BC6F-7017E5695D3A}.Debug|Win32.ActiveCfg = Debug|Win32 - {10FB6B7E-81A1-47F9-BC6F-7017E5695D3A}.Debug|Win32.Build.0 = Debug|Win32 - {10FB6B7E-81A1-47F9-BC6F-7017E5695D3A}.Debug|x64.ActiveCfg = Debug|x64 - {10FB6B7E-81A1-47F9-BC6F-7017E5695D3A}.Debug|x64.Build.0 = Debug|x64 - {10FB6B7E-81A1-47F9-BC6F-7017E5695D3A}.DebugTests|Win32.ActiveCfg = Debug|Win32 - {10FB6B7E-81A1-47F9-BC6F-7017E5695D3A}.DebugTests|Win32.Build.0 = Debug|Win32 - {10FB6B7E-81A1-47F9-BC6F-7017E5695D3A}.DebugTests|x64.ActiveCfg = Debug|x64 - {10FB6B7E-81A1-47F9-BC6F-7017E5695D3A}.DebugTests|x64.Build.0 = Debug|x64 - {10FB6B7E-81A1-47F9-BC6F-7017E5695D3A}.Release|Win32.ActiveCfg = Release|Win32 - {10FB6B7E-81A1-47F9-BC6F-7017E5695D3A}.Release|Win32.Build.0 = Release|Win32 - {10FB6B7E-81A1-47F9-BC6F-7017E5695D3A}.Release|x64.ActiveCfg = Release|x64 - {10FB6B7E-81A1-47F9-BC6F-7017E5695D3A}.Release|x64.Build.0 = Release|x64 - {10FB6B7E-81A1-47F9-BC6F-7017E5695D3A}.ReleaseTests|Win32.ActiveCfg = Release|Win32 - {10FB6B7E-81A1-47F9-BC6F-7017E5695D3A}.ReleaseTests|Win32.Build.0 = Release|Win32 - {10FB6B7E-81A1-47F9-BC6F-7017E5695D3A}.ReleaseTests|x64.ActiveCfg = Release|x64 - {10FB6B7E-81A1-47F9-BC6F-7017E5695D3A}.ReleaseTests|x64.Build.0 = Release|x64 + {DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Testing Debug|Win32.ActiveCfg = Testing Debug|Win32 + {DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Testing Debug|Win32.Build.0 = Testing Debug|Win32 + {DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Testing Debug|x64.ActiveCfg = Testing Debug|x64 + {DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Testing Debug|x64.Build.0 = Testing Debug|x64 + {DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Testing Release|Win32.ActiveCfg = Testing Release|Win32 + {DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Testing Release|Win32.Build.0 = Testing Release|Win32 + {DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Testing Release|x64.ActiveCfg = Testing Release|x64 + {DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Testing Release|x64.Build.0 = Testing Release|x64 {B0292250-B70C-4395-9859-F181FB113DA8}.Debug|Win32.ActiveCfg = Debug|Win32 {B0292250-B70C-4395-9859-F181FB113DA8}.Debug|Win32.Build.0 = Debug|Win32 {B0292250-B70C-4395-9859-F181FB113DA8}.Debug|x64.ActiveCfg = Debug|x64 {B0292250-B70C-4395-9859-F181FB113DA8}.Debug|x64.Build.0 = Debug|x64 - {B0292250-B70C-4395-9859-F181FB113DA8}.DebugTests|Win32.ActiveCfg = Debug|Win32 - {B0292250-B70C-4395-9859-F181FB113DA8}.DebugTests|Win32.Build.0 = Debug|Win32 - {B0292250-B70C-4395-9859-F181FB113DA8}.DebugTests|x64.ActiveCfg = Debug|x64 - {B0292250-B70C-4395-9859-F181FB113DA8}.DebugTests|x64.Build.0 = Debug|x64 {B0292250-B70C-4395-9859-F181FB113DA8}.Release|Win32.ActiveCfg = Release|Win32 {B0292250-B70C-4395-9859-F181FB113DA8}.Release|Win32.Build.0 = Release|Win32 {B0292250-B70C-4395-9859-F181FB113DA8}.Release|x64.ActiveCfg = Release|x64 {B0292250-B70C-4395-9859-F181FB113DA8}.Release|x64.Build.0 = Release|x64 - {B0292250-B70C-4395-9859-F181FB113DA8}.ReleaseTests|Win32.ActiveCfg = Release|Win32 - {B0292250-B70C-4395-9859-F181FB113DA8}.ReleaseTests|Win32.Build.0 = Release|Win32 - {B0292250-B70C-4395-9859-F181FB113DA8}.ReleaseTests|x64.ActiveCfg = Release|x64 - {B0292250-B70C-4395-9859-F181FB113DA8}.ReleaseTests|x64.Build.0 = Release|x64 + {B0292250-B70C-4395-9859-F181FB113DA8}.Testing Debug|Win32.ActiveCfg = Testing Debug|Win32 + {B0292250-B70C-4395-9859-F181FB113DA8}.Testing Debug|Win32.Build.0 = Testing Debug|Win32 + {B0292250-B70C-4395-9859-F181FB113DA8}.Testing Debug|x64.ActiveCfg = Testing Debug|x64 + {B0292250-B70C-4395-9859-F181FB113DA8}.Testing Debug|x64.Build.0 = Testing Debug|x64 + {B0292250-B70C-4395-9859-F181FB113DA8}.Testing Release|Win32.ActiveCfg = Testing Release|Win32 + {B0292250-B70C-4395-9859-F181FB113DA8}.Testing Release|Win32.Build.0 = Testing Release|Win32 + {B0292250-B70C-4395-9859-F181FB113DA8}.Testing Release|x64.ActiveCfg = Testing Release|x64 + {B0292250-B70C-4395-9859-F181FB113DA8}.Testing Release|x64.Build.0 = Testing Release|x64 {CBBF380B-7B16-4A1E-8194-758DAD7D8011}.Debug|Win32.ActiveCfg = Debug|Win32 {CBBF380B-7B16-4A1E-8194-758DAD7D8011}.Debug|Win32.Build.0 = Debug|Win32 {CBBF380B-7B16-4A1E-8194-758DAD7D8011}.Debug|x64.ActiveCfg = Debug|x64 {CBBF380B-7B16-4A1E-8194-758DAD7D8011}.Debug|x64.Build.0 = Debug|x64 - {CBBF380B-7B16-4A1E-8194-758DAD7D8011}.DebugTests|Win32.ActiveCfg = Debug|Win32 - {CBBF380B-7B16-4A1E-8194-758DAD7D8011}.DebugTests|Win32.Build.0 = Debug|Win32 - {CBBF380B-7B16-4A1E-8194-758DAD7D8011}.DebugTests|x64.ActiveCfg = Debug|x64 - {CBBF380B-7B16-4A1E-8194-758DAD7D8011}.DebugTests|x64.Build.0 = Debug|x64 {CBBF380B-7B16-4A1E-8194-758DAD7D8011}.Release|Win32.ActiveCfg = Release|Win32 {CBBF380B-7B16-4A1E-8194-758DAD7D8011}.Release|Win32.Build.0 = Release|Win32 {CBBF380B-7B16-4A1E-8194-758DAD7D8011}.Release|x64.ActiveCfg = Release|x64 {CBBF380B-7B16-4A1E-8194-758DAD7D8011}.Release|x64.Build.0 = Release|x64 - {CBBF380B-7B16-4A1E-8194-758DAD7D8011}.ReleaseTests|Win32.ActiveCfg = Release|Win32 - {CBBF380B-7B16-4A1E-8194-758DAD7D8011}.ReleaseTests|Win32.Build.0 = Release|Win32 - {CBBF380B-7B16-4A1E-8194-758DAD7D8011}.ReleaseTests|x64.ActiveCfg = Release|x64 - {CBBF380B-7B16-4A1E-8194-758DAD7D8011}.ReleaseTests|x64.Build.0 = Release|x64 - {2AF37846-09E7-46EB-83AE-1E4C67742EE7}.Debug|Win32.ActiveCfg = Debug|Win32 - {2AF37846-09E7-46EB-83AE-1E4C67742EE7}.Debug|x64.ActiveCfg = Debug|x64 - {2AF37846-09E7-46EB-83AE-1E4C67742EE7}.DebugTests|Win32.ActiveCfg = Debug|Win32 - {2AF37846-09E7-46EB-83AE-1E4C67742EE7}.DebugTests|Win32.Build.0 = Debug|Win32 - {2AF37846-09E7-46EB-83AE-1E4C67742EE7}.DebugTests|x64.ActiveCfg = Debug|x64 - {2AF37846-09E7-46EB-83AE-1E4C67742EE7}.DebugTests|x64.Build.0 = Debug|x64 - {2AF37846-09E7-46EB-83AE-1E4C67742EE7}.Release|Win32.ActiveCfg = Release|Win32 - {2AF37846-09E7-46EB-83AE-1E4C67742EE7}.Release|x64.ActiveCfg = Release|x64 - {2AF37846-09E7-46EB-83AE-1E4C67742EE7}.ReleaseTests|Win32.ActiveCfg = Release|Win32 - {2AF37846-09E7-46EB-83AE-1E4C67742EE7}.ReleaseTests|Win32.Build.0 = Release|Win32 - {2AF37846-09E7-46EB-83AE-1E4C67742EE7}.ReleaseTests|x64.ActiveCfg = Release|x64 - {2AF37846-09E7-46EB-83AE-1E4C67742EE7}.ReleaseTests|x64.Build.0 = Release|x64 + {CBBF380B-7B16-4A1E-8194-758DAD7D8011}.Testing Debug|Win32.ActiveCfg = Testing Debug|Win32 + {CBBF380B-7B16-4A1E-8194-758DAD7D8011}.Testing Debug|Win32.Build.0 = Testing Debug|Win32 + {CBBF380B-7B16-4A1E-8194-758DAD7D8011}.Testing Debug|x64.ActiveCfg = Testing Debug|x64 + {CBBF380B-7B16-4A1E-8194-758DAD7D8011}.Testing Debug|x64.Build.0 = Testing Debug|x64 + {CBBF380B-7B16-4A1E-8194-758DAD7D8011}.Testing Release|Win32.ActiveCfg = Testing Release|Win32 + {CBBF380B-7B16-4A1E-8194-758DAD7D8011}.Testing Release|Win32.Build.0 = Testing Release|Win32 + {CBBF380B-7B16-4A1E-8194-758DAD7D8011}.Testing Release|x64.ActiveCfg = Testing Release|x64 + {CBBF380B-7B16-4A1E-8194-758DAD7D8011}.Testing Release|x64.Build.0 = Testing Release|x64 {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Debug|Win32.ActiveCfg = Debug|Win32 {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Debug|x64.ActiveCfg = Debug|x64 - {D98F2D98-2352-4303-93EE-A5430C4E98AB}.DebugTests|Win32.ActiveCfg = Debug|Win32 - {D98F2D98-2352-4303-93EE-A5430C4E98AB}.DebugTests|Win32.Build.0 = Debug|Win32 - {D98F2D98-2352-4303-93EE-A5430C4E98AB}.DebugTests|x64.ActiveCfg = Debug|x64 - {D98F2D98-2352-4303-93EE-A5430C4E98AB}.DebugTests|x64.Build.0 = Debug|x64 {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Release|Win32.ActiveCfg = Release|Win32 {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Release|x64.ActiveCfg = Release|x64 - {D98F2D98-2352-4303-93EE-A5430C4E98AB}.ReleaseTests|Win32.ActiveCfg = Release|Win32 - {D98F2D98-2352-4303-93EE-A5430C4E98AB}.ReleaseTests|Win32.Build.0 = Release|Win32 - {D98F2D98-2352-4303-93EE-A5430C4E98AB}.ReleaseTests|x64.ActiveCfg = Release|x64 - {D98F2D98-2352-4303-93EE-A5430C4E98AB}.ReleaseTests|x64.Build.0 = Release|x64 + {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Testing Debug|Win32.ActiveCfg = Testing Debug|Win32 + {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Testing Debug|Win32.Build.0 = Testing Debug|Win32 + {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Testing Debug|x64.ActiveCfg = Testing Debug|x64 + {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Testing Debug|x64.Build.0 = Testing Debug|x64 + {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Testing Release|Win32.ActiveCfg = Testing Release|Win32 + {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Testing Release|Win32.Build.0 = Testing Release|Win32 + {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Testing Release|x64.ActiveCfg = Testing Release|x64 + {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Testing Release|x64.Build.0 = Testing Release|x64 {51018F43-12D4-4A47-9F71-5E1A8CE3EA0C}.Debug|Win32.ActiveCfg = Debug|Win32 {51018F43-12D4-4A47-9F71-5E1A8CE3EA0C}.Debug|Win32.Build.0 = Debug|Win32 {51018F43-12D4-4A47-9F71-5E1A8CE3EA0C}.Debug|x64.ActiveCfg = Debug|x64 {51018F43-12D4-4A47-9F71-5E1A8CE3EA0C}.Debug|x64.Build.0 = Debug|x64 - {51018F43-12D4-4A47-9F71-5E1A8CE3EA0C}.DebugTests|Win32.ActiveCfg = Debug|Win32 - {51018F43-12D4-4A47-9F71-5E1A8CE3EA0C}.DebugTests|Win32.Build.0 = Debug|Win32 - {51018F43-12D4-4A47-9F71-5E1A8CE3EA0C}.DebugTests|x64.ActiveCfg = Debug|Win32 {51018F43-12D4-4A47-9F71-5E1A8CE3EA0C}.Release|Win32.ActiveCfg = Release|Win32 {51018F43-12D4-4A47-9F71-5E1A8CE3EA0C}.Release|Win32.Build.0 = Release|Win32 {51018F43-12D4-4A47-9F71-5E1A8CE3EA0C}.Release|x64.ActiveCfg = Release|x64 {51018F43-12D4-4A47-9F71-5E1A8CE3EA0C}.Release|x64.Build.0 = Release|x64 - {51018F43-12D4-4A47-9F71-5E1A8CE3EA0C}.ReleaseTests|Win32.ActiveCfg = Release|Win32 - {51018F43-12D4-4A47-9F71-5E1A8CE3EA0C}.ReleaseTests|Win32.Build.0 = Release|Win32 - {51018F43-12D4-4A47-9F71-5E1A8CE3EA0C}.ReleaseTests|x64.ActiveCfg = Release|Win32 + {51018F43-12D4-4A47-9F71-5E1A8CE3EA0C}.Testing Debug|Win32.ActiveCfg = Testing Debug|Win32 + {51018F43-12D4-4A47-9F71-5E1A8CE3EA0C}.Testing Debug|Win32.Build.0 = Testing Debug|Win32 + {51018F43-12D4-4A47-9F71-5E1A8CE3EA0C}.Testing Debug|x64.ActiveCfg = Testing Debug|x64 + {51018F43-12D4-4A47-9F71-5E1A8CE3EA0C}.Testing Debug|x64.Build.0 = Testing Debug|x64 + {51018F43-12D4-4A47-9F71-5E1A8CE3EA0C}.Testing Release|Win32.ActiveCfg = Testing Release|Win32 + {51018F43-12D4-4A47-9F71-5E1A8CE3EA0C}.Testing Release|Win32.Build.0 = Testing Release|Win32 + {51018F43-12D4-4A47-9F71-5E1A8CE3EA0C}.Testing Release|x64.ActiveCfg = Testing Release|x64 + {51018F43-12D4-4A47-9F71-5E1A8CE3EA0C}.Testing Release|x64.Build.0 = Testing Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Index: ext/gmock/gmock.vcproj =================================================================== diff -u -r4746a1d6507ed70cd9c05c4e4a95fa50733174a1 -r2e23b5892ef4d4bb1ee2c6cde893004a71a11510 --- ext/gmock/gmock.vcproj (.../gmock.vcproj) (revision 4746a1d6507ed70cd9c05c4e4a95fa50733174a1) +++ ext/gmock/gmock.vcproj (.../gmock.vcproj) (revision 2e23b5892ef4d4bb1ee2c6cde893004a71a11510) @@ -1,7 +1,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: src/ch/ch.vc90.vcproj =================================================================== diff -u -rc5d97755740d364ac515b47c7f37af666b9fbb4b -r2e23b5892ef4d4bb1ee2c6cde893004a71a11510 --- src/ch/ch.vc90.vcproj (.../ch.vc90.vcproj) (revision c5d97755740d364ac515b47c7f37af666b9fbb4b) +++ src/ch/ch.vc90.vcproj (.../ch.vc90.vcproj) (revision 2e23b5892ef4d4bb1ee2c6cde893004a71a11510) @@ -1,7 +1,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + @@ -816,7 +1200,7 @@ @@ -827,7 +1211,7 @@ @@ -838,11 +1222,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1315,7 +1827,7 @@ @@ -1325,7 +1837,7 @@ @@ -1335,10 +1847,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: src/chext/chext.vc90.vcproj =================================================================== diff -u -r4746a1d6507ed70cd9c05c4e4a95fa50733174a1 -r2e23b5892ef4d4bb1ee2c6cde893004a71a11510 --- src/chext/chext.vc90.vcproj (.../chext.vc90.vcproj) (revision 4746a1d6507ed70cd9c05c4e4a95fa50733174a1) +++ src/chext/chext.vc90.vcproj (.../chext.vc90.vcproj) (revision 2e23b5892ef4d4bb1ee2c6cde893004a71a11510) @@ -1,7 +1,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Fisheye: tag b013066ba827b440b2e281bd58e8b16e51a080d7 is not in file src/libchcore/Tests/TDataBufferManagerTest.cpp Fisheye: Tag 2e23b5892ef4d4bb1ee2c6cde893004a71a11510 refers to a dead (removed) revision in file `tests/libchcore_test/src/TDataBufferManagerTest.cpp'. Fisheye: No comparison available. Pass `N' to diff? Index: src/libchcore/libchcore.vc90.vcproj =================================================================== diff -u -r4746a1d6507ed70cd9c05c4e4a95fa50733174a1 -r2e23b5892ef4d4bb1ee2c6cde893004a71a11510 --- src/libchcore/libchcore.vc90.vcproj (.../libchcore.vc90.vcproj) (revision 4746a1d6507ed70cd9c05c4e4a95fa50733174a1) +++ src/libchcore/libchcore.vc90.vcproj (.../libchcore.vc90.vcproj) (revision 2e23b5892ef4d4bb1ee2c6cde893004a71a11510) @@ -1,7 +1,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Fisheye: Tag 2e23b5892ef4d4bb1ee2c6cde893004a71a11510 refers to a dead (removed) revision in file `tests/libchcore_test/src/libchcore_test.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: tag 409a0af1e9fdea72ca016118d76a5a95e53496e8 is not in file tests/test_runner/src/stdafx.cpp Fisheye: Tag 2e23b5892ef4d4bb1ee2c6cde893004a71a11510 refers to a dead (removed) revision in file `tests/libchcore_test/src/stdafx.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: tag 409a0af1e9fdea72ca016118d76a5a95e53496e8 is not in file tests/test_runner/src/stdafx.h Fisheye: Tag 2e23b5892ef4d4bb1ee2c6cde893004a71a11510 refers to a dead (removed) revision in file `tests/libchcore_test/src/stdafx.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: tag 409a0af1e9fdea72ca016118d76a5a95e53496e8 is not in file tests/test_runner/src/targetver.h Fisheye: Tag 2e23b5892ef4d4bb1ee2c6cde893004a71a11510 refers to a dead (removed) revision in file `tests/libchcore_test/src/targetver.h'. Fisheye: No comparison available. Pass `N' to diff? Index: tests/test_runner/src/test_runner.cpp =================================================================== diff -u --- tests/test_runner/src/test_runner.cpp (revision 0) +++ tests/test_runner/src/test_runner.cpp (revision 2e23b5892ef4d4bb1ee2c6cde893004a71a11510) @@ -0,0 +1,39 @@ +// libchcore_test.cpp : Defines the entry point for the console application. +// + +#include "stdafx.h" + +int _tmain(int argc, _TCHAR* argv[]) +{ + using std::wcout; + using std::endl; + + if(argc < 2) + { + wcout << _T("Usage: TestRunner.exe ") << endl; + return 1; + } + + PCTSTR pszLibName = argv[1]; + + wcout << _T("Executing tests in: ") << pszLibName << endl; + + HMODULE module = LoadLibrary(pszLibName); + if(module) + { + typedef int(*pfnRunTests)(int argc, TCHAR* argv[]); + + pfnRunTests pfnFunc = (pfnRunTests)::GetProcAddress(module, "_RunTests@8"); + if(!pfnFunc) + pfnFunc = (pfnRunTests)::GetProcAddress(module, "RunTests"); + if(pfnFunc) + return pfnFunc(argc, argv); + else + { + DWORD dwErr = GetLastError(); + wcout << _T("Library ") << pszLibName << _T(" does not have tests embedded. Error: ") << dwErr << endl; + } + } + else + wcout << _T("Cannot load library ") << pszLibName << endl; +} Index: tests/test_runner/test_runner.vcproj =================================================================== diff -u --- tests/test_runner/test_runner.vcproj (revision 0) +++ tests/test_runner/test_runner.vcproj (revision 2e23b5892ef4d4bb1ee2c6cde893004a71a11510) @@ -0,0 +1,723 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Fisheye: tag 4746a1d6507ed70cd9c05c4e4a95fa50733174a1 is not in file tests/test_runner/test_runner.vcxproj Fisheye: Tag 2e23b5892ef4d4bb1ee2c6cde893004a71a11510 refers to a dead (removed) revision in file `tests/libchcore_test/libchcore_test.vcxproj'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: tag dd61ac70dd276425fe97970b49b6854d02bfcc87 is not in file tests/test_runner/test_runner.vcxproj.filters Fisheye: Tag 2e23b5892ef4d4bb1ee2c6cde893004a71a11510 refers to a dead (removed) revision in file `tests/libchcore_test/libchcore_test.vcxproj.filters'. Fisheye: No comparison available. Pass `N' to diff? Index: tests/tests_shared/TestsExports.cpp =================================================================== diff -u --- tests/tests_shared/TestsExports.cpp (revision 0) +++ tests/tests_shared/TestsExports.cpp (revision 2e23b5892ef4d4bb1ee2c6cde893004a71a11510) @@ -0,0 +1,25 @@ +#include "gtest/gtest.h" +#include "gmock/gmock.h" +#include + +#ifdef TESTING + +#ifdef _CONSOLE +int _tmain(int argc, _TCHAR* argv[]) +{ + testing::InitGoogleMock(&argc, argv); + ::testing::FLAGS_gtest_death_test_style = "fast"; + ::testing::FLAGS_gtest_print_time = 1; + return RUN_ALL_TESTS(); +} +#else +extern "C" +__declspec(dllexport) int __stdcall RunTests(int argc, TCHAR* argv[]) +{ + testing::InitGoogleMock(&argc, argv); + ::testing::FLAGS_gtest_death_test_style = "fast"; + ::testing::FLAGS_gtest_print_time = 1; + return RUN_ALL_TESTS(); +} +#endif +#endif Index: tools/libicpf32u.dll =================================================================== diff -u Binary files differ Index: tools/rc2lng.exe =================================================================== diff -u Binary files differ Index: tools/test_runner32.exe =================================================================== diff -u Binary files differ Index: tools/test_runner64.exe =================================================================== diff -u Binary files differ