Skip to content

Commit

Permalink
Merge pull request #201 from Tienisto/fix-flutter-path
Browse files Browse the repository at this point in the history
fix: use correct flutter executable
  • Loading branch information
YehudaKremer authored Jun 1, 2023
2 parents c7153aa + 9744479 commit ce8e3b9
Showing 1 changed file with 17 additions and 8 deletions.
25 changes: 17 additions & 8 deletions lib/src/windows_build.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'dart:io';
import 'package:cli_util/cli_logging.dart';
import 'package:get_it/get_it.dart';
import 'package:path/path.dart' as p;
import 'method_extensions.dart';
import 'configuration.dart';

Expand All @@ -11,19 +12,27 @@ class WindowsBuild {

/// Run "flutter build windows" command
Future<void> build() async {
List<String> buildWindowsArguments = ['build', 'windows'];
final flutterArgs = [
'build',
'windows',
...?_config.windowsBuildArgs,
if (_config.createWithDebugBuildFiles) '--debug',
];

if (_config.windowsBuildArgs != null) {
buildWindowsArguments.addAll(_config.windowsBuildArgs!);
}
// e.g. C:\Users\MyUser\fvm\versions\3.7.12\bin\cache\dart-sdk\bin\dart.exe
final dartPath = p.split(Platform.executable);

if (_config.createWithDebugBuildFiles) buildWindowsArguments.add('--debug');
// e.g. C:\Users\MyUser\fvm\versions\3.7.12\bin\flutter
final flutterPath = p.joinAll([
...dartPath.sublist(0, dartPath.length - 4),
'flutter',
]);

Progress loggerProgress = _logger
.progress('running "flutter ${buildWindowsArguments.join(' ')}"');
final Progress loggerProgress = _logger
.progress('running ""$flutterPath" ${flutterArgs.join(' ')}"');

// ignore: avoid_single_cascade_in_expression_statements
await Process.run('flutter', buildWindowsArguments, runInShell: true)
await Process.run(flutterPath, flutterArgs, runInShell: true)
..exitOnError();

loggerProgress.finish(showTiming: true);
Expand Down

0 comments on commit ce8e3b9

Please sign in to comment.