| 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_git': 'https://chromium.googlesource.com', | 10 'chromium_git': 'https://chromium.googlesource.com', |
| 11 'googlecode_url': 'http://%s.googlecode.com/svn', | 11 'googlecode_url': 'http://%s.googlecode.com/svn', |
| 12 'webkit_revision': '889f35a63b23d86c0f318af9a65a875117811cfd', # from svn revi
sion 18277 | 12 'webkit_revision': '889f35a63b23d86c0f318af9a65a875117811cfd', # from svn revi
sion 18277 |
| 13 | 13 |
| 14 "chromium_url": "http://src.chromium.org/svn", | 14 "chromium_url": "http://src.chromium.org/svn", |
| 15 "dartium_base": "http://src.chromium.org", | 15 "dartium_base": "http://src.chromium.org", |
| 16 "dartium_chromium_branch": "releases/2171", | 16 "dartium_chromium_branch": "releases/2171", |
| 17 "dartium_chromium_commit": "a68efcf7f47b66832e4662b91e54612555f4964e", | 17 "dartium_chromium_commit": "a68efcf7f47b66832e4662b91e54612555f4964e", |
| 18 "chromium_base_revision": "297060", | 18 "chromium_base_revision": "297060", |
| 19 "dart_branch": "/trunk", | 19 "dart_branch": "/branches/1.9", |
| 20 "dartium_webkit_branch": "/blink/branches/dart/2171_2", | 20 "dartium_webkit_branch": "/blink/branches/dart/2171_2", |
| 21 "dartium_webkit_revision": "191225", | 21 "dartium_webkit_revision": "191225", |
| 22 | 22 |
| 23 "args_rev": "@2699ca11b09158ab23ff4cb464ab255e89cc2f27", | 23 "args_rev": "@2699ca11b09158ab23ff4cb464ab255e89cc2f27", |
| 24 "barback_rev" : "@29ee90dbcf77cfd64632fa2797a4c8a4f29a4b51", | 24 "barback_rev" : "@29ee90dbcf77cfd64632fa2797a4c8a4f29a4b51", |
| 25 "collection_rev": "@1da9a07f32efa2ba0c391b289e2037391e31da0e", | 25 "collection_rev": "@1da9a07f32efa2ba0c391b289e2037391e31da0e", |
| 26 "crypto_rev" : "@2df57a1e26dd88e8d0614207d4b062c73209917d", | 26 "crypto_rev" : "@2df57a1e26dd88e8d0614207d4b062c73209917d", |
| 27 "glob_rev": "@704cf75e4f26b417505c5c611bdaacd8808467dd", | 27 "glob_rev": "@704cf75e4f26b417505c5c611bdaacd8808467dd", |
| 28 "http_rev" : "@9b93e1542c753090c50b46ef1592d44bc858bfe7", | 28 "http_rev" : "@9b93e1542c753090c50b46ef1592d44bc858bfe7", |
| 29 "http_multi_server_rev" : "@84f368d86fd9619def668e49824fe3e71a1e010f", | 29 "http_multi_server_rev" : "@84f368d86fd9619def668e49824fe3e71a1e010f", |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 193 hooks.append({ | 193 hooks.append({ |
| 194 # Peg the blink version number in LASTCHANGE.blink to be the upstream | 194 # Peg the blink version number in LASTCHANGE.blink to be the upstream |
| 195 # webkit_revision number so that chrome remote devtools pulls assets from | 195 # webkit_revision number so that chrome remote devtools pulls assets from |
| 196 # the right place. | 196 # the right place. |
| 197 "name": "lastchange", | 197 "name": "lastchange", |
| 198 "pattern": ".", | 198 "pattern": ".", |
| 199 "action": ["python", "-c", | 199 "action": ["python", "-c", |
| 200 "f=open('src/build/util/LASTCHANGE.blink','w'); f.write('LASTCHANGE=" + | 200 "f=open('src/build/util/LASTCHANGE.blink','w'); f.write('LASTCHANGE=" + |
| 201 Var('webkit_revision') + "\\n')" ], | 201 Var('webkit_revision') + "\\n')" ], |
| 202 }) | 202 }) |
| OLD | NEW |