Skip to content
Permalink
Browse files
Turn WebKitTestRunner into a stub .exe launcher and a .dll that conta…
…ins 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.

Tools:

* 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.

Source/WebKit/win:

Add WebKitTestRunnerLauncher to WebKit.sln.

It builds just after WebKitTestRunner.

* WebKit.vcproj/WebKit.sln:

Canonical link: https://commits.webkit.org/92431@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@104188 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
aroben committed Jan 5, 2012
1 parent 2976a34 commit 9e3f48e9c4e5f9d1d2534daecbaae414d67836f5
Showing 15 changed files with 562 additions and 8 deletions.
@@ -1,3 +1,16 @@
2012-01-05 Adam Roben <aroben@apple.com>

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 <aroben@apple.com>

Add DumpRenderTreeLauncher to WebKit.sln.
@@ -145,7 +145,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestWebKitAPIInjectedBundle
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 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DumpRenderTreeLauncher", ".
{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 @@ Global
{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 @@ Global
{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
@@ -1,3 +1,37 @@
2012-01-05 Adam Roben <aroben@apple.com>

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 <aroben@apple.com>

Turn DumpRenderTree into a stub .exe launcher and a .dll that contains all the real code
@@ -15,6 +15,7 @@
Name="VCLinkerTool"
AdditionalOptions="/NXCOMPAT"
AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib shlwapi.lib"
OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll"
SubSystem="1"
/>
</VisualStudioPropertySheet>
@@ -19,6 +19,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InjectedBundle", "win\Injec
EndProjectSection
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
@@ -71,6 +81,22 @@ Global
{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
@@ -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"

0 comments on commit 9e3f48e

Please sign in to comment.