| 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", | |
| 12 "dartium_base": "http://src.chromium.org", | |
| 13 "dartium_chromium_commit": "8df9de5a8f073d9c0feadf8d652408807e4a254e", | 11 "dartium_chromium_commit": "8df9de5a8f073d9c0feadf8d652408807e4a254e", |
| 12 "dartium_webkit_commit": "1d73225937ba77bba2d4279fe7b23bfb542d35d9", |
| 14 "chromium_base_revision": "338390", | 13 "chromium_base_revision": "338390", |
| 15 "dartium_webkit_branch": "/blink/branches/dart/2454_1", | |
| 16 "dartium_webkit_revision": "202778", | |
| 17 | 14 |
| 18 # We use mirrors of all github repos to guarantee reproducibility and | 15 # We use mirrors of all github repos to guarantee reproducibility and |
| 19 # consistency between what users see and what the bots see. | 16 # consistency between what users see and what the bots see. |
| 20 # We need the mirrors to not have 100+ bots pulling github constantly. | 17 # We need the mirrors to not have 100+ bots pulling github constantly. |
| 21 # We mirror our github repos on chromium git servers. | 18 # We mirror our github repos on chromium git servers. |
| 22 # DO NOT use this var if you don't see a mirror here: | 19 # DO NOT use this var if you don't see a mirror here: |
| 23 # https://chromium.googlesource.com/ | 20 # https://chromium.googlesource.com/ |
| 24 # named like: | 21 # named like: |
| 25 # external/github.com/dart-lang/NAME | 22 # external/github.com/dart-lang/NAME |
| 26 # It is ok to add a dependency directly on dart-lang (dart-lang only) | 23 # It is ok to add a dependency directly on dart-lang (dart-lang only) |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 "utf_rev": "@1f55027068759e2d52f2c12de6a57cce5f3c5ee6", | 63 "utf_rev": "@1f55027068759e2d52f2c12de6a57cce5f3c5ee6", |
| 67 "watcher_tag": "@0.9.5", | 64 "watcher_tag": "@0.9.5", |
| 68 "yaml_rev": "@563a5ffd4a800a2897b8f4dd6b19f2a370df2f2b", | 65 "yaml_rev": "@563a5ffd4a800a2897b8f4dd6b19f2a370df2f2b", |
| 69 "zlib_rev": "@c3d0a6190f2f8c924a05ab6cc97b8f975bddd33f", | 66 "zlib_rev": "@c3d0a6190f2f8c924a05ab6cc97b8f975bddd33f", |
| 70 "web_components_rev": "@0e636b534d9b12c9e96f841e6679398e91a986ec", | 67 "web_components_rev": "@0e636b534d9b12c9e96f841e6679398e91a986ec", |
| 71 "WebCore_rev": "@5ecb723fd9ffcc0d108f5e0e24d12b8b3df7b200", | 68 "WebCore_rev": "@5ecb723fd9ffcc0d108f5e0e24d12b8b3df7b200", |
| 72 | 69 |
| 73 "co19_rev": "@3ed795ea02e022ef19c77cf1b6095b7c8f5584d0", | 70 "co19_rev": "@3ed795ea02e022ef19c77cf1b6095b7c8f5584d0", |
| 74 }) | 71 }) |
| 75 | 72 |
| 76 # def massage_deps(deps): | |
| 77 # for key, value in deps.items(): | |
| 78 # if value is None: continue | |
| 79 # | |
| 80 # if value.startswith('/trunk'): | |
| 81 # deps[key] = Var("chromium_url") + value | |
| 82 # continue | |
| 83 # | |
| 84 # if value.startswith(Var("webkit_trunk")): | |
| 85 # path, revision = value.split('@') # and svn revision. | |
| 86 # path = path[len(Var("webkit_trunk")):] # Strip WebKit repo. | |
| 87 # value = (Var("dartium_base") + Var("dartium_webkit_branch") + path + | |
| 88 # '@' + Var("dartium_webkit_revision")) | |
| 89 # deps[key] = value | |
| 90 # continue | |
| 91 # | |
| 92 # massage_deps(deps) | |
| 93 # for os_deps in deps_os.values(): | |
| 94 # massage_deps(os_deps) | |
| 95 | |
| 96 deps.update({ | 73 deps.update({ |
| 97 "src": | 74 "src": |
| 98 Var("chromium_git") + "/dart/dartium/src.git" + "@" + | 75 Var("chromium_git") + "/dart/dartium/src.git" + "@" + |
| 99 Var("dartium_chromium_commit"), | 76 Var("dartium_chromium_commit"), |
| 100 | 77 |
| 101 "src/third_party/WebKit": | 78 "src/third_party/WebKit": |
| 102 Var("dartium_base") + Var("dartium_webkit_branch") + "@" + | 79 Var("chromium_git") + "/dart/dartium/blink.git" + "@" + |
| 103 Var("dartium_webkit_revision"), | 80 Var("dartium_webkit_commit"), |
| 104 | 81 |
| 105 "src/dart/third_party/pkg/args": | 82 "src/dart/third_party/pkg/args": |
| 106 (Var("github_mirror") % "args") + Var("args_tag"), | 83 (Var("github_mirror") % "args") + Var("args_tag"), |
| 107 "src/dart/third_party/pkg/barback": | 84 "src/dart/third_party/pkg/barback": |
| 108 (Var("github_mirror") % "barback") + Var("barback_rev"), | 85 (Var("github_mirror") % "barback") + Var("barback_rev"), |
| 109 "src/dart/third_party/pkg/charcode": | 86 "src/dart/third_party/pkg/charcode": |
| 110 (Var("github_mirror") % "charcode") + Var("charcode_tag"), | 87 (Var("github_mirror") % "charcode") + Var("charcode_tag"), |
| 111 "src/dart/third_party/pkg/crypto": | 88 "src/dart/third_party/pkg/crypto": |
| 112 (Var("github_mirror") % "crypto") + Var("crypto_rev"), | 89 (Var("github_mirror") % "crypto") + Var("crypto_rev"), |
| 113 "src/dart/third_party/pkg/csslib": | 90 "src/dart/third_party/pkg/csslib": |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 239 "--no_resume", | 216 "--no_resume", |
| 240 "--bucket", | 217 "--bucket", |
| 241 "dart-dependencies", | 218 "dart-dependencies", |
| 242 "--recursive", | 219 "--recursive", |
| 243 "--auto_platform", | 220 "--auto_platform", |
| 244 "--extract", | 221 "--extract", |
| 245 "--directory", | 222 "--directory", |
| 246 "src/dart/tools/sdks", | 223 "src/dart/tools/sdks", |
| 247 ], | 224 ], |
| 248 }) | 225 }) |
| OLD | NEW |