Commit bf25b31a authored by Devon Carew's avatar Devon Carew Committed by GitHub

some updates to the launch verbiage (#7236)

parent cffe4812
...@@ -337,6 +337,9 @@ class AppDomain extends Domain { ...@@ -337,6 +337,9 @@ class AppDomain extends Domain {
throw 'unhandle build mode: $buildMode'; throw 'unhandle build mode: $buildMode';
} }
if (device.isLocalEmulator && !isEmulatorBuildMode(buildMode))
throw '${toTitleCase(getModeName(buildMode))} mode is not supported for emulators.';
// We change the current working directory for the duration of the `start` command. // We change the current working directory for the duration of the `start` command.
Directory cwd = Directory.current; Directory cwd = Directory.current;
Directory.current = new Directory(projectDirectory); Directory.current = new Directory(projectDirectory);
......
...@@ -171,9 +171,14 @@ class RunCommand extends RunCommandBase { ...@@ -171,9 +171,14 @@ class RunCommand extends RunCommandBase {
if (argResults['machine']) { if (argResults['machine']) {
Daemon daemon = new Daemon(stdinCommandStream, stdoutCommandResponse, Daemon daemon = new Daemon(stdinCommandStream, stdoutCommandResponse,
notifyingLogger: new NotifyingLogger(), logToStdout: true); notifyingLogger: new NotifyingLogger(), logToStdout: true);
AppInstance app = daemon.appDomain.startApp( AppInstance app;
device, Directory.current.path, targetFile, route, try {
getBuildMode(), argResults['start-paused'], hotMode); app = daemon.appDomain.startApp(
device, Directory.current.path, targetFile, route,
getBuildMode(), argResults['start-paused'], hotMode);
} catch (error) {
throwToolExit(error.toString());
}
int result = await app.runner.waitForAppToFinish(); int result = await app.runner.waitForAppToFinish();
if (result != 0) if (result != 0)
throwToolExit(null, exitCode: result); throwToolExit(null, exitCode: result);
......
...@@ -196,7 +196,8 @@ class HotRunner extends ResidentRunner { ...@@ -196,7 +196,8 @@ class HotRunner extends ResidentRunner {
await startEchoingDeviceLog(_package); await startEchoingDeviceLog(_package);
printStatus('Launching ${getDisplayPath(_mainPath)} on ${device.name}...'); String modeName = getModeName(debuggingOptions.buildMode);
printStatus('Launching ${getDisplayPath(_mainPath)} on ${device.name} in $modeName mode...');
// Start the application. // Start the application.
Future<LaunchResult> futureResult = device.startApp( Future<LaunchResult> futureResult = device.startApp(
......
...@@ -10,6 +10,7 @@ import 'package:stack_trace/stack_trace.dart'; ...@@ -10,6 +10,7 @@ import 'package:stack_trace/stack_trace.dart';
import 'application_package.dart'; import 'application_package.dart';
import 'base/utils.dart'; import 'base/utils.dart';
import 'build_info.dart';
import 'commands/trace.dart'; import 'commands/trace.dart';
import 'device.dart'; import 'device.dart';
import 'globals.dart'; import 'globals.dart';
...@@ -94,11 +95,13 @@ class RunAndStayResident extends ResidentRunner { ...@@ -94,11 +95,13 @@ class RunAndStayResident extends ResidentRunner {
platformArgs = <String, dynamic>{ 'trace-startup': traceStartup }; platformArgs = <String, dynamic>{ 'trace-startup': traceStartup };
await startEchoingDeviceLog(_package); await startEchoingDeviceLog(_package);
String modeName = getModeName(debuggingOptions.buildMode);
if (_mainPath == null) { if (_mainPath == null) {
assert(prebuiltMode); assert(prebuiltMode);
printStatus('Running ${_package.displayName} on ${device.name}'); printStatus('Launching ${_package.displayName} on ${device.name} in $modeName mode...');
} else { } else {
printStatus('Running ${getDisplayPath(_mainPath)} on ${device.name}...'); printStatus('Launching ${getDisplayPath(_mainPath)} on ${device.name} in $modeName mode...');
} }
_result = await device.startApp( _result = await device.startApp(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment