| 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 "dartium_base": "http://src.chromium.org", | 11 "dartium_base": "http://src.chromium.org", |
| 12 "dartium_chromium_branch": "/chrome/branches/dart/dartium/src", | 12 "dartium_chromium_branch": "/chrome/branches/dart/dartium/src", |
| 13 "dartium_chromium_revision": "292384", | 13 "dartium_chromium_revision": "292384", |
| 14 "chromium_base_revision": "290040", | 14 "chromium_base_revision": "290040", |
| 15 "dart_branch": "/trunk", | 15 "dart_branch": "/branches/1.8", |
| 16 "dartium_webkit_branch": "/blink/branches/dart/dartium", | 16 "dartium_webkit_branch": "/blink/branches/dart/dartium", |
| 17 "dartium_webkit_revision": "184546", | 17 "dartium_webkit_revision": "184546", |
| 18 | 18 |
| 19 "co19_rev": "@786", | 19 "co19_rev": "@786", |
| 20 "fake_async_rev": "@38614", | 20 "fake_async_rev": "@38614", |
| 21 }) | 21 }) |
| 22 | 22 |
| 23 def massage_deps(deps): | 23 def massage_deps(deps): |
| 24 for key, value in deps.items(): | 24 for key, value in deps.items(): |
| 25 if value is None: continue | 25 if value is None: continue |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 hooks.append({ | 86 hooks.append({ |
| 87 # Peg the blink version number in LASTCHANGE.blink to be the upstream | 87 # Peg the blink version number in LASTCHANGE.blink to be the upstream |
| 88 # webkit_revision number so that chrome remote devtools pulls assets from | 88 # webkit_revision number so that chrome remote devtools pulls assets from |
| 89 # the right place. | 89 # the right place. |
| 90 "name": "lastchange", | 90 "name": "lastchange", |
| 91 "pattern": ".", | 91 "pattern": ".", |
| 92 "action": ["python", "-c", | 92 "action": ["python", "-c", |
| 93 "f=open('src/build/util/LASTCHANGE.blink','w'); f.write('LASTCHANGE=" + | 93 "f=open('src/build/util/LASTCHANGE.blink','w'); f.write('LASTCHANGE=" + |
| 94 Var('webkit_revision') + "\\n')" ], | 94 Var('webkit_revision') + "\\n')" ], |
| 95 }) | 95 }) |
| OLD | NEW |