Chromium Code Reviews| 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/1985/src", | 12 "dartium_chromium_branch": "/chrome/branches/dart/dartium/src", |
| 13 "dartium_chromium_revision": "286245", | 13 "dartium_chromium_revision": "284674", |
| 14 "chromium_base_revision": "269467", | 14 # Git hashes of archived chromium builds closest to r278856. |
| 15 "chromium_base_revision": | |
| 16 '{"Windows":"9332044293a666d077a214b735a31ba9f3debed7", ' + | |
| 17 ' "Darwin": "db25a7e9bf34e638a1cbb4c8974ca566c22eb62c", ' + | |
| 18 ' "Linux": "abe29e2ae1ad6d9bd8a7bfa23b3316a203d39ef2"}', | |
| 15 "dart_branch": "/branches/bleeding_edge", | 19 "dart_branch": "/branches/bleeding_edge", |
| 16 "dartium_webkit_branch": "/blink/branches/dart/1985", | 20 "dartium_webkit_branch": "/blink/branches/dart/dartium", |
| 17 "dartium_webkit_revision": "178946", | 21 "dartium_webkit_revision": "179229", |
| 18 | 22 |
| 19 "co19_rev": "@738", | 23 "co19_rev": "@738", |
| 20 "fake_async_rev": "@38614", | |
|
kustermann
2014/07/30 13:29:46
see comment below
| |
| 21 }) | 24 }) |
| 22 | 25 |
| 23 def massage_deps(deps): | 26 def massage_deps(deps): |
| 24 for key, value in deps.items(): | 27 for key, value in deps.items(): |
| 25 if value is None: continue | 28 if value is None: continue |
| 26 | 29 |
| 27 if value.startswith('/trunk'): | 30 if value.startswith('/trunk'): |
| 28 deps[key] = Var("chromium_url") + value | 31 deps[key] = Var("chromium_url") + value |
| 29 continue | 32 continue |
| 30 | 33 |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 44 "src": | 47 "src": |
| 45 Var("dartium_base") + Var("dartium_chromium_branch") + "@" + | 48 Var("dartium_base") + Var("dartium_chromium_branch") + "@" + |
| 46 Var("dartium_chromium_revision"), | 49 Var("dartium_chromium_revision"), |
| 47 | 50 |
| 48 "src/dart": | 51 "src/dart": |
| 49 Var("dart_branch") + "/dart", | 52 Var("dart_branch") + "/dart", |
| 50 | 53 |
| 51 "src/dart/third_party/WebCore": | 54 "src/dart/third_party/WebCore": |
| 52 "/third_party/WebCore", | 55 "/third_party/WebCore", |
| 53 | 56 |
| 54 "src/dart/third_party/pkg/fake_async": | |
| 55 "/third_party/fake_async" + Var("fake_async_rev"), | |
|
kustermann
2014/07/30 13:29:46
I think you should not remove this one. It was rec
vsm
2014/07/30 13:36:49
Done. Thanks for the catch.
On 2014/07/30 13:29:
| |
| 56 | |
| 57 "src/dart/tests/co19/src": ((Var("googlecode_url") % "co19") + | 57 "src/dart/tests/co19/src": ((Var("googlecode_url") % "co19") + |
| 58 "/trunk/co19/tests/co19/src" + Var("co19_rev")), | 58 "/trunk/co19/tests/co19/src" + Var("co19_rev")), |
| 59 | 59 |
| 60 }) | 60 }) |
| 61 | 61 |
| 62 deps_os['win'].update({ | 62 deps_os['win'].update({ |
| 63 "src/chrome/tools/test/reference_build/chrome_win": None | 63 "src/chrome/tools/test/reference_build/chrome_win": None |
| 64 }) | 64 }) |
| 65 deps_os['mac'].update({ | 65 deps_os['mac'].update({ |
| 66 "src/chrome/tools/test/reference_build/chrome_mac": None | 66 "src/chrome/tools/test/reference_build/chrome_mac": None |
| 67 }) | 67 }) |
| 68 deps_os['unix'].update({ | 68 deps_os['unix'].update({ |
| (...skipping 17 matching lines...) Expand all 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 |