Changeset 104188 in webkit
- Timestamp:
- Jan 5, 2012 11:54:46 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 7 added
- 7 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/win/ChangeLog
r104187 r104188 1 2012-01-05 Adam Roben <aroben@apple.com> 2 3 Add WebKitTestRunnerLauncher to WebKit.sln. 4 5 It builds just after WebKitTestRunner. 6 7 Part of <http://webkit.org/b/75486> <rdar://problem/10638124> NRWT fails to launch Apple's 8 Windows port of DumpRenderTree/WebKitTestRunner 9 10 Reviewed by Steve Falkenburg. 11 12 * WebKit.vcproj/WebKit.sln: 13 1 14 2012-01-05 Adam Roben <aroben@apple.com> 2 15 -
trunk/Source/WebKit/win/WebKit.vcproj/WebKit.sln
r104187 r104188 146 146 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-md", "..\..\..\ThirdParty\gtest\msvc\gtest-md.vcproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}" 147 147 ProjectSection(ProjectDependencies) = postProject 148 {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040} = {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040} 149 EndProjectSection 150 EndProject 151 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebCoreTestSupport", "..\..\..\WebCore\WebCore.vcproj\WebCoreTestSupport.vcproj", "{83414B15-1C0D-490B-990E-03F4D49170E4}" 152 ProjectSection(ProjectDependencies) = postProject 153 {DD7949B6-F2B4-47C2-9C42-E21E84CB1017} = {DD7949B6-F2B4-47C2-9C42-E21E84CB1017} 154 EndProjectSection 155 EndProject 156 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testRegExp", "..\..\..\JavaScriptCore\JavaScriptCore.vcproj\testRegExp\testRegExp.vcproj", "{14C94979-1ED3-4E1D-9B55-A80FCF4677D0}" 157 ProjectSection(ProjectDependencies) = postProject 158 {C59E5129-B453-49B7-A52B-1E104715F76E} = {C59E5129-B453-49B7-A52B-1E104715F76E} 159 EndProjectSection 160 EndProject 161 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinLauncherLauncher", "..\..\..\..\Tools\WinLauncher\WinLauncherLauncher.vcproj", "{767B10FB-76C1-44D0-8005-85ED7F9AA5E4}" 162 ProjectSection(ProjectDependencies) = postProject 163 {114FCA11-216B-4C8C-957E-30A75AE80443} = {114FCA11-216B-4C8C-957E-30A75AE80443} 164 EndProjectSection 165 EndProject 166 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MiniBrowserLauncher", "..\..\..\..\Tools\MiniBrowser\MiniBrowserLauncher.vcproj", "{7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D}" 167 ProjectSection(ProjectDependencies) = postProject 168 {1480CF5F-4160-47B5-A0E6-96AEC8258FB5} = {1480CF5F-4160-47B5-A0E6-96AEC8258FB5} 169 EndProjectSection 170 EndProject 171 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImageDiffLauncher", "..\..\..\..\Tools\DumpRenderTree\win\ImageDiffLauncher.vcproj", "{DD7949B6-F2B4-47C2-9C42-E21E84CB1017}" 172 ProjectSection(ProjectDependencies) = postProject 173 {59CC0547-70AC-499C-9B19-EC01C6F61137} = {59CC0547-70AC-499C-9B19-EC01C6F61137} 174 EndProjectSection 175 EndProject 176 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DumpRenderTreeLauncher", "..\..\..\..\Tools\DumpRenderTree\win\DumpRenderTreeLauncher.vcproj", "{2974EA02-840B-4995-8719-8920A61006F1}" 177 ProjectSection(ProjectDependencies) = postProject 178 {6567DFD4-D6DE-4CD5-825D-17E353D160E1} = {6567DFD4-D6DE-4CD5-825D-17E353D160E1} 179 EndProjectSection 180 EndProject 181 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKitTestRunnerLauncher", "..\..\..\..\Tools\WebKitTestRunner\win\WebKitTestRunnerLauncher.vcproj", "{C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}" 182 ProjectSection(ProjectDependencies) = postProject 148 183 {3B99669B-1817-443B-BCBE-835580146668} = {3B99669B-1817-443B-BCBE-835580146668} 149 EndProjectSection150 EndProject151 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebCoreTestSupport", "..\..\..\WebCore\WebCore.vcproj\WebCoreTestSupport.vcproj", "{83414B15-1C0D-490B-990E-03F4D49170E4}"152 ProjectSection(ProjectDependencies) = postProject153 {DD7949B6-F2B4-47C2-9C42-E21E84CB1017} = {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}154 EndProjectSection155 EndProject156 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testRegExp", "..\..\..\JavaScriptCore\JavaScriptCore.vcproj\testRegExp\testRegExp.vcproj", "{14C94979-1ED3-4E1D-9B55-A80FCF4677D0}"157 ProjectSection(ProjectDependencies) = postProject158 {C59E5129-B453-49B7-A52B-1E104715F76E} = {C59E5129-B453-49B7-A52B-1E104715F76E}159 EndProjectSection160 EndProject161 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinLauncherLauncher", "..\..\..\..\Tools\WinLauncher\WinLauncherLauncher.vcproj", "{767B10FB-76C1-44D0-8005-85ED7F9AA5E4}"162 ProjectSection(ProjectDependencies) = postProject163 {114FCA11-216B-4C8C-957E-30A75AE80443} = {114FCA11-216B-4C8C-957E-30A75AE80443}164 EndProjectSection165 EndProject166 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MiniBrowserLauncher", "..\..\..\..\Tools\MiniBrowser\MiniBrowserLauncher.vcproj", "{7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D}"167 ProjectSection(ProjectDependencies) = postProject168 {1480CF5F-4160-47B5-A0E6-96AEC8258FB5} = {1480CF5F-4160-47B5-A0E6-96AEC8258FB5}169 EndProjectSection170 EndProject171 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImageDiffLauncher", "..\..\..\..\Tools\DumpRenderTree\win\ImageDiffLauncher.vcproj", "{DD7949B6-F2B4-47C2-9C42-E21E84CB1017}"172 ProjectSection(ProjectDependencies) = postProject173 {59CC0547-70AC-499C-9B19-EC01C6F61137} = {59CC0547-70AC-499C-9B19-EC01C6F61137}174 EndProjectSection175 EndProject176 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DumpRenderTreeLauncher", "..\..\..\..\Tools\DumpRenderTree\win\DumpRenderTreeLauncher.vcproj", "{2974EA02-840B-4995-8719-8920A61006F1}"177 ProjectSection(ProjectDependencies) = postProject178 {6567DFD4-D6DE-4CD5-825D-17E353D160E1} = {6567DFD4-D6DE-4CD5-825D-17E353D160E1}179 184 EndProjectSection 180 185 EndProject … … 595 600 {2974EA02-840B-4995-8719-8920A61006F1}.Release|Win32.ActiveCfg = Release|Win32 596 601 {2974EA02-840B-4995-8719-8920A61006F1}.Release|Win32.Build.0 = Release|Win32 602 {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 603 {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Debug_All|Win32.Build.0 = Debug_All|Win32 604 {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 605 {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 606 {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Debug|Win32.ActiveCfg = Debug|Win32 607 {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Debug|Win32.Build.0 = Debug|Win32 608 {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Production|Win32.ActiveCfg = Production|Win32 609 {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Production|Win32.Build.0 = Production|Win32 610 {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 611 {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 612 {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Release|Win32.ActiveCfg = Release|Win32 613 {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Release|Win32.Build.0 = Release|Win32 597 614 EndGlobalSection 598 615 GlobalSection(SolutionProperties) = preSolution … … 634 651 {DD7949B6-F2B4-47C2-9C42-E21E84CB1017} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459} 635 652 {2974EA02-840B-4995-8719-8920A61006F1} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459} 653 {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459} 636 654 EndGlobalSection 637 655 EndGlobal -
trunk/Tools/ChangeLog
r104187 r104188 1 2012-01-05 Adam Roben <aroben@apple.com> 2 3 Turn WebKitTestRunner into a stub .exe launcher and a .dll that contains all the real code 4 5 This allows us to add the Safari and Apple Application Support directories to PATH before 6 trying to load WebKit so that SafariTheme.dll, CoreGraphics.dll and friends can be found. 7 8 Fixes <http://webkit.org/b/75486> <rdar://problem/10638124> NRWT fails to launch Apple's 9 Windows port of DumpRenderTree/WebKitTestRunner 10 11 Reviewed by Steve Falkenburg. 12 13 * WebKitTestRunner/WebKitTestRunner.sln: Added WebKitTestRunnerLauncher and 14 ImageDiffLauncher, which I forgot to add to this .sln when that project was created. 15 16 * WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops: 17 * WebKitTestRunner/win/WebKitTestRunner.vcproj: 18 Changed to build WebKitTestRunner.dll instead of WebKitTestRunner.exe. 19 20 * WebKitTestRunner/win/WebKitTestRunnerLauncher.vcproj: Copied from 21 Tools/WebKitTestRunner/win/WebKitTestRunner.vcproj but changed to build 22 the stub launcher. 23 24 * WebKitTestRunner/win/WebKitTestRunnerLauncherCommon.vsprops: Added. 25 * WebKitTestRunner/win/WebKitTestRunnerLauncherDebug.vsprops: Added. 26 * WebKitTestRunner/win/WebKitTestRunnerLauncherDebugAll.vsprops: Added. 27 * WebKitTestRunner/win/WebKitTestRunnerLauncherDebugCairoCFLite.vsprops: Added. 28 * WebKitTestRunner/win/WebKitTestRunnerLauncherProduction.vsprops: Added. 29 * WebKitTestRunner/win/WebKitTestRunnerLauncherRelease.vsprops: Added. 30 * WebKitTestRunner/win/WebKitTestRunnerLauncherReleaseCairoCFLite.vsprops: Added. 31 32 * WebKitTestRunner/win/main.cpp: 33 (dllLauncherEntryPoint): Renamed from main. This is what the stub launcher calls. 34 1 35 2012-01-05 Adam Roben <aroben@apple.com> 2 36 -
trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops
r75138 r104188 16 16 AdditionalOptions="/NXCOMPAT" 17 17 AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib shlwapi.lib" 18 OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll" 18 19 SubSystem="1" 19 20 /> -
trunk/Tools/WebKitTestRunner/WebKitTestRunner.sln
r95734 r104188 20 20 EndProject 21 21 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestNetscapePlugin", "..\DumpRenderTree\TestNetscapePlugIn\win\TestNetscapePlugin.vcproj", "{C0737398-3565-439E-A2B8-AB2BE4D5430C}" 22 ProjectSection(ProjectDependencies) = postProject 23 {DD7949B6-F2B4-47C2-9C42-E21E84CB1017} = {DD7949B6-F2B4-47C2-9C42-E21E84CB1017} 24 EndProjectSection 25 EndProject 26 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKitTestRunnerLauncher", "win\WebKitTestRunnerLauncher.vcproj", "{C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}" 27 ProjectSection(ProjectDependencies) = postProject 28 {3B99669B-1817-443B-BCBE-835580146668} = {3B99669B-1817-443B-BCBE-835580146668} 29 EndProjectSection 30 EndProject 31 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImageDiffLauncher", "..\DumpRenderTree\win\ImageDiffLauncher.vcproj", "{DD7949B6-F2B4-47C2-9C42-E21E84CB1017}" 22 32 ProjectSection(ProjectDependencies) = postProject 23 33 {59CC0547-70AC-499C-9B19-EC01C6F61137} = {59CC0547-70AC-499C-9B19-EC01C6F61137} … … 72 82 {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release|Win32.ActiveCfg = Release|Win32 73 83 {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release|Win32.Build.0 = Release|Win32 84 {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 85 {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Debug_All|Win32.Build.0 = Debug_All|Win32 86 {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Debug|Win32.ActiveCfg = Debug|Win32 87 {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Debug|Win32.Build.0 = Debug|Win32 88 {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Production|Win32.ActiveCfg = Production|Win32 89 {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Production|Win32.Build.0 = Production|Win32 90 {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Release|Win32.ActiveCfg = Release|Win32 91 {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Release|Win32.Build.0 = Release|Win32 92 {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 93 {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug_All|Win32.Build.0 = Debug_All|Win32 94 {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug|Win32.ActiveCfg = Debug|Win32 95 {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug|Win32.Build.0 = Debug|Win32 96 {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Production|Win32.ActiveCfg = Production|Win32 97 {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Production|Win32.Build.0 = Production|Win32 98 {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Release|Win32.ActiveCfg = Release|Win32 99 {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Release|Win32.Build.0 = Release|Win32 74 100 EndGlobalSection 75 101 GlobalSection(SolutionProperties) = preSolution -
trunk/Tools/WebKitTestRunner/win/WebKitTestRunner.vcproj
r93355 r104188 18 18 <Configuration 19 19 Name="Debug|Win32" 20 ConfigurationType=" 1"20 ConfigurationType="2" 21 21 InheritedPropertySheets=".\WebKitTestRunnerDebug.vsprops" 22 22 CharacterSet="1" … … 79 79 <Configuration 80 80 Name="Release|Win32" 81 ConfigurationType=" 1"81 ConfigurationType="2" 82 82 InheritedPropertySheets=".\WebKitTestRunnerRelease.vsprops" 83 83 CharacterSet="1" … … 140 140 <Configuration 141 141 Name="Debug_All|Win32" 142 ConfigurationType=" 1"142 ConfigurationType="2" 143 143 InheritedPropertySheets=".\WebKitTestRunnerDebugAll.vsprops" 144 144 CharacterSet="1" … … 201 201 <Configuration 202 202 Name="Debug_Cairo_CFLite|Win32" 203 ConfigurationType=" 1"203 ConfigurationType="2" 204 204 InheritedPropertySheets=".\WebKitTestRunnerDebugCairoCFLite.vsprops" 205 205 CharacterSet="1" … … 262 262 <Configuration 263 263 Name="Release_Cairo_CFLite|Win32" 264 ConfigurationType=" 1"264 ConfigurationType="2" 265 265 InheritedPropertySheets=".\WebKitTestRunnerReleaseCairoCFLite.vsprops" 266 266 CharacterSet="1" … … 323 323 <Configuration 324 324 Name="Production|Win32" 325 ConfigurationType=" 1"325 ConfigurationType="2" 326 326 InheritedPropertySheets=".\WebKitTestRunnerProduction.vsprops" 327 327 CharacterSet="1" -
trunk/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncher.vcproj
r104187 r104188 3 3 ProjectType="Visual C++" 4 4 Version="8.00" 5 Name="WebKitTestRunner "6 ProjectGUID="{ 3B99669B-1817-443B-BCBE-835580146668}"7 RootNamespace="WebKitTestRunner "5 Name="WebKitTestRunnerLauncher" 6 ProjectGUID="{C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}" 7 RootNamespace="WebKitTestRunnerLauncher" 8 8 Keyword="Win32Proj" 9 9 > … … 19 19 Name="Debug|Win32" 20 20 ConfigurationType="1" 21 InheritedPropertySheets=".\WebKitTestRunner Debug.vsprops"21 InheritedPropertySheets=".\WebKitTestRunnerLauncherDebug.vsprops" 22 22 CharacterSet="1" 23 23 > … … 80 80 Name="Release|Win32" 81 81 ConfigurationType="1" 82 InheritedPropertySheets=".\WebKitTestRunnerRelease.vsprops" 82 InheritedPropertySheets=".\WebKitTestRunnerLauncherRelease.vsprops" 83 CharacterSet="1" 84 > 85 <Tool 86 Name="VCPreBuildEventTool" 87 /> 88 <Tool 89 Name="VCCustomBuildTool" 90 /> 91 <Tool 92 Name="VCXMLDataGeneratorTool" 93 /> 94 <Tool 95 Name="VCWebServiceProxyGeneratorTool" 96 /> 97 <Tool 98 Name="VCMIDLTool" 99 /> 100 <Tool 101 Name="VCCLCompilerTool" 102 /> 103 <Tool 104 Name="VCManagedResourceCompilerTool" 105 /> 106 <Tool 107 Name="VCResourceCompilerTool" 108 /> 109 <Tool 110 Name="VCPreLinkEventTool" 111 /> 112 <Tool 113 Name="VCLinkerTool" 114 /> 115 <Tool 116 Name="VCALinkTool" 117 /> 118 <Tool 119 Name="VCManifestTool" 120 /> 121 <Tool 122 Name="VCXDCMakeTool" 123 /> 124 <Tool 125 Name="VCBscMakeTool" 126 /> 127 <Tool 128 Name="VCFxCopTool" 129 /> 130 <Tool 131 Name="VCAppVerifierTool" 132 /> 133 <Tool 134 Name="VCWebDeploymentTool" 135 /> 136 <Tool 137 Name="VCPostBuildEventTool" 138 /> 139 </Configuration> 140 <Configuration 141 Name="Debug_Cairo_CFLite|Win32" 142 ConfigurationType="1" 143 InheritedPropertySheets=".\WebKitTestRunnerLauncherDebugCairoCFLite.vsprops" 83 144 CharacterSet="1" 84 145 > … … 141 202 Name="Debug_All|Win32" 142 203 ConfigurationType="1" 143 InheritedPropertySheets=".\WebKitTestRunnerDebugAll.vsprops" 144 CharacterSet="1" 145 > 146 <Tool 147 Name="VCPreBuildEventTool" 148 /> 149 <Tool 150 Name="VCCustomBuildTool" 151 /> 152 <Tool 153 Name="VCXMLDataGeneratorTool" 154 /> 155 <Tool 156 Name="VCWebServiceProxyGeneratorTool" 157 /> 158 <Tool 159 Name="VCMIDLTool" 160 /> 161 <Tool 162 Name="VCCLCompilerTool" 163 /> 164 <Tool 165 Name="VCManagedResourceCompilerTool" 166 /> 167 <Tool 168 Name="VCResourceCompilerTool" 169 /> 170 <Tool 171 Name="VCPreLinkEventTool" 172 /> 173 <Tool 174 Name="VCLinkerTool" 175 /> 176 <Tool 177 Name="VCALinkTool" 178 /> 179 <Tool 180 Name="VCManifestTool" 181 /> 182 <Tool 183 Name="VCXDCMakeTool" 184 /> 185 <Tool 186 Name="VCBscMakeTool" 187 /> 188 <Tool 189 Name="VCFxCopTool" 190 /> 191 <Tool 192 Name="VCAppVerifierTool" 193 /> 194 <Tool 195 Name="VCWebDeploymentTool" 196 /> 197 <Tool 198 Name="VCPostBuildEventTool" 199 /> 200 </Configuration> 201 <Configuration 202 Name="Debug_Cairo_CFLite|Win32" 203 ConfigurationType="1" 204 InheritedPropertySheets=".\WebKitTestRunnerDebugCairoCFLite.vsprops" 205 CharacterSet="1" 204 InheritedPropertySheets=".\WebKitTestRunnerLauncherDebugAll.vsprops" 205 CharacterSet="1" 206 > 207 <Tool 208 Name="VCPreBuildEventTool" 209 /> 210 <Tool 211 Name="VCCustomBuildTool" 212 /> 213 <Tool 214 Name="VCXMLDataGeneratorTool" 215 /> 216 <Tool 217 Name="VCWebServiceProxyGeneratorTool" 218 /> 219 <Tool 220 Name="VCMIDLTool" 221 /> 222 <Tool 223 Name="VCCLCompilerTool" 224 /> 225 <Tool 226 Name="VCManagedResourceCompilerTool" 227 /> 228 <Tool 229 Name="VCResourceCompilerTool" 230 /> 231 <Tool 232 Name="VCPreLinkEventTool" 233 /> 234 <Tool 235 Name="VCLinkerTool" 236 /> 237 <Tool 238 Name="VCALinkTool" 239 /> 240 <Tool 241 Name="VCManifestTool" 242 /> 243 <Tool 244 Name="VCXDCMakeTool" 245 /> 246 <Tool 247 Name="VCBscMakeTool" 248 /> 249 <Tool 250 Name="VCFxCopTool" 251 /> 252 <Tool 253 Name="VCAppVerifierTool" 254 /> 255 <Tool 256 Name="VCWebDeploymentTool" 257 /> 258 <Tool 259 Name="VCPostBuildEventTool" 260 /> 261 </Configuration> 262 <Configuration 263 Name="Production|Win32" 264 ConfigurationType="1" 265 InheritedPropertySheets=".\WebKitTestRunnerLauncherProduction.vsprops" 266 CharacterSet="1" 267 WholeProgramOptimization="1" 206 268 > 207 269 <Tool … … 263 325 Name="Release_Cairo_CFLite|Win32" 264 326 ConfigurationType="1" 265 InheritedPropertySheets=".\WebKitTestRunnerReleaseCairoCFLite.vsprops" 266 CharacterSet="1" 267 > 268 <Tool 269 Name="VCPreBuildEventTool" 270 /> 271 <Tool 272 Name="VCCustomBuildTool" 273 /> 274 <Tool 275 Name="VCXMLDataGeneratorTool" 276 /> 277 <Tool 278 Name="VCWebServiceProxyGeneratorTool" 279 /> 280 <Tool 281 Name="VCMIDLTool" 282 /> 283 <Tool 284 Name="VCCLCompilerTool" 285 /> 286 <Tool 287 Name="VCManagedResourceCompilerTool" 288 /> 289 <Tool 290 Name="VCResourceCompilerTool" 291 /> 292 <Tool 293 Name="VCPreLinkEventTool" 294 /> 295 <Tool 296 Name="VCLinkerTool" 297 /> 298 <Tool 299 Name="VCALinkTool" 300 /> 301 <Tool 302 Name="VCManifestTool" 303 /> 304 <Tool 305 Name="VCXDCMakeTool" 306 /> 307 <Tool 308 Name="VCBscMakeTool" 309 /> 310 <Tool 311 Name="VCFxCopTool" 312 /> 313 <Tool 314 Name="VCAppVerifierTool" 315 /> 316 <Tool 317 Name="VCWebDeploymentTool" 318 /> 319 <Tool 320 Name="VCPostBuildEventTool" 321 /> 322 </Configuration> 323 <Configuration 324 Name="Production|Win32" 325 ConfigurationType="1" 326 InheritedPropertySheets=".\WebKitTestRunnerProduction.vsprops" 327 CharacterSet="1" 328 WholeProgramOptimization="1" 327 InheritedPropertySheets=".\WebKitTestRunnerLauncherReleaseCairoCFLite.vsprops" 328 CharacterSet="1" 329 329 > 330 330 <Tool … … 387 387 </References> 388 388 <Files> 389 <Filter390 Name="win"391 >392 <File393 RelativePath=".\main.cpp"394 >395 </File>396 <File397 RelativePath=".\PlatformWebViewWin.cpp"398 >399 </File>400 <File401 RelativePath=".\TestControllerWin.cpp"402 >403 </File>404 <File405 RelativePath=".\TestInvocationWin.cpp"406 >407 </File>408 </Filter>409 <Filter410 Name="cg"411 >412 <File413 RelativePath="..\cg\TestInvocationCG.cpp"414 >415 <FileConfiguration416 Name="Debug_Cairo_CFLite|Win32"417 ExcludedFromBuild="true"418 >419 <Tool420 Name="VCCLCompilerTool"421 />422 </FileConfiguration>423 <FileConfiguration424 Name="Release_Cairo_CFLite|Win32"425 ExcludedFromBuild="true"426 >427 <Tool428 Name="VCCLCompilerTool"429 />430 </FileConfiguration>431 </File>432 </Filter>433 <Filter434 Name="cairo"435 >436 <File437 RelativePath="..\cairo\TestInvocationCairo.cpp"438 >439 <FileConfiguration440 Name="Debug|Win32"441 ExcludedFromBuild="true"442 >443 <Tool444 Name="VCCLCompilerTool"445 />446 </FileConfiguration>447 <FileConfiguration448 Name="Release|Win32"449 ExcludedFromBuild="true"450 >451 <Tool452 Name="VCCLCompilerTool"453 />454 </FileConfiguration>455 <FileConfiguration456 Name="Debug_All|Win32"457 ExcludedFromBuild="true"458 >459 <Tool460 Name="VCCLCompilerTool"461 />462 </FileConfiguration>463 <FileConfiguration464 Name="Production|Win32"465 ExcludedFromBuild="true"466 >467 <Tool468 Name="VCCLCompilerTool"469 />470 </FileConfiguration>471 </File>472 </Filter>473 389 <File 474 RelativePath="..\CyclicRedundancyCheck.cpp" 475 > 476 </File> 477 <File 478 RelativePath="..\CyclicRedundancyCheck.h" 479 > 480 </File> 481 <File 482 RelativePath="..\PixelDumpSupport.cpp" 483 > 484 </File> 485 <File 486 RelativePath="..\PixelDumpSupport.h" 487 > 488 </File> 489 <File 490 RelativePath="..\PlatformWebView.h" 491 > 492 </File> 493 <File 494 RelativePath="..\TestController.cpp" 495 > 496 </File> 497 <File 498 RelativePath="..\TestController.h" 499 > 500 </File> 501 <File 502 RelativePath="..\TestInvocation.cpp" 503 > 504 </File> 505 <File 506 RelativePath="..\TestInvocation.h" 507 > 508 </File> 509 <File 510 RelativePath="..\WebKitTestRunnerPrefix.h" 390 RelativePath="..\..\win\DLLLauncher\DLLLauncherMain.cpp" 511 391 > 512 392 </File> -
trunk/Tools/WebKitTestRunner/win/main.cpp
r81135 r104188 28 28 #include "TestController.h" 29 29 30 int main(int argc, const char* argv[])30 extern "C" __declspec(dllexport) int WINAPI dllLauncherEntryPoint(int argc, const char* argv[]) 31 31 { 32 32 {
Note: See TracChangeset
for help on using the changeset viewer.