From b4e379ad6cec91a51134b98be59ac7a4e3323528 Mon Sep 17 00:00:00 2001 From: "P.Y. Laligand" Date: Sat, 1 Oct 2016 08:50:04 -0700 Subject: [PATCH] Goodbye "build mojo", we hardly knew ye. (#6162) --- .../flutter_tools/lib/src/commands/build.dart | 2 - .../lib/src/commands/build_mojo.dart | 78 ------------------- 2 files changed, 80 deletions(-) delete mode 100644 packages/flutter_tools/lib/src/commands/build_mojo.dart diff --git a/packages/flutter_tools/lib/src/commands/build.dart b/packages/flutter_tools/lib/src/commands/build.dart index d6b5676225b..ace05fd8467 100644 --- a/packages/flutter_tools/lib/src/commands/build.dart +++ b/packages/flutter_tools/lib/src/commands/build.dart @@ -15,7 +15,6 @@ import 'build_apk.dart'; import 'build_aot.dart'; import 'build_flx.dart'; import 'build_ios.dart'; -import 'build_mojo.dart'; class BuildCommand extends FlutterCommand { BuildCommand({bool verboseHelp: false}) { @@ -24,7 +23,6 @@ class BuildCommand extends FlutterCommand { addSubcommand(new BuildCleanCommand()); addSubcommand(new BuildIOSCommand()); addSubcommand(new BuildFlxCommand(verboseHelp: verboseHelp)); - addSubcommand(new BuildMojoCommand()); } @override diff --git a/packages/flutter_tools/lib/src/commands/build_mojo.dart b/packages/flutter_tools/lib/src/commands/build_mojo.dart deleted file mode 100644 index e1e625162ca..00000000000 --- a/packages/flutter_tools/lib/src/commands/build_mojo.dart +++ /dev/null @@ -1,78 +0,0 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -import 'dart:async'; - -import '../flx.dart'; -import '../globals.dart'; -import 'build.dart'; - -const String _kOptionSnapshotter = 'snapshotter-path'; -const String _kOptionTarget = 'target'; -const String _kOptionPackages = 'packages'; -const String _kOptionOutput = 'output-file'; -const String _kOptionSnapshot = 'snapshot'; -const String _kOptionDepfile = 'depfile'; -const String _kOptionWorking = 'working-dir'; -const List _kOptions = const [ - _kOptionSnapshotter, - _kOptionTarget, - _kOptionPackages, - _kOptionOutput, - _kOptionSnapshot, - _kOptionDepfile, - _kOptionWorking -]; - -class BuildMojoCommand extends BuildSubCommand { - BuildMojoCommand({bool verboseHelp: false}) { - argParser.addOption(_kOptionSnapshotter, - help: 'The snapshotter executable'); - argParser.addOption(_kOptionTarget, help: 'The entry point into the app'); - argParser.addOption(_kOptionPackages, help: 'The .packages file'); - argParser.addOption(_kOptionOutput, help: 'The generated flx file'); - argParser.addOption(_kOptionSnapshot, help: 'The generated snapshot file'); - argParser.addOption(_kOptionDepfile, help: 'The generated dependency file'); - argParser.addOption(_kOptionWorking, - help: 'The directory where to put temporary files'); - commandValidator = () => true; - } - - @override - final String name = 'mojo'; - - @override - final String description = 'Build a Flutter FLX file for Mojo.'; - - @override - final String usageFooter = - 'FLX files are archives of your application code and resources; ' - 'they are used by the Flutter content handler.'; - - @override - Future runCommand() async { - await super.runCommand(); - if (_kOptions - .any((String option) => !argResults.options.contains(option))) { - printError('Missing option! All options must be specified.'); - return 1; - } - String outputPath = argResults[_kOptionOutput]; - return await build( - snapshotterPath: argResults[_kOptionSnapshotter], - mainPath: argResults[_kOptionTarget], - outputPath: outputPath, - snapshotPath: argResults[_kOptionSnapshot], - depfilePath: argResults[_kOptionDepfile], - workingDirPath: argResults[_kOptionWorking], - packagesPath: argResults[_kOptionPackages], - includeRobotoFonts: true, - ).then((int result) { - if (result != 0) { - printError('Error building $outputPath: $result.'); - } - return result; - }); - } -}