github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Expose build-dir config option (#36773)

Browse Source
This commit is contained in:
Jonah Williams 2019-07-24 12:13:51 -07:00 committed by GitHub
parent 6e963b9985
commit 15e322c0e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/flutter_tools/lib/src/commands/config.dart
View File

@ -6,6 +6,8 @@ import 'dart:async';
import '../android/android_sdk.dart'; import '../android/android_sdk.dart';
import '../android/android_studio.dart'; import '../android/android_studio.dart';
import '../base/common.dart';
import '../base/file_system.dart';
import '../convert.dart'; import '../convert.dart';
import '../features.dart'; import '../features.dart';
import '../globals.dart'; import '../globals.dart';
@ -24,6 +26,8 @@ class ConfigCommand extends FlutterCommand {
argParser.addOption('gradle-dir', help: 'The gradle install directory.'); argParser.addOption('gradle-dir', help: 'The gradle install directory.');
argParser.addOption('android-sdk', help: 'The Android SDK directory.'); argParser.addOption('android-sdk', help: 'The Android SDK directory.');
argParser.addOption('android-studio-dir', help: 'The Android Studio install directory.'); argParser.addOption('android-studio-dir', help: 'The Android Studio install directory.');
argParser.addOption('build-dir', help: 'The relative path to override a projects build directory',
valueHelp: 'out/');
argParser.addFlag('machine', argParser.addFlag('machine',
negatable: false, negatable: false,
hide: !verboseHelp, hide: !verboseHelp,
@ -128,6 +132,14 @@ class ConfigCommand extends FlutterCommand {
if (argResults.wasParsed('clear-ios-signing-cert')) if (argResults.wasParsed('clear-ios-signing-cert'))
_updateConfig('ios-signing-cert', ''); _updateConfig('ios-signing-cert', '');
if (argResults.wasParsed('build-dir')) {
final String buildDir = argResults['build-dir'];
if (fs.path.isAbsolute(buildDir)) {
throwToolExit('build-dir should be a relative path');
}
_updateConfig('build-dir', buildDir);
}
for (Feature feature in allFeatures) { for (Feature feature in allFeatures) {
if (feature.configSetting == null) { if (feature.configSetting == null) {
continue; continue;

24
packages/flutter_tools/test/general.shard/commands/config_test.dart
View File

@ -7,9 +7,11 @@ import 'dart:convert';
import 'package:args/command_runner.dart'; import 'package:args/command_runner.dart';
import 'package:flutter_tools/src/android/android_sdk.dart'; import 'package:flutter_tools/src/android/android_sdk.dart';
import 'package:flutter_tools/src/android/android_studio.dart'; import 'package:flutter_tools/src/android/android_studio.dart';
import 'package:flutter_tools/src/base/common.dart';
import 'package:flutter_tools/src/base/config.dart'; import 'package:flutter_tools/src/base/config.dart';
import 'package:flutter_tools/src/base/context.dart'; import 'package:flutter_tools/src/base/context.dart';
import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/base/logger.dart';
import 'package:flutter_tools/src/build_info.dart';
import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/cache.dart';
import 'package:flutter_tools/src/commands/config.dart'; import 'package:flutter_tools/src/commands/config.dart';
import 'package:flutter_tools/src/version.dart'; import 'package:flutter_tools/src/version.dart';
@ -53,6 +55,28 @@ void main() {
AndroidSdk: () => mockAndroidSdk, AndroidSdk: () => mockAndroidSdk,
}); });
testUsingContext('Can set build-dir', () async {
final ConfigCommand configCommand = ConfigCommand();
final CommandRunner<void> commandRunner = createTestCommandRunner(configCommand);
await commandRunner.run(<String>[
'config',
'--build-dir=foo'
]);
expect(getBuildDirectory(), 'foo');
});
testUsingContext('throws error on absolute path to build-dir', () async {
final ConfigCommand configCommand = ConfigCommand();
final CommandRunner<void> commandRunner = createTestCommandRunner(configCommand);
expect(() => commandRunner.run(<String>[
'config',
'--build-dir=/foo'
]), throwsA(isInstanceOf<ToolExit>()));
});
testUsingContext('allows setting and removing feature flags', () async { testUsingContext('allows setting and removing feature flags', () async {
final ConfigCommand configCommand = ConfigCommand(); final ConfigCommand configCommand = ConfigCommand();
final CommandRunner<void> commandRunner = createTestCommandRunner(configCommand); final CommandRunner<void> commandRunner = createTestCommandRunner(configCommand);