| 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": "master", | 12 "dartium_chromium_branch": "master", |
| 13 "dartium_chromium_commit": "5daf3bceac78c2038362cda6250e3201e5899ece", | 13 "dartium_chromium_commit": "5daf3bceac78c2038362cda6250e3201e5899ece", |
| 14 "chromium_base_revision": "297060", | 14 "chromium_base_revision": "297060", |
| 15 "dart_branch": "/branches/bleeding_edge", | 15 "dart_branch": "/branches/bleeding_edge", |
| 16 "dartium_webkit_branch": "/blink/branches/dart/dartium", | 16 "dartium_webkit_branch": "/blink/branches/dart/dartium", |
| 17 "dartium_webkit_revision": "191870", | 17 "dartium_webkit_revision": "191870", |
| 18 | 18 |
| 19 "args_rev": "@2699ca11b09158ab23ff4cb464ab255e89cc2f27", | 19 "args_tag": "@0.13.0", |
| 20 "barback_rev" : "@29ee90dbcf77cfd64632fa2797a4c8a4f29a4b51", | 20 "barback_rev" : "@29ee90dbcf77cfd64632fa2797a4c8a4f29a4b51", |
| 21 "collection_rev": "@1da9a07f32efa2ba0c391b289e2037391e31da0e", | 21 "collection_rev": "@1da9a07f32efa2ba0c391b289e2037391e31da0e", |
| 22 "crypto_rev" : "@2df57a1e26dd88e8d0614207d4b062c73209917d", | 22 "crypto_rev" : "@2df57a1e26dd88e8d0614207d4b062c73209917d", |
| 23 "glob_rev": "@704cf75e4f26b417505c5c611bdaacd8808467dd", | 23 "glob_rev": "@704cf75e4f26b417505c5c611bdaacd8808467dd", |
| 24 "http_rev" : "@9b93e1542c753090c50b46ef1592d44bc858bfe7", | 24 "http_rev" : "@9b93e1542c753090c50b46ef1592d44bc858bfe7", |
| 25 "http_multi_server_tag" : "@1.3.2", | 25 "http_multi_server_tag" : "@1.3.2", |
| 26 "http_parser_rev" : "@8b179e36aba985208e4c5fb15cfddd386b6370a4", | 26 "http_parser_rev" : "@8b179e36aba985208e4c5fb15cfddd386b6370a4", |
| 27 "http_throttle_rev" : "@a81f08be942cdd608883c7b67795c12226abc235", | 27 "http_throttle_rev" : "@a81f08be942cdd608883c7b67795c12226abc235", |
| 28 "json_rpc_2_rev": "@a38eefd116d910199de205f962af92fed87c164c", | 28 "json_rpc_2_rev": "@a38eefd116d910199de205f962af92fed87c164c", |
| 29 "logging_rev": "@85d83e002670545e9039ad3985f0018ab640e597", | 29 "logging_rev": "@85d83e002670545e9039ad3985f0018ab640e597", |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 "https://github.com/dart-lang/shelf.git" + Var("shelf_rev"), | 114 "https://github.com/dart-lang/shelf.git" + Var("shelf_rev"), |
| 115 "src/dart/third_party/pkg/shelf_web_socket": | 115 "src/dart/third_party/pkg/shelf_web_socket": |
| 116 "https://github.com/dart-lang/shelf_web_socket.git" + | 116 "https://github.com/dart-lang/shelf_web_socket.git" + |
| 117 Var("shelf_web_socket_rev"), | 117 Var("shelf_web_socket_rev"), |
| 118 "src/dart/third_party/pkg/watcher": | 118 "src/dart/third_party/pkg/watcher": |
| 119 "https://github.com/dart-lang/watcher.git" + Var("watcher_tag"), | 119 "https://github.com/dart-lang/watcher.git" + Var("watcher_tag"), |
| 120 "src/dart/third_party/pkg/yaml": | 120 "src/dart/third_party/pkg/yaml": |
| 121 "https://github.com/dart-lang/yaml.git" + Var("yaml_rev"), | 121 "https://github.com/dart-lang/yaml.git" + Var("yaml_rev"), |
| 122 | 122 |
| 123 "src/dart/third_party/pkg/args": | 123 "src/dart/third_party/pkg/args": |
| 124 "https://github.com/dart-lang/args.git" + Var("args_rev"), | 124 "https://github.com/dart-lang/args.git" + Var("args_tag"), |
| 125 "src/dart/third_party/pkg/http_parser": | 125 "src/dart/third_party/pkg/http_parser": |
| 126 "https://github.com/dart-lang/http_parser.git" + Var("http_parser_rev"), | 126 "https://github.com/dart-lang/http_parser.git" + Var("http_parser_rev"), |
| 127 "src/dart/third_party/pkg/matcher": | 127 "src/dart/third_party/pkg/matcher": |
| 128 "https://github.com/dart-lang/matcher.git" + Var("matcher_tag"), | 128 "https://github.com/dart-lang/matcher.git" + Var("matcher_tag"), |
| 129 "src/dart/third_party/pkg/metatest": | 129 "src/dart/third_party/pkg/metatest": |
| 130 "https://github.com/dart-lang/metatest.git" + Var("metatest_rev"), | 130 "https://github.com/dart-lang/metatest.git" + Var("metatest_rev"), |
| 131 "src/dart/third_party/pkg/path": | 131 "src/dart/third_party/pkg/path": |
| 132 "https://github.com/dart-lang/path.git" + Var("path_rev"), | 132 "https://github.com/dart-lang/path.git" + Var("path_rev"), |
| 133 "src/dart/third_party/pkg/source_span": | 133 "src/dart/third_party/pkg/source_span": |
| 134 "https://github.com/dart-lang/source_span.git" + Var("source_span_rev"), | 134 "https://github.com/dart-lang/source_span.git" + Var("source_span_rev"), |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 hooks.append({ | 189 hooks.append({ |
| 190 # Peg the blink version number in LASTCHANGE.blink to be the upstream | 190 # Peg the blink version number in LASTCHANGE.blink to be the upstream |
| 191 # webkit_revision number so that chrome remote devtools pulls assets from | 191 # webkit_revision number so that chrome remote devtools pulls assets from |
| 192 # the right place. | 192 # the right place. |
| 193 "name": "lastchange", | 193 "name": "lastchange", |
| 194 "pattern": ".", | 194 "pattern": ".", |
| 195 "action": ["python", "-c", | 195 "action": ["python", "-c", |
| 196 "f=open('src/build/util/LASTCHANGE.blink','w'); f.write('LASTCHANGE=" + | 196 "f=open('src/build/util/LASTCHANGE.blink','w'); f.write('LASTCHANGE=" + |
| 197 Var('webkit_revision') + "\\n')" ], | 197 Var('webkit_revision') + "\\n')" ], |
| 198 }) | 198 }) |
| OLD | NEW |