Skip to content

Commit 537ab1d

Browse files
committed
Buck version bump
This brings us up to date with Facebook's Buck release, with the following additions: * Simple Console reports "STILL BUILDING" if a rule takes too long (required for Travis) * Empty javadoc jars are now valid (required for maven) * We encode a build stamp into each java build The build stamp is a dependency of the core Java WebDriver interfaces (added in the manifest of `//java/client/src/org/openqa/selenium:core`). Since this rule is built _every time_ we invoke Buck, we expect to see more rebuilds. In the general case, ABI checks will mean only java_binary artifacts are rebuilt so build times should not be impacted.
1 parent 1526350 commit 537ab1d

File tree

15 files changed

+103
-98
lines changed

15 files changed

+103
-98
lines changed

.buckhash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c7c2e785df8e7d0cf14f3afd59afbd39
1+
0524bd3cf64bf94800a8ca48927ecd16

.buckversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
65874cbc58fab1746c2e7d15ea7c2f545fb0df38
1+
7e370f5f00f23d09d1607fdae79c8bd003462fdc

java/client/src/org/openqa/selenium/BUCK

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
include_defs('//SELENIUM_VERSION')
22

3+
build_stamp(name = 'build-stamp',
4+
kind = 'manifest',
5+
source_control_system = 'git',
6+
)
7+
38
java_library(name = 'selenium',
49
exported_deps = [
510
':beta',
@@ -76,8 +81,8 @@ java_library(name = 'core',
7681

7782
genrule(name = 'manifest',
7883
out = 'manifest.mf',
79-
bash = 'printf "\nName: Build-Info\nSelenium-Version: {}\n" > $OUT'.format(SE_VERSION),
80-
cmd_exe = "(echo.\necho Name: Build-Info\necho Selenium-Version: {}\n) > %OUT%".format(SE_VERSION),
84+
bash = 'cp $(location :build-stamp) $OUT && printf "Selenium-Version: {}\n\n" >> $OUT'.format(SE_VERSION),
85+
cmd_exe = "copy $(location :build-stamp) %OUT% && (echo Selenium-Version: {}\n\n) >> %OUT%".format(SE_VERSION),
8186
)
8287

8388
java_library(name = 'beta',

javascript/JAVASCRIPT_DEFS

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
orig_js_fragment = js_fragment
1+
orig_closure_fragment = closure_fragment
22

3-
def js_fragment(name, **kwargs):
4-
orig_js_fragment(name, **kwargs)
3+
def closure_fragment(name, **kwargs):
4+
orig_closure_fragment(name, **kwargs)
55

66
# Android
77
defs = kwargs.get('defines', [])
@@ -11,7 +11,7 @@ def js_fragment(name, **kwargs):
1111
args = kwargs.copy();
1212
args['defines'] = defs
1313
fragment_name = name + '-android'
14-
orig_js_fragment(fragment_name, **args)
14+
orig_closure_fragment(fragment_name, **args)
1515

1616
# Chrome
1717
defs = kwargs.get('defines', [])
@@ -22,7 +22,7 @@ def js_fragment(name, **kwargs):
2222
args = kwargs.copy();
2323
args['defines'] = defs
2424
fragment_name = name + '-chrome'
25-
orig_js_fragment(fragment_name, **args)
25+
orig_closure_fragment(fragment_name, **args)
2626

2727
# Edge and IE
2828
defs = kwargs.get('defines', [])
@@ -32,7 +32,7 @@ def js_fragment(name, **kwargs):
3232
args = kwargs.copy();
3333
args['defines'] = defs
3434
fragment_name = name + '-ie'
35-
orig_js_fragment(fragment_name, **args)
35+
orig_closure_fragment(fragment_name, **args)
3636

3737
# iOS
3838
defs = kwargs.get('defines', [])
@@ -44,7 +44,7 @@ def js_fragment(name, **kwargs):
4444
args = kwargs.copy();
4545
args['defines'] = defs
4646
fragment_name = name + '-ios'
47-
orig_js_fragment(fragment_name, **args)
47+
orig_closure_fragment(fragment_name, **args)
4848

4949

5050
# Firefox
@@ -56,4 +56,4 @@ def js_fragment(name, **kwargs):
5656
args = kwargs.copy();
5757
args['defines'] = defs
5858
fragment_name = name + '-firefox'
59-
orig_js_fragment(fragment_name, **args)
59+
orig_closure_fragment(fragment_name, **args)

javascript/atoms/BUCK

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
js_library(name = 'action',
1+
closure_library(name = 'action',
22
srcs = [
33
'action.js',
44
],
@@ -15,7 +15,7 @@ js_library(name = 'action',
1515
)
1616

1717

18-
js_library(name = 'bot',
18+
closure_library(name = 'bot',
1919
srcs = [
2020
'bot.js',
2121
],
@@ -25,7 +25,7 @@ js_library(name = 'bot',
2525
)
2626

2727

28-
js_library(name = 'color',
28+
closure_library(name = 'color',
2929
srcs = [
3030
'color.js',
3131
],
@@ -35,7 +35,7 @@ js_library(name = 'color',
3535
)
3636

3737

38-
js_library(name = 'devices',
38+
closure_library(name = 'devices',
3939
srcs = [
4040
'device.js',
4141
'keyboard.js',
@@ -55,7 +55,7 @@ js_library(name = 'devices',
5555
)
5656

5757

58-
js_library(name = 'domcore',
58+
closure_library(name = 'domcore',
5959
srcs = [
6060
"domcore.js",
6161
],
@@ -70,7 +70,7 @@ js_library(name = 'domcore',
7070
)
7171

7272

73-
js_library(name = 'dom',
73+
closure_library(name = 'dom',
7474
srcs = [
7575
"dom.js",
7676
],
@@ -88,7 +88,7 @@ js_library(name = 'dom',
8888
)
8989

9090

91-
js_library(name = 'errors',
91+
closure_library(name = 'errors',
9292
srcs = [
9393
'error.js',
9494
'response.js',
@@ -99,7 +99,7 @@ js_library(name = 'errors',
9999
)
100100

101101

102-
js_library(name = 'events',
102+
closure_library(name = 'events',
103103
srcs = [
104104
'events.js',
105105
],
@@ -116,7 +116,7 @@ js_library(name = 'events',
116116
)
117117

118118

119-
js_library(name = 'html5',
119+
closure_library(name = 'html5',
120120
srcs = glob(['html5/*.js']),
121121
deps = [
122122
':bot',
@@ -130,7 +130,7 @@ js_library(name = 'html5',
130130
)
131131

132132

133-
js_library(name = 'inject',
133+
closure_library(name = 'inject',
134134
srcs = [
135135
'inject.js',
136136
'response.js',
@@ -147,7 +147,7 @@ js_library(name = 'inject',
147147
)
148148

149149

150-
js_library(name = 'json',
150+
closure_library(name = 'json',
151151
srcs = [
152152
'json.js',
153153
'userAgent.js'
@@ -161,7 +161,7 @@ js_library(name = 'json',
161161
)
162162

163163

164-
js_library(name = 'locators',
164+
closure_library(name = 'locators',
165165
srcs = glob(['locators/*.js'], excludes=['locators/xpath.js']),
166166
deps = [
167167
':dom',
@@ -175,7 +175,7 @@ js_library(name = 'locators',
175175
)
176176

177177

178-
js_library(name = 'useragent',
178+
closure_library(name = 'useragent',
179179
srcs = [
180180
'userAgent.js',
181181
],
@@ -188,7 +188,7 @@ js_library(name = 'useragent',
188188
)
189189

190190

191-
js_library(name = 'window',
191+
closure_library(name = 'window',
192192
srcs = [
193193
'frame.js',
194194
'window.js',
@@ -207,7 +207,7 @@ js_library(name = 'window',
207207
)
208208

209209

210-
js_library(name = 'xpath',
210+
closure_library(name = 'xpath',
211211
srcs = [
212212
'locators/xpath.js',
213213
],

javascript/atoms/fragments/BUCK

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
include_defs('//javascript/JAVASCRIPT_DEFS')
22

3-
js_fragment(name = 'clear',
3+
closure_fragment(name = 'clear',
44
function = 'bot.action.clear',
55
module = 'bot.action',
66
deps = [
77
'//javascript/atoms:action',
88
],
99
)
1010

11-
js_fragment(name = 'execute_script',
11+
closure_fragment(name = 'execute_script',
1212
function = 'bot.inject.executeScript',
1313
module = 'bot.inject',
1414
deps = [
@@ -19,7 +19,7 @@ js_fragment(name = 'execute_script',
1919
],
2020
)
2121

22-
js_fragment(name = 'is-displayed',
22+
closure_fragment(name = 'is-displayed',
2323
function = 'bot.dom.isShown',
2424
module = 'bot.dom',
2525
deps = [

javascript/chrome-driver/BUCK

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
js_library(name = 'lib',
1+
closure_library(name = 'lib',
22
srcs = glob(['*.js']),
33
deps = [
44
'//javascript/atoms:dom',
@@ -7,35 +7,35 @@ js_library(name = 'lib',
77
],
88
)
99

10-
js_fragment(name = 'get_location_in_view',
10+
closure_fragment(name = 'get_location_in_view',
1111
module = 'webdriver.chrome',
1212
function = 'webdriver.chrome.getLocationInView',
1313
deps = [ ':lib' ])
1414

15-
js_fragment(name = 'get_first_client_rect',
15+
closure_fragment(name = 'get_first_client_rect',
1616
module = 'webdriver.chrome',
1717
function = 'webdriver.chrome.getFirstClientRect',
1818
deps = [ ':lib' ])
1919

20-
js_fragment(name = 'is_element_clickable',
20+
closure_fragment(name = 'is_element_clickable',
2121
module = 'webdriver.chrome',
2222
function = 'webdriver.chrome.isElementClickable',
2323
deps = [ ':lib' ])
2424

25-
js_fragment(name = 'get_page_zoom',
25+
closure_fragment(name = 'get_page_zoom',
2626
module = 'webdriver.chrome',
2727
function = 'webdriver.chrome.getPageZoom',
2828
deps = [ ':lib' ])
2929

30-
js_fragment(name = 'is_element_displayed',
30+
closure_fragment(name = 'is_element_displayed',
3131
module = 'webdriver.chrome',
3232
function = 'webdriver.chrome.isElementDisplayed',
3333
deps = [
3434
':lib',
3535
'//javascript/atoms/fragments:is-displayed',
3636
])
3737

38-
js_fragment(name = 'find_element',
38+
closure_fragment(name = 'find_element',
3939
module = 'webdriver.chrome',
4040
function = 'webdriver.chrome.findElement',
4141
deps = [ ':lib' ])

0 commit comments

Comments
 (0)