Skip to content

Commit bb1c876

Browse files
committed
don't build firefox native events anymore (will speed up travis ci pull request checks)
1 parent ee3722a commit bb1c876

File tree

3 files changed

+13
-65
lines changed

3 files changed

+13
-65
lines changed

Rakefile

-2
Original file line numberDiff line numberDiff line change
@@ -559,8 +559,6 @@ end
559559

560560
namespace :node do
561561
task :deploy => [
562-
"//cpp:noblur",
563-
"//cpp:noblur64",
564562
"//javascript/firefox-driver:webdriver",
565563
"//javascript/safari-driver:client",
566564
"//javascript/webdriver:asserts_lib",

java/client/src/org/openqa/selenium/firefox/build.desc

-46
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,8 @@ java_library(name = "firefox",
1313
"//third_party/java/commons-exec",
1414
],
1515
embedded = [
16-
":amd64",
1716
":firefox_extension",
1817
":webdriver_prefs",
19-
":x86",
20-
])
21-
22-
folder(name = "amd64",
23-
deps = [
24-
":noblur64",
25-
":imehandler64",
26-
],
27-
outs = [
28-
"amd64/x_ignore_nofocus.so",
29-
"amd64/libibushandler.so",
30-
])
31-
32-
folder(name = "x86",
33-
deps = [
34-
":noblur",
35-
":imehandler",
36-
],
37-
outs = [
38-
"x86/x_ignore_nofocus.so",
39-
"x86/libibushandler.so",
4018
])
4119

4220
rename(
@@ -53,27 +31,3 @@ rename(
5331
"//javascript/firefox-driver:webdriver",
5432
])
5533

56-
# TODO(dawagner): These tmp folders are a horrible hack, and should disappear post haste
57-
rename(name = "noblur",
58-
deps = [
59-
"//cpp:noblur",
60-
],
61-
out = "tmp_x86/x_ignore_nofocus.so")
62-
63-
rename(name = "noblur64",
64-
deps = [
65-
"//cpp:noblur64",
66-
],
67-
out = "tmp_amd64/x_ignore_nofocus.so")
68-
69-
rename(name = "imehandler",
70-
deps = [
71-
"//cpp:imehandler",
72-
],
73-
out = "tmp_x86/libibushandler.so")
74-
75-
rename(name = "imehandler64",
76-
deps = [
77-
"//cpp:imehandler64",
78-
],
79-
out = "tmp_amd64/libibushandler.so")

javascript/firefox-driver/build.desc

+13-17
Original file line numberDiff line numberDiff line change
@@ -42,25 +42,21 @@ mozilla_extension(name = "webdriver",
4242
":session-store",
4343
":status-xpt",
4444
":synthetic-mouse",
45-
"//cpp:native_events_xpt",
46-
"//cpp:native_mouse_xpt",
47-
"//cpp:native_keyboard_xpt",
48-
"//cpp:native_ime_xpt",
4945
],
5046
resources = [
51-
{ "//cpp/webdriver-firefox:previous_esr" : "platform/WINNT_x86-msvc/components/webdriver-firefox-esr-previous.dll" },
52-
{ "//cpp/webdriver-firefox:latest_esr" : "platform/WINNT_x86-msvc/components/webdriver-firefox-esr-latest.dll" },
53-
{ "//cpp/webdriver-firefox:previous" : "platform/WINNT_x86-msvc/components/webdriver-firefox-previous.dll" },
54-
{ "//cpp/webdriver-firefox:latest" : "platform/WINNT_x86-msvc/components/webdriver-firefox-latest.dll" },
55-
{ "//cpp:imehandler_dll" : "platform/WINNT_x86-msvc/components/imehandler.dll" },
56-
{ "//cpp:webdriver_firefox_esr_previous" : "platform/Linux_x86-gcc3/components/libwebdriver-firefox-esr-previous.so" },
57-
{ "//cpp:webdriver_firefox_esr_previous_64" : "platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-esr-previous.so" },
58-
{ "//cpp:webdriver_firefox_esr_latest" : "platform/Linux_x86-gcc3/components/libwebdriver-firefox-esr-latest.so" },
59-
{ "//cpp:webdriver_firefox_esr_latest_64" : "platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-esr-latest.so" },
60-
{ "//cpp:webdriver_firefox_previous" : "platform/Linux_x86-gcc3/components/libwebdriver-firefox-previous.so" },
61-
{ "//cpp:webdriver_firefox_latest" : "platform/Linux_x86-gcc3/components/libwebdriver-firefox-latest.so" },
62-
{ "//cpp:webdriver_firefox_previous_64" : "platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-previous.so" },
63-
{ "//cpp:webdriver_firefox_latest_64" : "platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-latest.so" },
47+
{ "../../cpp/prebuilt/Win32/Release/webdriver-firefox-esr-previous.dll" : "platform/WINNT_x86-msvc/components/webdriver-firefox-esr-previous.dll" },
48+
{ "../../cpp/prebuilt/Win32/Release/webdriver-firefox-esr-latest.dll" : "platform/WINNT_x86-msvc/components/webdriver-firefox-esr-latest.dll" },
49+
{ "../../cpp/prebuilt/Win32/Release/webdriver-firefox-previous.dll" : "platform/WINNT_x86-msvc/components/webdriver-firefox-previous.dll" },
50+
{ "../../cpp/prebuilt/Win32/Release/webdriver-firefox-latest.dll" : "platform/WINNT_x86-msvc/components/webdriver-firefox-latest.dll" },
51+
{ "../../cpp/prebuilt/Win32/Release/imehandler.dll" : "platform/WINNT_x86-msvc/components/imehandler.dll" },
52+
{ "../../cpp/prebuilt/i386/libwebdriver_firefox_esr_previous.so" : "platform/Linux_x86-gcc3/components/libwebdriver-firefox-esr-previous.so" },
53+
{ "../../cpp/prebuilt/amd64/libwebdriver_firefox_esr_previous_64.so" : "platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-esr-previous.so" },
54+
{ "../../cpp/prebuilt/i386/libwebdriver_firefox_esr_latest.so" : "platform/Linux_x86-gcc3/components/libwebdriver-firefox-esr-latest.so" },
55+
{ "../../cpp/prebuilt/amd64/libwebdriver_firefox_esr_latest_64.so" : "platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-esr-latest.so" },
56+
{ "../../cpp/prebuilt/i386/libwebdriver_firefox_previous.so" : "platform/Linux_x86-gcc3/components/libwebdriver-firefox-previous.so" },
57+
{ "../../cpp/prebuilt/i386/libwebdriver_firefox_latest.so" : "platform/Linux_x86-gcc3/components/libwebdriver-firefox-latest.so" },
58+
{ "../../cpp/prebuilt/amd64/libwebdriver_firefox_previous_64.so" : "platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-previous.so" },
59+
{ "../../cpp/prebuilt/amd64/libwebdriver_firefox_latest_64.so" : "platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-latest.so" },
6460
{ ":web-element-cache" : "resource/modules/web-element-cache.js" },
6561
{ "js/timer.js" : "resource/modules/timer.js" },
6662
{ "js/evaluate.js" : "resource/evaluate.js" },

0 commit comments

Comments
 (0)