| 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/geometry/public", | 17 "mojo/services/geometry/public", |
| 18 "mojo/services/gpu/public", |
| 18 "mojo/services/native_viewport/public", | 19 "mojo/services/native_viewport/public", |
| 19 "mojo/services/network/public", | 20 "mojo/services/network/public", |
| 20 "mojo/services/surfaces/public", | 21 "mojo/services/surfaces/public", |
| 21 "mojo/services/view_manager/public", | 22 "mojo/services/view_manager/public", |
| 22 "mojo/services/window_manager/public", | 23 "mojo/services/window_manager/public", |
| 23 ] | 24 ] |
| 24 | 25 |
| 25 def rev(source_dir, chromium_dir): | 26 def rev(source_dir, chromium_dir): |
| 26 src_commit = system(["git", "show-ref", "HEAD", "-s"], cwd=source_dir).strip() | 27 src_commit = system(["git", "show-ref", "HEAD", "-s"], cwd=source_dir).strip() |
| 27 | 28 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 45 with open("mojo/public/VERSION", "w") as version_file: | 46 with open("mojo/public/VERSION", "w") as version_file: |
| 46 version_file.write(src_commit) | 47 version_file.write(src_commit) |
| 47 system(["git", "add", "mojo/public/VERSION"], cwd=chromium_dir) | 48 system(["git", "add", "mojo/public/VERSION"], cwd=chromium_dir) |
| 48 commit("Update mojo sdk to rev " + src_commit, cwd=chromium_dir) | 49 commit("Update mojo sdk to rev " + src_commit, cwd=chromium_dir) |
| 49 | 50 |
| 50 if len(sys.argv) != 2: | 51 if len(sys.argv) != 2: |
| 51 print "usage: rev_sdk.py <chromium source dir>" | 52 print "usage: rev_sdk.py <chromium source dir>" |
| 52 sys.exit(1) | 53 sys.exit(1) |
| 53 | 54 |
| 54 rev(mojo_root_dir, sys.argv[1]) | 55 rev(mojo_root_dir, sys.argv[1]) |
| OLD | NEW |