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 "chromium_url": "http://src.chromium.org/svn", | 11 "chromium_url": "http://src.chromium.org/svn", |
12 "dartium_base": "http://src.chromium.org", | 12 "dartium_base": "http://src.chromium.org", |
13 "dartium_chromium_branch": "master", | 13 "dartium_chromium_commit": "526d891ac24d8bd27a6bd5e1d7c384a72509cfc0", |
14 "dartium_chromium_commit": "62a7524d4f71c9e0858d24b0aa1bbff3a2d09bff", | 14 "chromium_base_revision": "338390", |
15 "chromium_base_revision": "297060", | 15 "dartium_webkit_branch": "/blink/branches/dart/2454_1", |
16 "dartium_webkit_branch": "/blink/branches/dart/dartium", | 16 "dartium_webkit_revision": "202773", |
17 "dartium_webkit_revision": "202760", | |
18 | 17 |
19 # We use mirrors of all github repos to guarantee reproducibility and | 18 # We use mirrors of all github repos to guarantee reproducibility and |
20 # consistency between what users see and what the bots see. | 19 # consistency between what users see and what the bots see. |
21 # We need the mirrors to not have 100+ bots pulling github constantly. | 20 # We need the mirrors to not have 100+ bots pulling github constantly. |
22 # We mirror our github repos on chromium git servers. | 21 # We mirror our github repos on chromium git servers. |
23 # DO NOT use this var if you don't see a mirror here: | 22 # DO NOT use this var if you don't see a mirror here: |
24 # https://chromium.googlesource.com/ | 23 # https://chromium.googlesource.com/ |
25 # named like: | 24 # named like: |
26 # external/github.com/dart-lang/NAME | 25 # external/github.com/dart-lang/NAME |
27 # It is ok to add a dependency directly on dart-lang (dart-lang only) | 26 # It is ok to add a dependency directly on dart-lang (dart-lang only) |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 "source_span_rev": "@42501132e43599a151ba6727d340e44442f86c05", | 61 "source_span_rev": "@42501132e43599a151ba6727d340e44442f86c05", |
63 "stack_trace_tag": "@1.2.1", | 62 "stack_trace_tag": "@1.2.1", |
64 "string_scanner_rev": "@3e7617d6f74ba382e9b6130b1cc12091d89a9bc5", | 63 "string_scanner_rev": "@3e7617d6f74ba382e9b6130b1cc12091d89a9bc5", |
65 "test_tag": "@0.12.1", | 64 "test_tag": "@0.12.1", |
66 "unittest_tag": "@0.11.6", | 65 "unittest_tag": "@0.11.6", |
67 "utf_rev": "@1f55027068759e2d52f2c12de6a57cce5f3c5ee6", | 66 "utf_rev": "@1f55027068759e2d52f2c12de6a57cce5f3c5ee6", |
68 "watcher_tag": "@0.9.5", | 67 "watcher_tag": "@0.9.5", |
69 "yaml_rev": "@563a5ffd4a800a2897b8f4dd6b19f2a370df2f2b", | 68 "yaml_rev": "@563a5ffd4a800a2897b8f4dd6b19f2a370df2f2b", |
70 "zlib_rev": "@c3d0a6190f2f8c924a05ab6cc97b8f975bddd33f", | 69 "zlib_rev": "@c3d0a6190f2f8c924a05ab6cc97b8f975bddd33f", |
71 "web_components_rev": "@0e636b534d9b12c9e96f841e6679398e91a986ec", | 70 "web_components_rev": "@0e636b534d9b12c9e96f841e6679398e91a986ec", |
72 "WebCore_rev": "@4f90b41b0165f23f412cecdba07b7d81d3fbb5b5", | 71 "WebCore_rev": "@5ecb723fd9ffcc0d108f5e0e24d12b8b3df7b200", |
73 | 72 |
74 "co19_rev": "@3ed795ea02e022ef19c77cf1b6095b7c8f5584d0", | 73 "co19_rev": "@3ed795ea02e022ef19c77cf1b6095b7c8f5584d0", |
75 }) | 74 }) |
76 | 75 |
77 def massage_deps(deps): | 76 # def massage_deps(deps): |
78 for key, value in deps.items(): | 77 # for key, value in deps.items(): |
79 if value is None: continue | 78 # if value is None: continue |
80 | 79 # |
81 if value.startswith('/trunk'): | 80 # if value.startswith('/trunk'): |
82 deps[key] = Var("chromium_url") + value | 81 # deps[key] = Var("chromium_url") + value |
83 continue | 82 # continue |
84 | 83 # |
85 if value.startswith(Var("webkit_trunk")): | 84 # if value.startswith(Var("webkit_trunk")): |
86 path, revision = value.split('@') # and svn revision. | 85 # path, revision = value.split('@') # and svn revision. |
87 path = path[len(Var("webkit_trunk")):] # Strip WebKit repo. | 86 # path = path[len(Var("webkit_trunk")):] # Strip WebKit repo. |
88 value = (Var("dartium_base") + Var("dartium_webkit_branch") + path + | 87 # value = (Var("dartium_base") + Var("dartium_webkit_branch") + path + |
89 '@' + Var("dartium_webkit_revision")) | 88 # '@' + Var("dartium_webkit_revision")) |
90 deps[key] = value | 89 # deps[key] = value |
91 continue | 90 # continue |
92 | 91 # |
93 massage_deps(deps) | 92 # massage_deps(deps) |
94 for os_deps in deps_os.values(): | 93 # for os_deps in deps_os.values(): |
95 massage_deps(os_deps) | 94 # massage_deps(os_deps) |
96 | 95 |
97 deps.update({ | 96 deps.update({ |
98 "src": | 97 "src": |
99 Var("chromium_git") + "/dart/dartium/src.git" + "@" + | 98 Var("chromium_git") + "/dart/dartium/src.git" + "@" + |
100 Var("dartium_chromium_commit"), | 99 Var("dartium_chromium_commit"), |
101 | 100 |
102 "src/third_party/WebKit": | 101 "src/third_party/WebKit": |
103 Var("dartium_base") + Var("dartium_webkit_branch") + "@" + | 102 Var("dartium_base") + Var("dartium_webkit_branch") + "@" + |
104 Var("dartium_webkit_revision"), | 103 Var("dartium_webkit_revision"), |
105 | 104 |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
254 "--no_resume", | 253 "--no_resume", |
255 "--bucket", | 254 "--bucket", |
256 "dart-dependencies", | 255 "dart-dependencies", |
257 "--recursive", | 256 "--recursive", |
258 "--auto_platform", | 257 "--auto_platform", |
259 "--extract", | 258 "--extract", |
260 "--directory", | 259 "--directory", |
261 "src/dart/tools/sdks", | 260 "src/dart/tools/sdks", |
262 ], | 261 ], |
263 }) | 262 }) |
OLD | NEW |