OLD | NEW |
1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
2 # Copyright 2014 The Chromium Authors. All rights reserved. | 2 # Copyright 2014 The Chromium Authors. All rights reserved. |
3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
5 | 5 |
6 import os | 6 import os |
7 import sys | 7 import sys |
8 from utils import commit | 8 from utils import commit |
9 from utils import mojo_root_dir | 9 from utils import mojo_root_dir |
10 from utils import system | 10 from utils import system |
11 | 11 |
12 dirs_to_clone = [ | 12 dirs_to_clone = [ |
13 "mojo/edk", | 13 "mojo/edk", |
14 "mojo/public", | 14 "mojo/public", |
15 "mojo/services/public", | 15 "mojo/services/public", |
16 "mojo/services/accessibility/public", | 16 "mojo/services/accessibility/public", |
17 "mojo/services/clipboard/public", | 17 "mojo/services/clipboard/public", |
18 "mojo/services/content_handler/public", | 18 "mojo/services/content_handler/public", |
19 "mojo/services/geometry/public", | 19 "mojo/services/geometry/public", |
20 "mojo/services/gpu/public", | 20 "mojo/services/gpu/public", |
21 "mojo/services/input_events/public", | 21 "mojo/services/input_events/public", |
22 "mojo/services/native_viewport/public", | 22 "mojo/services/native_viewport/public", |
| 23 "mojo/services/navigation/public", |
23 "mojo/services/network/public", | 24 "mojo/services/network/public", |
24 "mojo/services/surfaces/public", | 25 "mojo/services/surfaces/public", |
25 "mojo/services/view_manager/public", | 26 "mojo/services/view_manager/public", |
26 "mojo/services/window_manager/public", | 27 "mojo/services/window_manager/public", |
27 ] | 28 ] |
28 | 29 |
29 def rev(source_dir, chromium_dir): | 30 def rev(source_dir, chromium_dir): |
30 src_commit = system(["git", "show-ref", "HEAD", "-s"], cwd=source_dir).strip() | 31 src_commit = system(["git", "show-ref", "HEAD", "-s"], cwd=source_dir).strip() |
31 | 32 |
32 for d in dirs_to_clone: | 33 for d in dirs_to_clone: |
(...skipping 16 matching lines...) Expand all Loading... |
49 with open("mojo/public/VERSION", "w") as version_file: | 50 with open("mojo/public/VERSION", "w") as version_file: |
50 version_file.write(src_commit) | 51 version_file.write(src_commit) |
51 system(["git", "add", "mojo/public/VERSION"], cwd=chromium_dir) | 52 system(["git", "add", "mojo/public/VERSION"], cwd=chromium_dir) |
52 commit("Update mojo sdk to rev " + src_commit, cwd=chromium_dir) | 53 commit("Update mojo sdk to rev " + src_commit, cwd=chromium_dir) |
53 | 54 |
54 if len(sys.argv) != 2: | 55 if len(sys.argv) != 2: |
55 print "usage: rev_sdk.py <chromium source dir>" | 56 print "usage: rev_sdk.py <chromium source dir>" |
56 sys.exit(1) | 57 sys.exit(1) |
57 | 58 |
58 rev(mojo_root_dir, sys.argv[1]) | 59 rev(mojo_root_dir, sys.argv[1]) |
OLD | NEW |