Skip to content

Commit

Permalink
Adding support for native events on Firefox 19.
Browse files Browse the repository at this point in the history 
This includes updated prebuilts for Windows. Linux prebuilts have been
manipulated to not break previous version of Firefox, but new prebuilts
will need to be built.

This updates the Gecko 18 SDK to download 18.0.2, and enables the Gecko 19
SDK downloads.

This renames the webdriver-firefox-10 specific binaries to
webdriver-firefox-esr-previous, and introduces
webdriver-firefox-esr-latest binary shared libraries.
  • Loading branch information
@jimevans
jimevans committed Feb 19, 2013
1 parent 3c06165 commit 2282f24
Show file tree
Hide file tree
Showing 16 changed files with 621 additions and 349 deletions.
24 changes: 18 additions & 6 deletions Rakefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -412,16 +412,28 @@ GeckoSDKs.new do |sdks|
'5c0a467a581778bda72a6a3daea2f8f0'

sdks.add 'third_party/gecko-18/linux',
'http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/18.0/sdk/xulrunner-18.0.en-US.linux-i686.sdk.tar.bz2',
'951523ecb15bc94034dacaed62d5f693'
'http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/18.0.2/sdk/xulrunner-18.0.2.en-US.linux-i686.sdk.tar.bz2',
'd8a67c4c841a26b3af3dcb98e06bef18'

sdks.add 'third_party/gecko-18/linux64',
'http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/18.0/sdk/xulrunner-18.0.en-US.linux-x86_64.sdk.tar.bz2',
'd237409022e2f4fb208236541160c31f'
'http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/18.0.2/sdk/xulrunner-18.0.2.en-US.linux-x86_64.sdk.tar.bz2',
'655ed52cff27a8afacee180eceaa2f3d'

sdks.add 'third_party/gecko-18/win32',
'http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/18.0/sdk/xulrunner-18.0.en-US.win32.sdk.zip',
'1525d3ef5d7a576694cff31f7f60bea8'
'http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/18.0.2/sdk/xulrunner-18.0.2.en-US.win32.sdk.zip',
'ce4965e2660052c6a06ad50a10b3f97d'

sdks.add 'third_party/gecko-19/linux',
'http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/19.0/sdk/xulrunner-19.0.en-US.linux-i686.sdk.tar.bz2',
'9e7decd8866eb7b66afe6ed1a0e8d941'

sdks.add 'third_party/gecko-19/linux64',
'http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/19.0/sdk/xulrunner-19.0.en-US.linux-x86_64.sdk.tar.bz2',
'fb27bc9cbf9109469f0247c1ba1812e5'

sdks.add 'third_party/gecko-19/win32',
'http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/19.0/sdk/xulrunner-19.0.en-US.win32.sdk.zip',
'44e7c7f9dda4dc08a294d66c504361be'
end

task :'selenium-server_zip' do
Expand Down
36 changes: 36 additions & 0 deletions WebDriver.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webdriver-firefox-10", "cpp
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebDriver.PhantomJS.Tests", "dotnet\test\WebDriver.PhantomJS.Tests\WebDriver.PhantomJS.Tests.csproj", "{2329720E-A694-4A6F-B4E6-EDEA911298E0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webdriver-firefox-esr-previous", "cpp\webdriver-firefox\webdriver-firefox-esr-previous.vcxproj", "{D137A27D-8324-4024-97FC-D2D29E3EFE60}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webdriver-firefox-esr-latest", "cpp\webdriver-firefox\webdriver-firefox-esr-latest.vcxproj", "{15097CC6-2D02-450E-93CF-3F4822EE64E7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
Expand Down Expand Up @@ -474,6 +478,38 @@ Global
{2329720E-A694-4A6F-B4E6-EDEA911298E0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{2329720E-A694-4A6F-B4E6-EDEA911298E0}.Release|Win32.ActiveCfg = Release|Any CPU
{2329720E-A694-4A6F-B4E6-EDEA911298E0}.Release|x64.ActiveCfg = Release|Any CPU
{D137A27D-8324-4024-97FC-D2D29E3EFE60}.Debug|.NET.ActiveCfg = Debug|x64
{D137A27D-8324-4024-97FC-D2D29E3EFE60}.Debug|Any CPU.ActiveCfg = Debug|x64
{D137A27D-8324-4024-97FC-D2D29E3EFE60}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
{D137A27D-8324-4024-97FC-D2D29E3EFE60}.Debug|Mixed Platforms.Build.0 = Debug|x64
{D137A27D-8324-4024-97FC-D2D29E3EFE60}.Debug|Win32.ActiveCfg = Debug|Win32
{D137A27D-8324-4024-97FC-D2D29E3EFE60}.Debug|Win32.Build.0 = Debug|Win32
{D137A27D-8324-4024-97FC-D2D29E3EFE60}.Debug|x64.ActiveCfg = Debug|x64
{D137A27D-8324-4024-97FC-D2D29E3EFE60}.Debug|x64.Build.0 = Debug|x64
{D137A27D-8324-4024-97FC-D2D29E3EFE60}.Release|.NET.ActiveCfg = Release|x64
{D137A27D-8324-4024-97FC-D2D29E3EFE60}.Release|Any CPU.ActiveCfg = Release|x64
{D137A27D-8324-4024-97FC-D2D29E3EFE60}.Release|Mixed Platforms.ActiveCfg = Release|x64
{D137A27D-8324-4024-97FC-D2D29E3EFE60}.Release|Mixed Platforms.Build.0 = Release|x64
{D137A27D-8324-4024-97FC-D2D29E3EFE60}.Release|Win32.ActiveCfg = Release|Win32
{D137A27D-8324-4024-97FC-D2D29E3EFE60}.Release|Win32.Build.0 = Release|Win32
{D137A27D-8324-4024-97FC-D2D29E3EFE60}.Release|x64.ActiveCfg = Release|x64
{D137A27D-8324-4024-97FC-D2D29E3EFE60}.Release|x64.Build.0 = Release|x64
{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Debug|.NET.ActiveCfg = Debug|x64
{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Debug|Any CPU.ActiveCfg = Debug|x64
{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Debug|Mixed Platforms.Build.0 = Debug|x64
{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Debug|Win32.ActiveCfg = Debug|Win32
{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Debug|Win32.Build.0 = Debug|Win32
{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Debug|x64.ActiveCfg = Debug|x64
{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Debug|x64.Build.0 = Debug|x64
{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Release|.NET.ActiveCfg = Release|x64
{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Release|Any CPU.ActiveCfg = Release|x64
{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Release|Mixed Platforms.ActiveCfg = Release|x64
{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Release|Mixed Platforms.Build.0 = Release|x64
{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Release|Win32.ActiveCfg = Release|Win32
{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Release|Win32.Build.0 = Release|Win32
{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Release|x64.ActiveCfg = Release|x64
{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
45 changes: 34 additions & 11 deletions cpp/build.desc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,31 @@ visualc_library(name = "firefox_dll",
out = "Win32/Release/webdriver-firefox.dll"
)

visualc_library(name = "firefox10_dll",
visualc_library(name = "firefoxprevious_esr_dll",
platform = "Win32",
project = "webdriver-firefox/webdriver-firefox-10.vcxproj",
project = "webdriver-firefox/webdriver-firefox-esr-previous.vcxproj",
file_deps = "third_party/gecko-10/win32",
out = "Win32/Release/webdriver-firefox-10.dll"
out = "Win32/Release/webdriver-firefox-esr-previous.dll"
)

visualc_library(name = "firefoxlatest_esr_dll",
platform = "Win32",
project = "webdriver-firefox/webdriver-firefox-esr-latest.vcxproj",
file_deps = "third_party/gecko-10/win32",
out = "Win32/Release/webdriver-firefox-esr-latest.dll"
)

visualc_library(name = "firefoxprevious_dll",
platform = "Win32",
project = "webdriver-firefox/webdriver-firefox-previous.vcxproj",
file_deps = "third_party/gecko-17/win32",
file_deps = "third_party/gecko-18/win32",
out = "Win32/Release/webdriver-firefox-previous.dll"
)

visualc_library(name = "firefoxlatest_dll",
platform = "Win32",
project = "webdriver-firefox/webdriver-firefox-latest.vcxproj",
file_deps = "third_party/gecko-18/win32",
file_deps = "third_party/gecko-19/win32",
out = "Win32/Release/webdriver-firefox-latest.dll"
)

Expand All @@ -49,50 +56,66 @@ mozilla_lib(name = "webdriver_firefox_ff3",

# Firefox 10 is an ESR release. We probably want to allow an overlap when the
# next ESR release is made.
mozilla_lib(name = "webdriver_firefox_10",
mozilla_lib(name = "webdriver_firefox_esr_previous",
srcs = [
"webdriver-interactions/*_linux*.cpp",
"webdriver-interactions/interactions_common.*",
"webdriver-firefox/*.cpp"],
arch = "i386",
geckoversion="10")

mozilla_lib(name = "webdriver_firefox_10_64",
mozilla_lib(name = "webdriver_firefox_esr_previous_64",
srcs = [
"webdriver-interactions/*_linux*.cpp",
"webdriver-interactions/interactions_common.*",
"webdriver-firefox/*.cpp"],
arch = "amd64",
geckoversion="10")

mozilla_lib(name = "webdriver_firefox_esr_latest",
srcs = [
"webdriver-interactions/*_linux*.cpp",
"webdriver-interactions/interactions_common.*",
"webdriver-firefox/*.cpp"],
arch = "i386",
geckoversion="17")

mozilla_lib(name = "webdriver_firefox_esr_latest_64",
srcs = [
"webdriver-interactions/*_linux*.cpp",
"webdriver-interactions/interactions_common.*",
"webdriver-firefox/*.cpp"],
arch = "amd64",
geckoversion="17")


mozilla_lib(name = "webdriver_firefox_previous",
srcs = [ "webdriver-interactions/*_linux*.cpp",
"webdriver-interactions/interactions_common.*",
"webdriver-firefox/*.cpp"],
arch = "i386",
geckoversion="17")
geckoversion="18")

mozilla_lib(name = "webdriver_firefox_previous_64",
srcs = [ "webdriver-interactions/*_linux*.cpp",
"webdriver-interactions/interactions_common.*",
"webdriver-firefox/*.cpp"],
arch = "amd64",
geckoversion="17")
geckoversion="18")

mozilla_lib(name = "webdriver_firefox_latest",
srcs = [ "webdriver-interactions/*_linux*.cpp",
"webdriver-interactions/interactions_common.*",
"webdriver-firefox/*.cpp"],
arch = "i386",
geckoversion="18")
geckoversion="19")

mozilla_lib(name = "webdriver_firefox_latest_64",
srcs = [ "webdriver-interactions/*_linux*.cpp",
"webdriver-interactions/interactions_common.*",
"webdriver-firefox/*.cpp"],
arch = "amd64",
geckoversion="18")
geckoversion="19")

gcc_library(name = "noblur",
srcs = [ "linux-specific/*.c" ],
Expand Down
Binary file added cpp/prebuilt/amd64/libwebdriver_firefox_esr_latest_64.so
View file
Binary file not shown.
0 ...built/amd64/libwebdriver_firefox_10_64.so → ...4/libwebdriver_firefox_esr_previous_64.so
100755 → 100644
View file
File renamed without changes.
Binary file modified cpp/prebuilt/amd64/libwebdriver_firefox_previous_64.so
View file
Binary file not shown.
Binary file added cpp/prebuilt/i386/libwebdriver_firefox_esr_latest.so
View file
Binary file not shown.
0 cpp/prebuilt/i386/libwebdriver_firefox_10.so → ...i386/libwebdriver_firefox_esr_previous.so
100755 → 100644
View file
File renamed without changes.
Binary file modified cpp/prebuilt/i386/libwebdriver_firefox_previous.so
View file
Binary file not shown.
Loading

0 comments on commit 2282f24

Please sign in to comment.