OLD | NEW |
1 import gclient_utils | 1 import gclient_utils |
2 import os | 2 import os |
3 | 3 |
4 path = gclient_utils.FindGclientRoot(os.getcwd()) | 4 path = gclient_utils.FindGclientRoot(os.getcwd()) |
5 execfile(os.path.join(path, 'dartium.deps', 'DEPS.chromium')) # Include proper C
hromium DEPS. | 5 execfile(os.path.join(path, 'dartium.deps', 'DEPS.chromium')) # Include proper C
hromium DEPS. |
6 | 6 |
7 # Now we need to override some settings and add some new ones. | 7 # Now we need to override some settings and add some new ones. |
8 | 8 |
9 vars.update({ | 9 vars.update({ |
10 "chromium_url": "http://src.chromium.org/svn", | 10 "chromium_url": "http://src.chromium.org/svn", |
11 "chromium_revision": "224845", | 11 "dartium_chromium_url": "http://src.chromium.org/multivm/branches/1650/chrome"
, |
| 12 "dartium_chromium_revision": "1574", |
12 # The Dart repository URL is pulled out here so that it can be easily | 13 # The Dart repository URL is pulled out here so that it can be easily |
13 # updated to "https" for committers. | 14 # updated to "https" for committers. |
14 "dart_branch": "/trunk", | 15 "dart_branch": "/trunk", |
15 "multivm_url": "http://src.chromium.org/multivm/trunk", | 16 "dartium_webkit_trunk": "http://src.chromium.org/multivm/branches/1650/blink", |
16 "dartium_webkit_trunk": "http://src.chromium.org/multivm/trunk/webkit", | 17 "dartium_webkit_revision": "1578", |
17 "dartium_webkit_revision": "1516", | |
18 "dartium_tools_revision": "1508", | |
19 "bootstrap_css_rev" : "@28387", | 18 "bootstrap_css_rev" : "@28387", |
20 | 19 |
21 "co19_rev": "@651", | 20 "co19_rev": "@651", |
22 }) | 21 }) |
23 | 22 |
24 def massage_deps(deps): | 23 def massage_deps(deps): |
25 for key, value in deps.items(): | 24 for key, value in deps.items(): |
26 if value is None: continue | 25 if value is None: continue |
27 | 26 |
28 if value.startswith('/trunk'): | 27 if value.startswith('/trunk'): |
29 deps[key] = Var("chromium_url") + value | 28 deps[key] = Var("chromium_url") + value |
30 continue | 29 continue |
31 | 30 |
32 if value.startswith(Var("webkit_trunk")): | 31 if value.startswith(Var("webkit_trunk")): |
33 path, revision = value.split('@') # and svn revision. | 32 path, revision = value.split('@') # and svn revision. |
34 path = path[len(Var("webkit_trunk")):] # Strip WebKit repo. | 33 path = path[len(Var("webkit_trunk")):] # Strip WebKit repo. |
35 value = (Var("dartium_webkit_trunk") + path + | 34 value = (Var("dartium_webkit_trunk") + path + |
36 '@' + Var("dartium_webkit_revision")) | 35 '@' + Var("dartium_webkit_revision")) |
37 deps[key] = value | 36 deps[key] = value |
38 continue | 37 continue |
39 | 38 |
40 massage_deps(deps) | 39 massage_deps(deps) |
41 for os_deps in deps_os.values(): | 40 for os_deps in deps_os.values(): |
42 massage_deps(os_deps) | 41 massage_deps(os_deps) |
43 | 42 |
44 deps.update({ | 43 deps.update({ |
45 "src": | 44 "src": |
46 Var("chromium_url") + "/trunk/src@" + Var("chromium_revision"), | 45 Var("dartium_chromium_url") + "@" + Var("dartium_chromium_revision"), |
47 | 46 |
48 "src/dart": | 47 "src/dart": |
49 Var("dart_branch") + "/dart", | 48 Var("dart_branch") + "/dart", |
50 | 49 |
51 "src/dart/tests/co19/src": ((Var("googlecode_url") % "co19") + | 50 "src/dart/tests/co19/src": ((Var("googlecode_url") % "co19") + |
52 "/trunk/co19/tests/co19/src" + Var("co19_rev")), | 51 "/trunk/co19/tests/co19/src" + Var("co19_rev")), |
53 | 52 |
54 "src/dartium_tools": | |
55 Var("multivm_url") + "/tools@" + Var("dartium_tools_revision"), | |
56 | |
57 "src/dart/runtime/bin/vmservice/client/bootstrap_css": | 53 "src/dart/runtime/bin/vmservice/client/bootstrap_css": |
58 "/third_party/bootstrap_css" + Var("bootstrap_css_rev"), | 54 "/third_party/bootstrap_css" + Var("bootstrap_css_rev"), |
59 | 55 |
60 "src/dart/runtime/bin/vmservice/client/web/bootstrap_css": | 56 "src/dart/runtime/bin/vmservice/client/web/bootstrap_css": |
61 "/third_party/bootstrap_css" + Var("bootstrap_css_rev"), | 57 "/third_party/bootstrap_css" + Var("bootstrap_css_rev"), |
62 | 58 |
63 "src/dart/runtime/bin/vmservice/client/out/web/bootstrap_css": | 59 "src/dart/runtime/bin/vmservice/client/out/web/bootstrap_css": |
64 "/third_party/bootstrap_css" + Var("bootstrap_css_rev"), | 60 "/third_party/bootstrap_css" + Var("bootstrap_css_rev"), |
65 }) | 61 }) |
66 | 62 |
67 hooks[0:0] = [{ | 63 hooks[0:0] = [{ |
68 "pattern": ".", | |
69 "action": ["python", "src/dartium_tools/export_overrides.py"], | |
70 }, | |
71 { | |
72 "pattern": "dart", | 64 "pattern": "dart", |
73 "action": ["python", "src/dartium_tools/generate_dart_vm_version.py"], | 65 "action": ["python", "src/dartium_tools/generate_dart_vm_version.py"], |
74 }] | 66 }] |
OLD | NEW |