Skip to content

Commit

Permalink
JimEvans: Changing the name of the standalone IE driver server from I…
Browse files Browse the repository at this point in the history
…nternetExplorerDriver.exe to IEDriverServer.exe

r16528
  • Loading branch information
jimevans committed Apr 10, 2012
1 parent d03a509 commit c6b97f0
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 27 deletions.
32 changes: 16 additions & 16 deletions WebDriver.sln
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webdriver-firefox-latest",
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webdriver-firefox-previous", "cpp\webdriver-firefox\webdriver-firefox-previous.vcxproj", "{322CD167-C8F9-4E13-8F8A-DFAE834255AA}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InternetExplorerDriver", "cpp\InternetExplorerDriver\InternetExplorerDriver.vcxproj", "{08C3286F-F132-44EC-80F0-2DF30D87A5D3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebDriver.Safari.Tests", "dotnet\test\WebDriver.Safari.Tests\WebDriver.Safari.Tests.csproj", "{92551430-7C30-421B-A81E-0B08163AC59C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEDriverServer", "cpp\IEDriverServer\IEDriverServer.vcxproj", "{08C3286F-F132-44EC-80F0-2DF30D87A5D3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
Expand Down Expand Up @@ -460,6 +460,20 @@ Global
{322CD167-C8F9-4E13-8F8A-DFAE834255AA}.Release|Win32.ActiveCfg = Release|Win32
{322CD167-C8F9-4E13-8F8A-DFAE834255AA}.Release|Win32.Build.0 = Release|Win32
{322CD167-C8F9-4E13-8F8A-DFAE834255AA}.Release|x64.ActiveCfg = Release|x64
{92551430-7C30-421B-A81E-0B08163AC59C}.Debug|.NET.ActiveCfg = Debug|Any CPU
{92551430-7C30-421B-A81E-0B08163AC59C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{92551430-7C30-421B-A81E-0B08163AC59C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{92551430-7C30-421B-A81E-0B08163AC59C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{92551430-7C30-421B-A81E-0B08163AC59C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{92551430-7C30-421B-A81E-0B08163AC59C}.Debug|Win32.ActiveCfg = Debug|Any CPU
{92551430-7C30-421B-A81E-0B08163AC59C}.Debug|x64.ActiveCfg = Debug|Any CPU
{92551430-7C30-421B-A81E-0B08163AC59C}.Release|.NET.ActiveCfg = Release|Any CPU
{92551430-7C30-421B-A81E-0B08163AC59C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{92551430-7C30-421B-A81E-0B08163AC59C}.Release|Any CPU.Build.0 = Release|Any CPU
{92551430-7C30-421B-A81E-0B08163AC59C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{92551430-7C30-421B-A81E-0B08163AC59C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{92551430-7C30-421B-A81E-0B08163AC59C}.Release|Win32.ActiveCfg = Release|Any CPU
{92551430-7C30-421B-A81E-0B08163AC59C}.Release|x64.ActiveCfg = Release|Any CPU
{08C3286F-F132-44EC-80F0-2DF30D87A5D3}.Debug|.NET.ActiveCfg = Debug|x64
{08C3286F-F132-44EC-80F0-2DF30D87A5D3}.Debug|Any CPU.ActiveCfg = Debug|x64
{08C3286F-F132-44EC-80F0-2DF30D87A5D3}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
Expand All @@ -476,20 +490,6 @@ Global
{08C3286F-F132-44EC-80F0-2DF30D87A5D3}.Release|Win32.Build.0 = Release|Win32
{08C3286F-F132-44EC-80F0-2DF30D87A5D3}.Release|x64.ActiveCfg = Release|x64
{08C3286F-F132-44EC-80F0-2DF30D87A5D3}.Release|x64.Build.0 = Release|x64
{92551430-7C30-421B-A81E-0B08163AC59C}.Debug|.NET.ActiveCfg = Debug|Any CPU
{92551430-7C30-421B-A81E-0B08163AC59C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{92551430-7C30-421B-A81E-0B08163AC59C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{92551430-7C30-421B-A81E-0B08163AC59C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{92551430-7C30-421B-A81E-0B08163AC59C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{92551430-7C30-421B-A81E-0B08163AC59C}.Debug|Win32.ActiveCfg = Debug|Any CPU
{92551430-7C30-421B-A81E-0B08163AC59C}.Debug|x64.ActiveCfg = Debug|Any CPU
{92551430-7C30-421B-A81E-0B08163AC59C}.Release|.NET.ActiveCfg = Release|Any CPU
{92551430-7C30-421B-A81E-0B08163AC59C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{92551430-7C30-421B-A81E-0B08163AC59C}.Release|Any CPU.Build.0 = Release|Any CPU
{92551430-7C30-421B-A81E-0B08163AC59C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{92551430-7C30-421B-A81E-0B08163AC59C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{92551430-7C30-421B-A81E-0B08163AC59C}.Release|Win32.ActiveCfg = Release|Any CPU
{92551430-7C30-421B-A81E-0B08163AC59C}.Release|x64.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
File renamed without changes.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -165,22 +165,22 @@
<ClInclude Include="targetver.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="InternetExplorerDriver.cpp" />
<ClCompile Include="IEDriverServer.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="InternetExplorerDriver.rc" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\IEDriver\IEDriver.vcxproj">
<Project>{bb72383b-427f-4191-b692-e4345a30e33c}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="IEDriverServer.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
<ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="InternetExplorerDriver.cpp">
<ClCompile Include="IEDriverServer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="InternetExplorerDriver.rc">
<ResourceCompile Include="IEDriverServer.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions cpp/build.desc
Original file line number Diff line number Diff line change
Expand Up @@ -191,17 +191,17 @@ visualc_library(name = "ie_win32_exe",
":ie_win32_dll"
],
platform = "Win32",
project = "InternetExplorerDriver/InternetExplorerDriver.vcxproj",
out = "Win32/Release/InternetExplorerDriver.exe"
project = "InternetExplorerDriver/IEDriverServer.vcxproj",
out = "Win32/Release/IEDriverServer.exe"
)

visualc_library(name = "ie_x64_exe",
deps = [
":ie_x64_dll"
],
platform = "x64",
project = "InternetExplorerDriver/InternetExplorerDriver.vcxproj",
out = "x64/Release/InternetExplorerDriver.exe"
project = "InternetExplorerDriver/IEDriverServer.vcxproj",
out = "x64/Release/IEDriverServer.exe"
)

js_fragment_header(name = "atoms",
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/WebDriver/IE/InternetExplorerDriverService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace OpenQA.Selenium.IE
/// </summary>
public sealed class InternetExplorerDriverService : DriverService
{
private const string InternetExplorerDriverServiceFileName = "InternetExplorerDriver.exe";
private const string InternetExplorerDriverServiceFileName = "IEDriverServer.exe";
private const string InternetExplorerDriverDownloadUrl = "http://code.google.com/p/selenium/downloads/list";

/// <summary>
Expand Down

0 comments on commit c6b97f0

Please sign in to comment.