| OLD | NEW |
| 1 #!/usr/bin/python | 1 #!/usr/bin/python |
| 2 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. | 2 # Copyright (c) 2010 The Chromium OS 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 datetime | 6 import datetime |
| 7 import multiprocessing | 7 import multiprocessing |
| 8 import optparse | 8 import optparse |
| 9 import os | 9 import os |
| 10 import re | 10 import re |
| (...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 374 """ | 374 """ |
| 375 | 375 |
| 376 if not board: | 376 if not board: |
| 377 # We are uploading host packages | 377 # We are uploading host packages |
| 378 # TODO(scottz): eventually add support for different host_targets | 378 # TODO(scottz): eventually add support for different host_targets |
| 379 package_path = os.path.join(build_path, _HOST_PACKAGES_PATH) | 379 package_path = os.path.join(build_path, _HOST_PACKAGES_PATH) |
| 380 gs_path = os.path.join(bucket, _GS_HOST_PATH, version) | 380 gs_path = os.path.join(bucket, _GS_HOST_PATH, version) |
| 381 strip_pattern = package_path | 381 strip_pattern = package_path |
| 382 package_string = _HOST_TARGET | 382 package_string = _HOST_TARGET |
| 383 git_file = os.path.join(build_path, _PREBUILT_MAKE_CONF[_HOST_TARGET]) | 383 git_file = os.path.join(build_path, _PREBUILT_MAKE_CONF[_HOST_TARGET]) |
| 384 url_suffix = '%s/%s' % (_GS_HOST_PATH, version) | 384 url_suffix = '%s/%s/' % (_GS_HOST_PATH, version) |
| 385 else: | 385 else: |
| 386 board_path = os.path.join(build_path, _BOARD_PATH % {'board': board}) | 386 board_path = os.path.join(build_path, _BOARD_PATH % {'board': board}) |
| 387 package_path = os.path.join(board_path, 'packages') | 387 package_path = os.path.join(board_path, 'packages') |
| 388 package_string = board | 388 package_string = board |
| 389 strip_pattern = board_path | 389 strip_pattern = board_path |
| 390 remote_board_path = _GS_BOARD_PATH % {'board': board, 'version': version} | 390 remote_board_path = _GS_BOARD_PATH % {'board': board, 'version': version} |
| 391 gs_path = os.path.join(bucket, remote_board_path) | 391 gs_path = os.path.join(bucket, remote_board_path) |
| 392 git_file = os.path.join(build_path, DetermineMakeConfFile(board)) | 392 git_file = os.path.join(build_path, DetermineMakeConfFile(board)) |
| 393 url_suffix = remote_board_path | 393 url_suffix = remote_board_path |
| 394 | 394 |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 454 UploadPrebuilt(options.build_path, options.upload, version, | 454 UploadPrebuilt(options.build_path, options.upload, version, |
| 455 git_sync=options.git_sync) | 455 git_sync=options.git_sync) |
| 456 | 456 |
| 457 if options.board: | 457 if options.board: |
| 458 UploadPrebuilt(options.build_path, options.upload, version, | 458 UploadPrebuilt(options.build_path, options.upload, version, |
| 459 board=options.board, git_sync=options.git_sync) | 459 board=options.board, git_sync=options.git_sync) |
| 460 | 460 |
| 461 | 461 |
| 462 if __name__ == '__main__': | 462 if __name__ == '__main__': |
| 463 main() | 463 main() |
| OLD | NEW |