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": "master", | 12 "dartium_chromium_branch": "master", |
| 13 "dartium_chromium_commit": "2bc49d71121edbec13d9ca6bea5fc38a666b2526", | 13 "dartium_chromium_commit": "2bc49d71121edbec13d9ca6bea5fc38a666b2526", |
| 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": "190578", | 17 "dartium_webkit_revision": "190578", |
| 18 | 18 |
| 19 "args_rev": "@2699ca11b09158ab23ff4cb464ab255e89cc2f27", | 19 "args_rev": "@2699ca11b09158ab23ff4cb464ab255e89cc2f27", |
| 20 "barback_rev" : "@29ee90dbcf77cfd64632fa2797a4c8a4f29a4b51", | 20 "barback_rev" : "@29ee90dbcf77cfd64632fa2797a4c8a4f29a4b51", |
| 21 "collection_rev": "@1da9a07f32efa2ba0c391b289e2037391e31da0e", | |
|
Søren Gjesse
2015/02/26 10:09:46
No use of this below.
| |
| 22 "crypto_rev" : "@2df57a1e26dd88e8d0614207d4b062c73209917d", | |
| 21 "glob_rev": "@704cf75e4f26b417505c5c611bdaacd8808467dd", | 23 "glob_rev": "@704cf75e4f26b417505c5c611bdaacd8808467dd", |
| 22 "http_rev" : "@9b93e1542c753090c50b46ef1592d44bc858bfe7", | 24 "http_rev" : "@9b93e1542c753090c50b46ef1592d44bc858bfe7", |
| 23 "http_multi_server_rev" : "@84f368d86fd9619def668e49824fe3e71a1e010f", | 25 "http_multi_server_rev" : "@84f368d86fd9619def668e49824fe3e71a1e010f", |
| 24 "http_parser_rev" : "@8b179e36aba985208e4c5fb15cfddd386b6370a4", | 26 "http_parser_rev" : "@8b179e36aba985208e4c5fb15cfddd386b6370a4", |
| 25 "http_throttle_rev" : "@a81f08be942cdd608883c7b67795c12226abc235", | 27 "http_throttle_rev" : "@a81f08be942cdd608883c7b67795c12226abc235", |
| 26 "json_rpc_2_rev": "@a38eefd116d910199de205f962af92fed87c164c", | 28 "json_rpc_2_rev": "@a38eefd116d910199de205f962af92fed87c164c", |
| 27 "logging_rev": "@85d83e002670545e9039ad3985f0018ab640e597", | 29 "logging_rev": "@85d83e002670545e9039ad3985f0018ab640e597", |
| 28 "matcher_rev": "@1cad08d3ee7b14e00fee83718236b92e5cf9c9e9", | 30 "matcher_rev": "@1cad08d3ee7b14e00fee83718236b92e5cf9c9e9", |
| 29 "metatest_rev": "@e5aa8e4e19fc4188ac2f6d38368a47d8f07c3df1", | 31 "metatest_rev": "@e5aa8e4e19fc4188ac2f6d38368a47d8f07c3df1", |
| 30 "oauth2_rev": "@1bff41f4d54505c36f2d1a001b83b8b745c452f5", | 32 "oauth2_rev": "@1bff41f4d54505c36f2d1a001b83b8b745c452f5", |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 75 "src/third_party/WebKit": | 77 "src/third_party/WebKit": |
| 76 Var("dartium_base") + Var("dartium_webkit_branch") + "@" + | 78 Var("dartium_base") + Var("dartium_webkit_branch") + "@" + |
| 77 Var("dartium_webkit_revision"), | 79 Var("dartium_webkit_revision"), |
| 78 | 80 |
| 79 "src/dart": | 81 "src/dart": |
| 80 Var("dart_branch") + "/dart", | 82 Var("dart_branch") + "/dart", |
| 81 | 83 |
| 82 # Needed to run pub. | 84 # Needed to run pub. |
| 83 "src/dart/third_party/pkg/barback": | 85 "src/dart/third_party/pkg/barback": |
| 84 "https://github.com/dart-lang/barback.git" + Var("barback_rev"), | 86 "https://github.com/dart-lang/barback.git" + Var("barback_rev"), |
| 87 "src/dart/third_party/pkg/crypto": | |
| 88 "https://github.com/dart-lang/crypto.git" + Var("crypto_rev"), | |
| 85 "src/dart/third_party/pkg/glob": | 89 "src/dart/third_party/pkg/glob": |
| 86 "https://github.com/dart-lang/glob.git" + Var("glob_rev"), | 90 "https://github.com/dart-lang/glob.git" + Var("glob_rev"), |
| 87 "src/dart/third_party/pkg/json_rpc_2": | 91 "src/dart/third_party/pkg/json_rpc_2": |
| 88 "https://github.com/dart-lang/json_rpc_2.git" + Var("json_rpc_2_rev"), | 92 "https://github.com/dart-lang/json_rpc_2.git" + Var("json_rpc_2_rev"), |
| 89 "src/dart/third_party/pkg/http": | 93 "src/dart/third_party/pkg/http": |
| 90 "https://github.com/dart-lang/http.git" + Var("http_rev"), | 94 "https://github.com/dart-lang/http.git" + Var("http_rev"), |
| 91 "src/dart/third_party/pkg/http_multi_server": | 95 "src/dart/third_party/pkg/http_multi_server": |
| 92 "https://github.com/dart-lang/http_multi_server.git" + | 96 "https://github.com/dart-lang/http_multi_server.git" + |
| 93 Var("http_multi_server_rev"), | 97 Var("http_multi_server_rev"), |
| 94 "src/dart/third_party/pkg/http_parser": | 98 "src/dart/third_party/pkg/http_parser": |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 180 hooks.append({ | 184 hooks.append({ |
| 181 # Peg the blink version number in LASTCHANGE.blink to be the upstream | 185 # Peg the blink version number in LASTCHANGE.blink to be the upstream |
| 182 # webkit_revision number so that chrome remote devtools pulls assets from | 186 # webkit_revision number so that chrome remote devtools pulls assets from |
| 183 # the right place. | 187 # the right place. |
| 184 "name": "lastchange", | 188 "name": "lastchange", |
| 185 "pattern": ".", | 189 "pattern": ".", |
| 186 "action": ["python", "-c", | 190 "action": ["python", "-c", |
| 187 "f=open('src/build/util/LASTCHANGE.blink','w'); f.write('LASTCHANGE=" + | 191 "f=open('src/build/util/LASTCHANGE.blink','w'); f.write('LASTCHANGE=" + |
| 188 Var('webkit_revision') + "\\n')" ], | 192 Var('webkit_revision') + "\\n')" ], |
| 189 }) | 193 }) |
| OLD | NEW |