| 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 from skypy.skyserver import SkyServer | 6 from skypy.skyserver import SkyServer |
| 7 import argparse | 7 import argparse |
| 8 import json | 8 import json |
| 9 import logging | 9 import logging |
| 10 import os | 10 import os |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 194 if not shell_found: | 194 if not shell_found: |
| 195 print "Are you sure you sure that's a valid build_dir location?" | 195 print "Are you sure you sure that's a valid build_dir location?" |
| 196 print "See skydb start --help for more info" | 196 print "See skydb start --help for more info" |
| 197 sys.exit(2) | 197 sys.exit(2) |
| 198 | 198 |
| 199 if is_android and args.gdb and not 'is_debug' in gn_args: | 199 if is_android and args.gdb and not 'is_debug' in gn_args: |
| 200 # FIXME: We don't include gdbserver in the release APK... | 200 # FIXME: We don't include gdbserver in the release APK... |
| 201 print "Cannot debug Release builds on Android" | 201 print "Cannot debug Release builds on Android" |
| 202 sys.exit(2) | 202 sys.exit(2) |
| 203 | 203 |
| 204 sdk_root = os.path.join(self.paths.build_dir, 'gen', 'sky_sdk') | 204 dart_pkg_dir = os.path.join(self.paths.build_dir, 'gen', 'dart-pkg') |
| 205 packages_root = os.path.join(sdk_root, 'packages_root') | 205 packages_root = os.path.join(dart_pkg_dir, 'packages') |
| 206 subprocess.check_call([ | |
| 207 os.path.join(self.paths.sky_tools_directory, 'deploy_sdk.py'), | |
| 208 '--build-dir', self.paths.build_dir, | |
| 209 '--non-interactive', | |
| 210 '--dev-environment', | |
| 211 '--fake-pub-get-into', packages_root, | |
| 212 sdk_root, | |
| 213 ]) | |
| 214 | 206 |
| 215 sky_server = self.sky_server_for_args(args, packages_root) | 207 sky_server = self.sky_server_for_args(args, packages_root) |
| 216 self.pids['sky_server_pid'] = sky_server.start() | 208 self.pids['sky_server_pid'] = sky_server.start() |
| 217 self.pids['sky_server_port'] = sky_server.port | 209 self.pids['sky_server_port'] = sky_server.port |
| 218 self.pids['sky_server_root'] = sky_server.root | 210 self.pids['sky_server_root'] = sky_server.root |
| 219 | 211 |
| 220 self.pids['build_dir'] = self.paths.build_dir | 212 self.pids['build_dir'] = self.paths.build_dir |
| 221 self.pids['sky_command_port'] = args.command_port | 213 self.pids['sky_command_port'] = args.command_port |
| 222 | 214 |
| 223 if is_android: | 215 if is_android: |
| (...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 625 load_parser.set_defaults(func=self.load_command) | 617 load_parser.set_defaults(func=self.load_command) |
| 626 | 618 |
| 627 args = parser.parse_args() | 619 args = parser.parse_args() |
| 628 args.func(args) | 620 args.func(args) |
| 629 | 621 |
| 630 self._write_pid_file(PID_FILE_PATH, self.pids) | 622 self._write_pid_file(PID_FILE_PATH, self.pids) |
| 631 | 623 |
| 632 | 624 |
| 633 if __name__ == '__main__': | 625 if __name__ == '__main__': |
| 634 SkyDebugger().main() | 626 SkyDebugger().main() |
| OLD | NEW |