| 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": "/branches/bleeding_edge", | 15 "dart_branch": "/branches/bleeding_edge", |
| 16 "dartium_webkit_branch": "/blink/branches/dart/2125", | 16 "dartium_webkit_branch": "/blink/branches/dart/2125", |
| 17 "dartium_webkit_revision": "187551", | 17 "dartium_webkit_revision": "187551", |
| 18 |
| 19 "http_parser_rev" : "@6769e916aa2f0a14ae8d5d2cdbddaed81e419665", |
| 20 "matcher_rev": "@43e2811b53ee3a8df862524c186bed89e29f703d", |
| 21 "metatest_rev": "@c75bae9e8709d49ff925819db0bf432ca7dd8373", |
| 18 "path_rev": "@a2d53a06f1cedf32363bdc5419476c33b9f728bc", | 22 "path_rev": "@a2d53a06f1cedf32363bdc5419476c33b9f728bc", |
| 19 "metatest_rev": "@c75bae9e8709d49ff925819db0bf432ca7dd8373", | |
| 20 "source_span_rev": "@e2bab188ccf65cef5d95de2ec12f16d2026f9832", | 23 "source_span_rev": "@e2bab188ccf65cef5d95de2ec12f16d2026f9832", |
| 21 "stack_trace_rev": "@22d92b32de066e4932867c3ab3c8d8f7d9f29f44", | 24 "stack_trace_rev": "@22d92b32de066e4932867c3ab3c8d8f7d9f29f44", |
| 22 "string_scanner_rev": "@1b8df03e5f9fe50ccfddef894c4032b3e98c31c4", | 25 "string_scanner_rev": "@1b8df03e5f9fe50ccfddef894c4032b3e98c31c4", |
| 26 "unittest_rev": "@2381a2e53080d4c8a499c2a9d4d224a96490feaf", |
| 23 "web_components_rev": "@0e636b534d9b12c9e96f841e6679398e91a986ec", | 27 "web_components_rev": "@0e636b534d9b12c9e96f841e6679398e91a986ec", |
| 24 "http_parser_rev" : "@6769e916aa2f0a14ae8d5d2cdbddaed81e419665", | |
| 25 | 28 |
| 26 "co19_rev": "@786", | 29 "co19_rev": "@786", |
| 27 "fake_async_rev": "@38614", | 30 "fake_async_rev": "@38614", |
| 28 }) | 31 }) |
| 29 | 32 |
| 30 def massage_deps(deps): | 33 def massage_deps(deps): |
| 31 for key, value in deps.items(): | 34 for key, value in deps.items(): |
| 32 if value is None: continue | 35 if value is None: continue |
| 33 | 36 |
| 34 if value.startswith('/trunk'): | 37 if value.startswith('/trunk'): |
| (...skipping 15 matching lines...) Expand all Loading... |
| 50 deps.update({ | 53 deps.update({ |
| 51 "src": | 54 "src": |
| 52 Var("dartium_base") + Var("dartium_chromium_branch") + "@" + | 55 Var("dartium_base") + Var("dartium_chromium_branch") + "@" + |
| 53 Var("dartium_chromium_revision"), | 56 Var("dartium_chromium_revision"), |
| 54 | 57 |
| 55 "src/dart": | 58 "src/dart": |
| 56 Var("dart_branch") + "/dart", | 59 Var("dart_branch") + "/dart", |
| 57 | 60 |
| 58 "src/dart/third_party/pkg/http_parser": | 61 "src/dart/third_party/pkg/http_parser": |
| 59 "https://github.com/dart-lang/http_parser.git" + Var("http_parser_rev"), | 62 "https://github.com/dart-lang/http_parser.git" + Var("http_parser_rev"), |
| 63 "dart/third_party/pkg/matcher": |
| 64 "https://github.com/dart-lang/matcher.git" + Var("matcher_rev"), |
| 60 "src/dart/third_party/pkg/metatest": | 65 "src/dart/third_party/pkg/metatest": |
| 61 "https://github.com/dart-lang/metatest.git" + Var("metatest_rev"), | 66 "https://github.com/dart-lang/metatest.git" + Var("metatest_rev"), |
| 62 "src/dart/third_party/pkg/path": | 67 "src/dart/third_party/pkg/path": |
| 63 "https://github.com/dart-lang/path.git" + Var("path_rev"), | 68 "https://github.com/dart-lang/path.git" + Var("path_rev"), |
| 64 "src/dart/third_party/pkg/source_span": | 69 "src/dart/third_party/pkg/source_span": |
| 65 "https://github.com/dart-lang/source_span.git" + Var("source_span_rev"), | 70 "https://github.com/dart-lang/source_span.git" + Var("source_span_rev"), |
| 66 "src/dart/third_party/pkg/stack_trace": | 71 "src/dart/third_party/pkg/stack_trace": |
| 67 "https://github.com/dart-lang/stack_trace.git" + Var("stack_trace_rev"), | 72 "https://github.com/dart-lang/stack_trace.git" + Var("stack_trace_rev"), |
| 68 "src/dart/third_party/pkg/string_scanner": | 73 "src/dart/third_party/pkg/string_scanner": |
| 69 "https://github.com/dart-lang/string_scanner.git" + | 74 "https://github.com/dart-lang/string_scanner.git" + |
| 70 Var("string_scanner_rev"), | 75 Var("string_scanner_rev"), |
| 76 "dart/third_party/pkg/unittest": |
| 77 "https://github.com/dart-lang/unittest.git" + Var("unittest_rev"), |
| 71 "src/dart/third_party/pkg/web_components": | 78 "src/dart/third_party/pkg/web_components": |
| 72 "https://github.com/dart-lang/web-components.git" + | 79 "https://github.com/dart-lang/web-components.git" + |
| 73 Var("web_components_rev"), | 80 Var("web_components_rev"), |
| 74 | 81 |
| 75 "src/dart/third_party/WebCore": | 82 "src/dart/third_party/WebCore": |
| 76 "/third_party/WebCore", | 83 "/third_party/WebCore", |
| 77 | 84 |
| 78 "src/dart/third_party/pkg/fake_async": | 85 "src/dart/third_party/pkg/fake_async": |
| 79 "/third_party/fake_async" + Var("fake_async_rev"), | 86 "/third_party/fake_async" + Var("fake_async_rev"), |
| 80 | 87 |
| (...skipping 29 matching lines...) Expand all Loading... |
| 110 hooks.append({ | 117 hooks.append({ |
| 111 # Peg the blink version number in LASTCHANGE.blink to be the upstream | 118 # Peg the blink version number in LASTCHANGE.blink to be the upstream |
| 112 # webkit_revision number so that chrome remote devtools pulls assets from | 119 # webkit_revision number so that chrome remote devtools pulls assets from |
| 113 # the right place. | 120 # the right place. |
| 114 "name": "lastchange", | 121 "name": "lastchange", |
| 115 "pattern": ".", | 122 "pattern": ".", |
| 116 "action": ["python", "-c", | 123 "action": ["python", "-c", |
| 117 "f=open('src/build/util/LASTCHANGE.blink','w'); f.write('LASTCHANGE=" + | 124 "f=open('src/build/util/LASTCHANGE.blink','w'); f.write('LASTCHANGE=" + |
| 118 Var('webkit_revision') + "\\n')" ], | 125 Var('webkit_revision') + "\\n')" ], |
| 119 }) | 126 }) |
| OLD | NEW |