OLD | NEW |
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 import json | 5 import json |
6 import os | 6 import os |
7 import pipes | 7 import pipes |
8 import shutil | 8 import shutil |
9 import subprocess | 9 import subprocess |
10 import sys | 10 import sys |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 copy_runtime_impl(os.path.join(out_release, pgo_runtime_dll), source_x86) | 122 copy_runtime_impl(os.path.join(out_release, pgo_runtime_dll), source_x86) |
123 source_x64 = os.path.join(pgo_x64_runtime_dir, pgo_runtime_dll) | 123 source_x64 = os.path.join(pgo_x64_runtime_dir, pgo_runtime_dll) |
124 if os.path.exists(source_x64): | 124 if os.path.exists(source_x64): |
125 copy_runtime_impl(os.path.join(out_release_x64, pgo_runtime_dll), | 125 copy_runtime_impl(os.path.join(out_release_x64, pgo_runtime_dll), |
126 source_x64) | 126 source_x64) |
127 | 127 |
128 | 128 |
129 def _GetDesiredVsToolchainHashes(): | 129 def _GetDesiredVsToolchainHashes(): |
130 """Load a list of SHA1s corresponding to the toolchains that we want installed | 130 """Load a list of SHA1s corresponding to the toolchains that we want installed |
131 to build with.""" | 131 to build with.""" |
132 sha1path = os.path.join(script_dir, 'toolchain_vs2013.hash') | 132 sha1path = os.path.join(script_dir, |
| 133 '..', 'buildtools', 'toolchain_vs2013.hash') |
133 with open(sha1path, 'rb') as f: | 134 with open(sha1path, 'rb') as f: |
134 return f.read().strip().splitlines() | 135 return f.read().strip().splitlines() |
135 | 136 |
136 | 137 |
137 def Update(): | 138 def Update(): |
138 """Requests an update of the toolchain to the specific hashes we have at | 139 """Requests an update of the toolchain to the specific hashes we have at |
139 this revision. The update outputs a .json of the various configuration | 140 this revision. The update outputs a .json of the various configuration |
140 information required to pass to gyp which we use in |GetToolchainDir()|. | 141 information required to pass to gyp which we use in |GetToolchainDir()|. |
141 """ | 142 """ |
142 depot_tools_win_toolchain = \ | 143 depot_tools_win_toolchain = \ |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
182 # CopyVsRuntimeDlls via import, currently). | 183 # CopyVsRuntimeDlls via import, currently). |
183 } | 184 } |
184 if len(sys.argv) < 2 or sys.argv[1] not in commands: | 185 if len(sys.argv) < 2 or sys.argv[1] not in commands: |
185 print >>sys.stderr, 'Expected one of: %s' % ', '.join(commands) | 186 print >>sys.stderr, 'Expected one of: %s' % ', '.join(commands) |
186 return 1 | 187 return 1 |
187 return commands[sys.argv[1]]() | 188 return commands[sys.argv[1]]() |
188 | 189 |
189 | 190 |
190 if __name__ == '__main__': | 191 if __name__ == '__main__': |
191 sys.exit(main()) | 192 sys.exit(main()) |
OLD | NEW |