diff --git a/Rakefile b/Rakefile index 0dc5893986ce4..b1395c059640b 100644 --- a/Rakefile +++ b/Rakefile @@ -307,6 +307,11 @@ GeckoSDKs.new do |sdks| sdks.add 'third_party/gecko-7/linux64', 'http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/7.0.1/sdk/xulrunner-7.0.1.en-US.linux-x86_64.sdk.tar.bz2', '6c4f4283650fe5d998f6450a5bd1817b' + + sdks.add 'third_party/gecko-7/win32', + 'http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/7.0/sdk/xulrunner-7.0.en-US.win32.sdk.zip', + 'd9c366d3dd54e020e372841053806f5d' + end task :'selenium-server_zip' do diff --git a/WebDriver.sln b/WebDriver.sln index bf3158ecdf366..fa9edafceac90 100644 --- a/WebDriver.sln +++ b/WebDriver.sln @@ -68,6 +68,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webdriver-server", "cpp\web EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webdriver-firefox-6", "cpp\webdriver-firefox\webdriver-firefox-6.vcxproj", "{705CA982-A18B-4BCA-80B7-1F6DE6883BE8}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webdriver-firefox-7", "cpp\webdriver-firefox\webdriver-firefox-7.vcxproj", "{49D8D0ED-7FD9-4421-A6D1-B411152ECB5E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -408,6 +410,22 @@ Global {705CA982-A18B-4BCA-80B7-1F6DE6883BE8}.Release|Win32.Build.0 = Release|Win32 {705CA982-A18B-4BCA-80B7-1F6DE6883BE8}.Release|x64.ActiveCfg = Release|x64 {705CA982-A18B-4BCA-80B7-1F6DE6883BE8}.Release|x64.Build.0 = Release|x64 + {49D8D0ED-7FD9-4421-A6D1-B411152ECB5E}.Debug|.NET.ActiveCfg = Debug|x64 + {49D8D0ED-7FD9-4421-A6D1-B411152ECB5E}.Debug|Any CPU.ActiveCfg = Debug|x64 + {49D8D0ED-7FD9-4421-A6D1-B411152ECB5E}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {49D8D0ED-7FD9-4421-A6D1-B411152ECB5E}.Debug|Mixed Platforms.Build.0 = Debug|x64 + {49D8D0ED-7FD9-4421-A6D1-B411152ECB5E}.Debug|Win32.ActiveCfg = Debug|Win32 + {49D8D0ED-7FD9-4421-A6D1-B411152ECB5E}.Debug|Win32.Build.0 = Debug|Win32 + {49D8D0ED-7FD9-4421-A6D1-B411152ECB5E}.Debug|x64.ActiveCfg = Debug|x64 + {49D8D0ED-7FD9-4421-A6D1-B411152ECB5E}.Debug|x64.Build.0 = Debug|x64 + {49D8D0ED-7FD9-4421-A6D1-B411152ECB5E}.Release|.NET.ActiveCfg = Release|x64 + {49D8D0ED-7FD9-4421-A6D1-B411152ECB5E}.Release|Any CPU.ActiveCfg = Release|x64 + {49D8D0ED-7FD9-4421-A6D1-B411152ECB5E}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {49D8D0ED-7FD9-4421-A6D1-B411152ECB5E}.Release|Mixed Platforms.Build.0 = Release|x64 + {49D8D0ED-7FD9-4421-A6D1-B411152ECB5E}.Release|Win32.ActiveCfg = Release|Win32 + {49D8D0ED-7FD9-4421-A6D1-B411152ECB5E}.Release|Win32.Build.0 = Release|Win32 + {49D8D0ED-7FD9-4421-A6D1-B411152ECB5E}.Release|x64.ActiveCfg = Release|x64 + {49D8D0ED-7FD9-4421-A6D1-B411152ECB5E}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/cpp/build.desc b/cpp/build.desc index 2b5b49a39a214..c68c269702e56 100644 --- a/cpp/build.desc +++ b/cpp/build.desc @@ -19,6 +19,14 @@ visualc_library(name = "firefox6_dll", out = "Win32/Release/webdriver-firefox-6.dll" ) +visualc_library(name = "firefox7_dll", + platform = "Win32", + project = "webdriver-firefox/webdriver-firefox-7.vcxproj", + file_deps = "third_party/gecko-7/win32", + out = "Win32/Release/webdriver-firefox-7.dll" +) + + mozilla_xpt(name = "native_events_xpt", srcs = [ "webdriver-firefox/nsINativeEvents.idl" ]) diff --git a/cpp/prebuilt/Win32/Release/webdriver-firefox-7.dll b/cpp/prebuilt/Win32/Release/webdriver-firefox-7.dll new file mode 100644 index 0000000000000..979b7b20e44e2 Binary files /dev/null and b/cpp/prebuilt/Win32/Release/webdriver-firefox-7.dll differ diff --git a/cpp/webdriver-firefox/webdriver-firefox-7.vcxproj b/cpp/webdriver-firefox/webdriver-firefox-7.vcxproj new file mode 100644 index 0000000000000..1267070926526 --- /dev/null +++ b/cpp/webdriver-firefox/webdriver-firefox-7.vcxproj @@ -0,0 +1,196 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {49D8D0ED-7FD9-4421-A6D1-B411152ECB5E} + webdriverfirefox + + + + DynamicLibrary + false + Static + Unicode + true + + + DynamicLibrary + false + Static + Unicode + + + DynamicLibrary + false + Static + Unicode + true + + + DynamicLibrary + false + Static + Unicode + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(ProjectDir)..\..\build\cpp\$(Platform)\$(Configuration)\ + $(ProjectDir)..\..\build\cpp\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectDir)..\..\build\cpp\$(Platform)\$(Configuration)\ + $(ProjectDir)..\..\build\cpp\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectDir)..\..\build\cpp\$(Platform)\$(Configuration)\ + $(ProjectDir)..\..\build\cpp\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectDir)..\..\build\cpp\$(Platform)\$(Configuration)\ + $(ProjectDir)..\..\build\cpp\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\ + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + Disabled + $(ProjectDir)..\..\third_party\gecko-7\win32\include;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common + XP_WIN;XP_WIN32;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Level3 + EditAndContinue + + + nspr4.lib;xpcom.lib;xpcomglue_s_nomozalloc.lib;%(AdditionalDependencies) + $(ProjectDir)..\..\third_party\gecko-7\win32\lib;$(OutDir);%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + X64 + + + Disabled + $(ProjectDir)..\..\third_party\gecko-7\win32\include;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common + XP_WIN;XP_WIN32;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + + + nspr4.lib;xpcom.lib;xpcomglue_s_nomozalloc.lib;%(AdditionalDependencies) + $(ProjectDir)..\..\third_party\gecko-7\win32\lib;$(OutDir);%(AdditionalLibraryDirectories) + true + MachineX64 + + + + + MaxSpeed + true + $(ProjectDir)..\..\third_party\gecko-7\win32\include;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common + XP_WIN;XP_WIN32;%(PreprocessorDefinitions) + MultiThreaded + true + Level3 + + + + + nspr4.lib;xpcom.lib;xpcomglue_s_nomozalloc.lib;%(AdditionalDependencies) + $(ProjectDir)..\..\third_party\gecko-7\win32\lib;$(OutDir);%(AdditionalLibraryDirectories) + false + true + true + MachineX86 + + + + + X64 + + + MaxSpeed + true + $(ProjectDir)..\..\third_party\gecko-7\win32\include;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common + XP_WIN;XP_WIN32;%(PreprocessorDefinitions) + MultiThreaded + true + Level3 + ProgramDatabase + + + nspr4.lib;xpcom.lib;xpcomglue_s_nomozalloc.lib;%(AdditionalDependencies) + $(ProjectDir)..\..\third_party\gecko-7\win32\lib;$(OutDir);%(AdditionalLibraryDirectories) + true + true + true + MachineX64 + + + + + {87fa39a1-958e-478a-8ab9-6d5e5aaa3886} + true + true + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/javascript/firefox-driver/build.desc b/javascript/firefox-driver/build.desc index 9cd67420153be..c029da20c88ee 100644 --- a/javascript/firefox-driver/build.desc +++ b/javascript/firefox-driver/build.desc @@ -54,6 +54,7 @@ mozilla_extension(name = "webdriver", { "//cpp:firefox_dll" : "platform/WINNT_x86-msvc/components/webdriver-firefox.dll" }, { "//cpp:firefox5_dll" : "platform/WINNT_x86-msvc/components/webdriver-firefox-5.dll" }, { "//cpp:firefox6_dll" : "platform/WINNT_x86-msvc/components/webdriver-firefox-6.dll" }, + { "//cpp:firefox7_dll" : "platform/WINNT_x86-msvc/components/webdriver-firefox-7.dll" }, { "//cpp:imehandler_dll" : "platform/WINNT_x86-msvc/components/imehandler.dll" }, { "//cpp:webdriver_firefox_ff3" : "platform/Linux_x86-gcc3/components/libwebdriver-firefox-ff3.so" }, { "//cpp:webdriver_firefox_ff4" : "platform/Linux_x86-gcc3/components/libwebdriver-firefox-ff4.so" }, diff --git a/javascript/firefox-driver/extension/chrome.manifest b/javascript/firefox-driver/extension/chrome.manifest index e3603313df6e1..163ac0a0320fc 100644 --- a/javascript/firefox-driver/extension/chrome.manifest +++ b/javascript/firefox-driver/extension/chrome.manifest @@ -42,7 +42,8 @@ contract @googlecode.com/webdriver/syntheticmouse;1 {E8F9FEFE-C513-4097-98BE-BE0 binary-component platform/WINNT_x86-msvc/components/webdriver-firefox.dll ABI=WINNT_x86-msvc appversion<5 binary-component platform/WINNT_x86-msvc/components/webdriver-firefox-5.dll ABI=WINNT_x86-msvc appversion=5.0.1 appversion=5.0 -binary-component platform/WINNT_x86-msvc/components/webdriver-firefox-6.dll ABI=WINNT_x86-msvc appversion>=6 +binary-component platform/WINNT_x86-msvc/components/webdriver-firefox-6.dll ABI=WINNT_x86-msvc appversion=6.0 appversion=6.0.1 appversion=6.0.2 +binary-component platform/WINNT_x86-msvc/components/webdriver-firefox-7.dll ABI=WINNT_x86-msvc appversion>=7 binary-component platform/WINNT_x86-msvc/components/imehandler.dll ABI=WINNT_x86-msvc binary-component platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-ff4.so ABI=Linux_x86_64-gcc3 appversion<5 binary-component platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-ff5.so ABI=Linux_x86_64-gcc3 appversion=5.0.1 appversion=5.0