DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-15 07:11:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

set the FLUTTER_ROOT env var when invoking pub (#6041)

Browse Source
This commit is contained in:
Devon Carew 2016-09-25 19:30:44 -07:00 committed by GitHub
parent 54e208e480
commit fa52b456ec
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/flutter_tools/lib/src/base/process.dart
View File

@ -12,15 +12,23 @@ typedef String StringConverter(String string);
// TODO(ianh): We have way too many ways to run subprocesses in this project.
Map<String, String> _environment(bool allowReentrantFlutter) {
return allowReentrantFlutter ? <String, String>{ 'FLUTTER_ALREADY_LOCKED': 'true' } : null;
Map<String, String> _environment(bool allowReentrantFlutter, [Map<String, String> environment]) {
if (allowReentrantFlutter) {
if (environment == null)
environment = <String, String>{ 'FLUTTER_ALREADY_LOCKED': 'true' };
else
environment['FLUTTER_ALREADY_LOCKED'] = 'true';
}
return environment;
}
/// This runs the command in the background from the specified working
/// directory. Completes when the process has been started.
Future<Process> runCommand(List<String> cmd, {
String workingDirectory,
bool allowReentrantFlutter: false
bool allowReentrantFlutter: false,
Map<String, String> environment
}) async {
_traceCommand(cmd, workingDirectory: workingDirectory);
String executable = cmd[0];
@ -29,7 +37,7 @@ Future<Process> runCommand(List<String> cmd, {
executable,
arguments,
workingDirectory: workingDirectory,
environment: _environment(allowReentrantFlutter)
environment: _environment(allowReentrantFlutter, environment)
);
return process;
}
@ -42,12 +50,14 @@ Future<int> runCommandAndStreamOutput(List<String> cmd, {
String prefix: '',
bool trace: false,
RegExp filter,
StringConverter mapFunction
StringConverter mapFunction,
Map<String, String> environment
}) async {
Process process = await runCommand(
cmd,
workingDirectory: workingDirectory,
allowReentrantFlutter: allowReentrantFlutter
allowReentrantFlutter: allowReentrantFlutter,
environment: environment
);
StreamSubscription<String> subscription = process.stdout
.transform(UTF8.decoder)

3
packages/flutter_tools/lib/src/dart/pub.dart
View File

@ -50,7 +50,8 @@ Future<int> pubGet({
int code = await runCommandAndStreamOutput(
<String>[sdkBinaryName('pub'), '--verbosity=warning', command, '--no-packages-dir', '--no-precompile'],
workingDirectory: directory,
mapFunction: _filterOverrideWarnings
mapFunction: _filterOverrideWarnings,
environment: <String, String>{ 'FLUTTER_ROOT': Cache.flutterRoot }
);
status.stop(showElapsedTime: true);
if (code != 0)