OLD | NEW |
1 | 1 |
2 import gclient_utils | 2 import gclient_utils |
3 import os | 3 import os |
4 | 4 |
5 path = gclient_utils.FindGclientRoot(os.getcwd()) | 5 path = gclient_utils.FindGclientRoot(os.getcwd()) |
6 execfile(os.path.join(path, 'src', 'dart', 'tools', 'deps', 'dartium.deps', 'DEP
S.chromium')) # Include proper Chromium DEPS. | 6 execfile(os.path.join(path, 'src', 'dart', 'tools', 'deps', 'dartium.deps', 'DEP
S.chromium')) # Include proper Chromium DEPS. |
7 | 7 |
8 # Now we need to override some settings and add some new ones. | 8 # Now we need to override some settings and add some new ones. |
9 | 9 |
10 vars.update({ | 10 vars.update({ |
11 "dartium_chromium_commit": "7558afb6379171d7f96b2db68ae9d2b64b2c5544", | 11 "dartium_chromium_commit": "1ac95883b0e9e13d0ec62164f0ca461dacef8a4b", |
12 "dartium_webkit_commit": "6b2be51884a122443c468e93e9d5090fb709964b", | 12 "chromium_base_revision": "378081", |
13 "chromium_base_revision": "338390", | |
14 | 13 |
15 # We use mirrors of all github repos to guarantee reproducibility and | 14 # We use mirrors of all github repos to guarantee reproducibility and |
16 # consistency between what users see and what the bots see. | 15 # consistency between what users see and what the bots see. |
17 # We need the mirrors to not have 100+ bots pulling github constantly. | 16 # We need the mirrors to not have 100+ bots pulling github constantly. |
18 # We mirror our github repos on chromium git servers. | 17 # We mirror our github repos on chromium git servers. |
19 # DO NOT use this var if you don't see a mirror here: | 18 # DO NOT use this var if you don't see a mirror here: |
20 # https://chromium.googlesource.com/ | 19 # https://chromium.googlesource.com/ |
21 # named like: | 20 # named like: |
22 # external/github.com/dart-lang/NAME | 21 # external/github.com/dart-lang/NAME |
23 # It is ok to add a dependency directly on dart-lang (dart-lang only) | 22 # It is ok to add a dependency directly on dart-lang (dart-lang only) |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 "source_span_rev": "@42501132e43599a151ba6727d340e44442f86c05", | 59 "source_span_rev": "@42501132e43599a151ba6727d340e44442f86c05", |
61 "stack_trace_tag": "@1.2.1", | 60 "stack_trace_tag": "@1.2.1", |
62 "string_scanner_rev": "@3e7617d6f74ba382e9b6130b1cc12091d89a9bc5", | 61 "string_scanner_rev": "@3e7617d6f74ba382e9b6130b1cc12091d89a9bc5", |
63 "test_tag": "@0.12.1", | 62 "test_tag": "@0.12.1", |
64 "unittest_tag": "@0.11.6", | 63 "unittest_tag": "@0.11.6", |
65 "utf_rev": "@1f55027068759e2d52f2c12de6a57cce5f3c5ee6", | 64 "utf_rev": "@1f55027068759e2d52f2c12de6a57cce5f3c5ee6", |
66 "watcher_tag": "@0.9.5", | 65 "watcher_tag": "@0.9.5", |
67 "yaml_rev": "@563a5ffd4a800a2897b8f4dd6b19f2a370df2f2b", | 66 "yaml_rev": "@563a5ffd4a800a2897b8f4dd6b19f2a370df2f2b", |
68 "zlib_rev": "@c3d0a6190f2f8c924a05ab6cc97b8f975bddd33f", | 67 "zlib_rev": "@c3d0a6190f2f8c924a05ab6cc97b8f975bddd33f", |
69 "web_components_rev": "@6349e09f9118dce7ae1b309af5763745e25a9d61", | 68 "web_components_rev": "@6349e09f9118dce7ae1b309af5763745e25a9d61", |
70 "WebCore_rev": "@2fe910c049be42bcef58f205debd4440e8139863", | 69 "WebCore_rev": "@3c45690813c112373757bbef53de1602a62af609", |
71 | 70 |
72 "co19_rev": "@4af9ef149be554216c5bb16cbac8e50d4c28cdf1", | 71 "co19_rev": "@4af9ef149be554216c5bb16cbac8e50d4c28cdf1", |
73 }) | 72 }) |
74 | 73 |
75 deps.update({ | 74 deps.update({ |
76 "src": | 75 "src": |
77 Var("chromium_git") + "/dart/dartium/src.git" + "@" + | 76 Var("chromium_git") + "/dart/dartium/src.git" + "@" + |
78 Var("dartium_chromium_commit"), | 77 Var("dartium_chromium_commit"), |
79 | |
80 "src/third_party/WebKit": | |
81 Var("chromium_git") + "/dart/dartium/blink.git" + "@" + | |
82 Var("dartium_webkit_commit"), | |
83 | |
84 "src/dart/third_party/pkg/args": | 78 "src/dart/third_party/pkg/args": |
85 (Var("github_mirror") % "args") + Var("args_tag"), | 79 (Var("github_mirror") % "args") + Var("args_tag"), |
86 "src/dart/third_party/pkg/barback": | 80 "src/dart/third_party/pkg/barback": |
87 (Var("github_mirror") % "barback") + Var("barback_rev"), | 81 (Var("github_mirror") % "barback") + Var("barback_rev"), |
88 "src/dart/third_party/pkg/charcode": | 82 "src/dart/third_party/pkg/charcode": |
89 (Var("github_mirror") % "charcode") + Var("charcode_tag"), | 83 (Var("github_mirror") % "charcode") + Var("charcode_tag"), |
90 "src/dart/third_party/pkg/crypto": | 84 "src/dart/third_party/pkg/crypto": |
91 (Var("github_mirror") % "crypto") + Var("crypto_rev"), | 85 (Var("github_mirror") % "crypto") + Var("crypto_rev"), |
92 "src/dart/third_party/pkg/csslib": | 86 "src/dart/third_party/pkg/csslib": |
93 (Var("github_mirror") % "csslib") + Var("csslib_tag"), | 87 (Var("github_mirror") % "csslib") + Var("csslib_tag"), |
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
198 | 192 |
199 hooks.append({ | 193 hooks.append({ |
200 # Set the revision for a lazily downloaded reference build of chromium, | 194 # Set the revision for a lazily downloaded reference build of chromium, |
201 # with which to run perf tests. | 195 # with which to run perf tests. |
202 'name': 'set_reference_build', | 196 'name': 'set_reference_build', |
203 'pattern': '.', | 197 'pattern': '.', |
204 'action': ['python', | 198 'action': ['python', |
205 'src/dart/tools/bots/set_reference_build_revision.py', | 199 'src/dart/tools/bots/set_reference_build_revision.py', |
206 Var('chromium_base_revision')], | 200 Var('chromium_base_revision')], |
207 }) | 201 }) |
208 hooks.append({ | 202 #hooks.append({ |
209 # Peg the blink version number in LASTCHANGE.blink to be the upstream | 203 # Peg the blink version number in LASTCHANGE.blink to be the upstream |
210 # webkit_revision number so that chrome remote devtools pulls assets from | 204 # webkit_revision number so that chrome remote devtools pulls assets from |
211 # the right place. | 205 # the right place. |
212 "name": "lastchange", | 206 # "name": "lastchange", |
213 "pattern": ".", | 207 # "pattern": ".", |
214 "action": ["python", "-c", | 208 # "action": ["python", "-c", |
215 "f=open('src/build/util/LASTCHANGE.blink','w'); f.write('LASTCHANGE=" + | 209 # "f=open('src/build/util/LASTCHANGE.blink','w'); f.write('LASTCHANGE=" + |
216 Var('webkit_revision') + "\\n')" ], | 210 # Var('webkit_revision') + "\\n')" ], |
217 }) | 211 #}) |
218 hooks.append({ | 212 hooks.append({ |
219 "name": "checked_in_dart_sdks", | 213 "name": "checked_in_dart_sdks", |
220 "pattern": ".", | 214 "pattern": ".", |
221 "action": [ | 215 "action": [ |
222 "download_from_google_storage", | 216 "download_from_google_storage", |
223 "--no_auth", | 217 "--no_auth", |
224 "--no_resume", | 218 "--no_resume", |
225 "--bucket", | 219 "--bucket", |
226 "dart-dependencies", | 220 "dart-dependencies", |
227 "--recursive", | 221 "--recursive", |
(...skipping 12 matching lines...) Expand all Loading... |
240 "download_from_google_storage", | 234 "download_from_google_storage", |
241 "--no_auth", | 235 "--no_auth", |
242 "--no_resume", | 236 "--no_resume", |
243 "--bucket", | 237 "--bucket", |
244 "dart-dependencies", | 238 "dart-dependencies", |
245 "--extract", | 239 "--extract", |
246 "-s", | 240 "-s", |
247 "src/dart/third_party/pkg/unittest.tar.gz.sha1", | 241 "src/dart/third_party/pkg/unittest.tar.gz.sha1", |
248 ], | 242 ], |
249 }) | 243 }) |
OLD | NEW |