Diff
Modified: trunk/Source/WebKit/win/ChangeLog (104187 => 104188)
--- trunk/Source/WebKit/win/ChangeLog 2012-01-05 19:53:47 UTC (rev 104187)
+++ trunk/Source/WebKit/win/ChangeLog 2012-01-05 19:54:46 UTC (rev 104188)
@@ -1,5 +1,18 @@
2012-01-05 Adam Roben <[email protected]>
+ Add WebKitTestRunnerLauncher to WebKit.sln.
+
+ It builds just after WebKitTestRunner.
+
+ Part of <http://webkit.org/b/75486> <rdar://problem/10638124> NRWT fails to launch Apple's
+ Windows port of DumpRenderTree/WebKitTestRunner
+
+ Reviewed by Steve Falkenburg.
+
+ * WebKit.vcproj/WebKit.sln:
+
+2012-01-05 Adam Roben <[email protected]>
+
Add DumpRenderTreeLauncher to WebKit.sln.
It builds just after DumpRenderTree.
Modified: trunk/Source/WebKit/win/WebKit.vcproj/WebKit.sln (104187 => 104188)
--- trunk/Source/WebKit/win/WebKit.vcproj/WebKit.sln 2012-01-05 19:53:47 UTC (rev 104187)
+++ trunk/Source/WebKit/win/WebKit.vcproj/WebKit.sln 2012-01-05 19:54:46 UTC (rev 104188)
@@ -145,7 +145,7 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-md", "..\..\..\ThirdParty\gtest\msvc\gtest-md.vcproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}"
ProjectSection(ProjectDependencies) = postProject
- {3B99669B-1817-443B-BCBE-835580146668} = {3B99669B-1817-443B-BCBE-835580146668}
+ {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040} = {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebCoreTestSupport", "..\..\..\WebCore\WebCore.vcproj\WebCoreTestSupport.vcproj", "{83414B15-1C0D-490B-990E-03F4D49170E4}"
@@ -178,6 +178,11 @@
{6567DFD4-D6DE-4CD5-825D-17E353D160E1} = {6567DFD4-D6DE-4CD5-825D-17E353D160E1}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKitTestRunnerLauncher", "..\..\..\..\Tools\WebKitTestRunner\win\WebKitTestRunnerLauncher.vcproj", "{C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}"
+ ProjectSection(ProjectDependencies) = postProject
+ {3B99669B-1817-443B-BCBE-835580146668} = {3B99669B-1817-443B-BCBE-835580146668}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug_All|Win32 = Debug_All|Win32
@@ -594,6 +599,18 @@
{2974EA02-840B-4995-8719-8920A61006F1}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
{2974EA02-840B-4995-8719-8920A61006F1}.Release|Win32.ActiveCfg = Release|Win32
{2974EA02-840B-4995-8719-8920A61006F1}.Release|Win32.Build.0 = Release|Win32
+ {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
+ {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Debug_All|Win32.Build.0 = Debug_All|Win32
+ {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32
+ {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32
+ {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Debug|Win32.Build.0 = Debug|Win32
+ {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Production|Win32.ActiveCfg = Production|Win32
+ {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Production|Win32.Build.0 = Production|Win32
+ {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
+ {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
+ {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Release|Win32.ActiveCfg = Release|Win32
+ {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -633,5 +650,6 @@
{7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459}
{DD7949B6-F2B4-47C2-9C42-E21E84CB1017} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459}
{2974EA02-840B-4995-8719-8920A61006F1} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459}
+ {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459}
EndGlobalSection
EndGlobal
Modified: trunk/Tools/ChangeLog (104187 => 104188)
--- trunk/Tools/ChangeLog 2012-01-05 19:53:47 UTC (rev 104187)
+++ trunk/Tools/ChangeLog 2012-01-05 19:54:46 UTC (rev 104188)
@@ -1,5 +1,39 @@
2012-01-05 Adam Roben <[email protected]>
+ Turn WebKitTestRunner into a stub .exe launcher and a .dll that contains all the real code
+
+ This allows us to add the Safari and Apple Application Support directories to PATH before
+ trying to load WebKit so that SafariTheme.dll, CoreGraphics.dll and friends can be found.
+
+ Fixes <http://webkit.org/b/75486> <rdar://problem/10638124> NRWT fails to launch Apple's
+ Windows port of DumpRenderTree/WebKitTestRunner
+
+ Reviewed by Steve Falkenburg.
+
+ * WebKitTestRunner/WebKitTestRunner.sln: Added WebKitTestRunnerLauncher and
+ ImageDiffLauncher, which I forgot to add to this .sln when that project was created.
+
+ * WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops:
+ * WebKitTestRunner/win/WebKitTestRunner.vcproj:
+ Changed to build WebKitTestRunner.dll instead of WebKitTestRunner.exe.
+
+ * WebKitTestRunner/win/WebKitTestRunnerLauncher.vcproj: Copied from
+ Tools/WebKitTestRunner/win/WebKitTestRunner.vcproj but changed to build
+ the stub launcher.
+
+ * WebKitTestRunner/win/WebKitTestRunnerLauncherCommon.vsprops: Added.
+ * WebKitTestRunner/win/WebKitTestRunnerLauncherDebug.vsprops: Added.
+ * WebKitTestRunner/win/WebKitTestRunnerLauncherDebugAll.vsprops: Added.
+ * WebKitTestRunner/win/WebKitTestRunnerLauncherDebugCairoCFLite.vsprops: Added.
+ * WebKitTestRunner/win/WebKitTestRunnerLauncherProduction.vsprops: Added.
+ * WebKitTestRunner/win/WebKitTestRunnerLauncherRelease.vsprops: Added.
+ * WebKitTestRunner/win/WebKitTestRunnerLauncherReleaseCairoCFLite.vsprops: Added.
+
+ * WebKitTestRunner/win/main.cpp:
+ (dllLauncherEntryPoint): Renamed from main. This is what the stub launcher calls.
+
+2012-01-05 Adam Roben <[email protected]>
+
Turn DumpRenderTree into a stub .exe launcher and a .dll that contains all the real code
This allows us to add the Safari and Apple Application Support directories to PATH before
Modified: trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops (104187 => 104188)
--- trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops 2012-01-05 19:53:47 UTC (rev 104187)
+++ trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops 2012-01-05 19:54:46 UTC (rev 104188)
@@ -15,6 +15,7 @@
Name="VCLinkerTool"
AdditionalOptions="/NXCOMPAT"
AdditionalDependencies="_javascript_Core$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib shlwapi.lib"
+ OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll"
SubSystem="1"
/>
</VisualStudioPropertySheet>
Modified: trunk/Tools/WebKitTestRunner/WebKitTestRunner.sln (104187 => 104188)
--- trunk/Tools/WebKitTestRunner/WebKitTestRunner.sln 2012-01-05 19:53:47 UTC (rev 104187)
+++ trunk/Tools/WebKitTestRunner/WebKitTestRunner.sln 2012-01-05 19:54:46 UTC (rev 104188)
@@ -20,6 +20,16 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestNetscapePlugin", "..\DumpRenderTree\TestNetscapePlugIn\win\TestNetscapePlugin.vcproj", "{C0737398-3565-439E-A2B8-AB2BE4D5430C}"
ProjectSection(ProjectDependencies) = postProject
+ {DD7949B6-F2B4-47C2-9C42-E21E84CB1017} = {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKitTestRunnerLauncher", "win\WebKitTestRunnerLauncher.vcproj", "{C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}"
+ ProjectSection(ProjectDependencies) = postProject
+ {3B99669B-1817-443B-BCBE-835580146668} = {3B99669B-1817-443B-BCBE-835580146668}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImageDiffLauncher", "..\DumpRenderTree\win\ImageDiffLauncher.vcproj", "{DD7949B6-F2B4-47C2-9C42-E21E84CB1017}"
+ ProjectSection(ProjectDependencies) = postProject
{59CC0547-70AC-499C-9B19-EC01C6F61137} = {59CC0547-70AC-499C-9B19-EC01C6F61137}
EndProjectSection
EndProject
@@ -71,6 +81,22 @@
{C0737398-3565-439E-A2B8-AB2BE4D5430C}.Production|Win32.Build.0 = Production|Win32
{C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release|Win32.ActiveCfg = Release|Win32
{C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release|Win32.Build.0 = Release|Win32
+ {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
+ {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Debug_All|Win32.Build.0 = Debug_All|Win32
+ {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Debug|Win32.Build.0 = Debug|Win32
+ {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Production|Win32.ActiveCfg = Production|Win32
+ {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Production|Win32.Build.0 = Production|Win32
+ {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Release|Win32.ActiveCfg = Release|Win32
+ {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Release|Win32.Build.0 = Release|Win32
+ {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
+ {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug_All|Win32.Build.0 = Debug_All|Win32
+ {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug|Win32.ActiveCfg = Debug|Win32
+ {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug|Win32.Build.0 = Debug|Win32
+ {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Production|Win32.ActiveCfg = Production|Win32
+ {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Production|Win32.Build.0 = Production|Win32
+ {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Release|Win32.ActiveCfg = Release|Win32
+ {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: trunk/Tools/WebKitTestRunner/win/WebKitTestRunner.vcproj (104187 => 104188)
--- trunk/Tools/WebKitTestRunner/win/WebKitTestRunner.vcproj 2012-01-05 19:53:47 UTC (rev 104187)
+++ trunk/Tools/WebKitTestRunner/win/WebKitTestRunner.vcproj 2012-01-05 19:54:46 UTC (rev 104188)
@@ -17,7 +17,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- ConfigurationType="1"
+ ConfigurationType="2"
InheritedPropertySheets=".\WebKitTestRunnerDebug.vsprops"
CharacterSet="1"
>
@@ -78,7 +78,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- ConfigurationType="1"
+ ConfigurationType="2"
InheritedPropertySheets=".\WebKitTestRunnerRelease.vsprops"
CharacterSet="1"
>
@@ -139,7 +139,7 @@
</Configuration>
<Configuration
Name="Debug_All|Win32"
- ConfigurationType="1"
+ ConfigurationType="2"
InheritedPropertySheets=".\WebKitTestRunnerDebugAll.vsprops"
CharacterSet="1"
>
@@ -200,7 +200,7 @@
</Configuration>
<Configuration
Name="Debug_Cairo_CFLite|Win32"
- ConfigurationType="1"
+ ConfigurationType="2"
InheritedPropertySheets=".\WebKitTestRunnerDebugCairoCFLite.vsprops"
CharacterSet="1"
>
@@ -261,7 +261,7 @@
</Configuration>
<Configuration
Name="Release_Cairo_CFLite|Win32"
- ConfigurationType="1"
+ ConfigurationType="2"
InheritedPropertySheets=".\WebKitTestRunnerReleaseCairoCFLite.vsprops"
CharacterSet="1"
>
@@ -322,7 +322,7 @@
</Configuration>
<Configuration
Name="Production|Win32"
- ConfigurationType="1"
+ ConfigurationType="2"
InheritedPropertySheets=".\WebKitTestRunnerProduction.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
Copied: trunk/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncher.vcproj (from rev 104187, trunk/Tools/WebKitTestRunner/win/WebKitTestRunner.vcproj) (0 => 104188)
--- trunk/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncher.vcproj (rev 0)
+++ trunk/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncher.vcproj 2012-01-05 19:54:46 UTC (rev 104188)
@@ -0,0 +1,396 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="WebKitTestRunnerLauncher"
+ ProjectGUID="{C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}"
+ RootNamespace="WebKitTestRunnerLauncher"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\WebKitTestRunnerLauncherDebug.vsprops"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\WebKitTestRunnerLauncherRelease.vsprops"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug_Cairo_CFLite|Win32"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\WebKitTestRunnerLauncherDebugCairoCFLite.vsprops"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug_All|Win32"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\WebKitTestRunnerLauncherDebugAll.vsprops"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Production|Win32"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\WebKitTestRunnerLauncherProduction.vsprops"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release_Cairo_CFLite|Win32"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\WebKitTestRunnerLauncherReleaseCairoCFLite.vsprops"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\win\DLLLauncher\DLLLauncherMain.cpp"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Added: trunk/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherCommon.vsprops (0 => 104188)
--- trunk/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherCommon.vsprops (rev 0)
+++ trunk/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherCommon.vsprops 2012-01-05 19:54:46 UTC (rev 104188)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="WebKitTestRunnerLauncherCommon"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="USE_CONSOLE_ENTRY_POINT"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="shlwapi.lib"
+ OutputFile="$(OutDir)\WebKitTestRunner$(WebKitConfigSuffix).exe"
+ ProgramDatabaseFile="$(TargetDir)$(TargetName)Launcher.pdb"
+ SubSystem="1"
+ />
+</VisualStudioPropertySheet>
Added: trunk/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherDebug.vsprops (0 => 104188)
--- trunk/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherDebug.vsprops (rev 0)
+++ trunk/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherDebug.vsprops 2012-01-05 19:54:46 UTC (rev 104188)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="WebKitTestRunnerLauncherDebug"
+ InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\WebKitTestRunnerLauncherCommon.vsprops"
+ >
+</VisualStudioPropertySheet>
Added: trunk/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherDebugAll.vsprops (0 => 104188)
--- trunk/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherDebugAll.vsprops (rev 0)
+++ trunk/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherDebugAll.vsprops 2012-01-05 19:54:46 UTC (rev 104188)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="WebKitTestRunnerLauncherDebugAll"
+ InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_all.vsprops;.\WebKitTestRunnerLauncherCommon.vsprops"
+ >
+</VisualStudioPropertySheet>
Added: trunk/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherDebugCairoCFLite.vsprops (0 => 104188)
--- trunk/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherDebugCairoCFLite.vsprops (rev 0)
+++ trunk/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherDebugCairoCFLite.vsprops 2012-01-05 19:54:46 UTC (rev 104188)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="WebKitTestRunnerDebugCairoCFLite"
+ InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops"
+ >
+</VisualStudioPropertySheet>
Added: trunk/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherProduction.vsprops (0 => 104188)
--- trunk/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherProduction.vsprops (rev 0)
+++ trunk/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherProduction.vsprops 2012-01-05 19:54:46 UTC (rev 104188)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="WebKitTestRunnerLauncherProduction"
+ InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\production.vsprops;.\WebKitTestRunnerLauncherCommon.vsprops"
+ >
+</VisualStudioPropertySheet>
Added: trunk/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherRelease.vsprops (0 => 104188)
--- trunk/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherRelease.vsprops (rev 0)
+++ trunk/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherRelease.vsprops 2012-01-05 19:54:46 UTC (rev 104188)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="WebKitTestRunnerLauncherRelease"
+ InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\WebKitTestRunnerLauncherCommon.vsprops"
+ >
+</VisualStudioPropertySheet>
Added: trunk/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherReleaseCairoCFLite.vsprops (0 => 104188)
--- trunk/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherReleaseCairoCFLite.vsprops (rev 0)
+++ trunk/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherReleaseCairoCFLite.vsprops 2012-01-05 19:54:46 UTC (rev 104188)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="WebKitTestRunnerLauncherReleaseCairoCFLite"
+ InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\WebKitTestRunnerLauncherCommon.vsprops"
+ >
+</VisualStudioPropertySheet>
Modified: trunk/Tools/WebKitTestRunner/win/main.cpp (104187 => 104188)
--- trunk/Tools/WebKitTestRunner/win/main.cpp 2012-01-05 19:53:47 UTC (rev 104187)
+++ trunk/Tools/WebKitTestRunner/win/main.cpp 2012-01-05 19:54:46 UTC (rev 104188)
@@ -27,7 +27,7 @@
#include "TestController.h"
-int main(int argc, const char* argv[])
+extern "C" __declspec(dllexport) int WINAPI dllLauncherEntryPoint(int argc, const char* argv[])
{
{
WTR::TestController controller(argc, argv);
