Skip to content

Commit 26e3933

Browse files
committed
Use .bat for executables on Windows
1 parent e45f31c commit 26e3933

File tree

8 files changed

+27
-10
lines changed

8 files changed

+27
-10
lines changed

lib/src/tools/analyze_tool.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import 'package:logging/logging.dart';
88
import '../dart_dev_tool.dart';
99
import '../utils/arg_results_utils.dart';
1010
import '../utils/assert_no_positional_args_nor_args_after_separator.dart';
11+
import '../utils/executables.dart' as exe;
1112
import '../utils/logging.dart';
1213
import '../utils/process_declaration.dart';
1314
import '../utils/run_process_and_ensure_exit.dart';
@@ -161,7 +162,7 @@ ProcessDeclaration buildProcess(
161162
verbose: context.verbose);
162163
final entrypoints = buildEntrypoints(include: include, root: path);
163164
logCommand(args, entrypoints, verbose: context.verbose);
164-
return ProcessDeclaration('dartanalyzer', [...args, ...entrypoints],
165+
return ProcessDeclaration(exe.dartanalyzer, [...args, ...entrypoints],
165166
mode: ProcessStartMode.inheritStdio);
166167
}
167168

lib/src/tools/format_tool.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import '../../utils.dart';
1212
import '../dart_dev_tool.dart';
1313
import '../utils/arg_results_utils.dart';
1414
import '../utils/assert_no_positional_args_nor_args_after_separator.dart';
15+
import '../utils/executables.dart' as exe;
1516
import '../utils/logging.dart';
1617
import '../utils/organize_directives/organize_directives_in_paths.dart';
1718
import '../utils/package_is_immediate_dependency.dart';
@@ -537,10 +538,10 @@ FormatExecution buildExecution(
537538
ProcessDeclaration buildFormatProcess([Formatter formatter]) {
538539
switch (formatter) {
539540
case Formatter.dartStyle:
540-
return ProcessDeclaration('pub', ['run', 'dart_style:format']);
541+
return ProcessDeclaration(exe.pub, ['run', 'dart_style:format']);
541542
case Formatter.dartfmt:
542543
default:
543-
return ProcessDeclaration('dartfmt', []);
544+
return ProcessDeclaration(exe.dartfmt, []);
544545
}
545546
}
546547

lib/src/tools/over_react_format_tool.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import 'package:dart_dev/dart_dev.dart';
55
import 'package:dart_dev/utils.dart';
66

77
import '../tools/format_tool.dart';
8+
import '../utils/executables.dart' as exe;
89

910
class OverReactFormatTool extends DevTool {
1011
/// Wrap lines longer than this.
@@ -31,9 +32,9 @@ class OverReactFormatTool extends DevTool {
3132
'over_react_format',
3233
if (lineLength != null) '--line-length=$lineLength'
3334
];
34-
final process = ProcessDeclaration('pub', [...args, ...paths],
35+
final process = ProcessDeclaration(exe.pub, [...args, ...paths],
3536
mode: ProcessStartMode.inheritStdio);
36-
logCommand('pub', paths, args, verbose: context?.verbose);
37+
logCommand(exe.pub, paths, args, verbose: context?.verbose);
3738
return runProcessAndEnsureExit(process);
3839
}
3940
}

lib/src/tools/test_tool.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import 'package:logging/logging.dart';
99

1010
import '../dart_dev_tool.dart';
1111
import '../utils/arg_results_utils.dart';
12+
import '../utils/executables.dart' as exe;
1213
import '../utils/logging.dart';
1314
import '../utils/package_is_immediate_dependency.dart';
1415
import '../utils/process_declaration.dart';
@@ -315,7 +316,7 @@ TestExecution buildExecution(
315316
verbose: context.verbose);
316317
logSubprocessHeader(_log, 'pub ${args.join(' ')}'.trim());
317318
return TestExecution.process(
318-
ProcessDeclaration('pub', args, mode: ProcessStartMode.inheritStdio));
319+
ProcessDeclaration(exe.pub, args, mode: ProcessStartMode.inheritStdio));
319320
}
320321

321322
// NOTE: This currently depends on https://github.com/dart-lang/build/pull/2445

lib/src/tools/tuneup_check_tool.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import 'package:logging/logging.dart';
99
import '../dart_dev_tool.dart';
1010
import '../utils/arg_results_utils.dart';
1111
import '../utils/assert_no_positional_args_nor_args_after_separator.dart';
12+
import '../utils/executables.dart' as exe;
1213
import '../utils/logging.dart';
1314
import '../utils/package_is_immediate_dependency.dart';
1415
import '../utils/process_declaration.dart';
@@ -152,5 +153,5 @@ TuneupExecution buildExecution(
152153
verbose: context.verbose);
153154
logSubprocessHeader(_log, 'pub ${args.join(' ')}');
154155
return TuneupExecution.process(
155-
ProcessDeclaration('pub', args, mode: ProcessStartMode.inheritStdio));
156+
ProcessDeclaration(exe.pub, args, mode: ProcessStartMode.inheritStdio));
156157
}

lib/src/tools/webdev_serve_tool.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import 'package:pub_semver/pub_semver.dart';
1010
import '../dart_dev_tool.dart';
1111
import '../utils/arg_results_utils.dart';
1212
import '../utils/assert_no_positional_args_nor_args_after_separator.dart';
13+
import '../utils/executables.dart' as exe;
1314
import '../utils/global_package_is_active_and_compatible.dart';
1415
import '../utils/logging.dart';
1516
import '../utils/process_declaration.dart';
@@ -226,5 +227,5 @@ WebdevServeExecution buildExecution(
226227
verbose: context.verbose);
227228
logSubprocessHeader(_log, 'pub ${args.join(' ')}'.trim());
228229
return WebdevServeExecution.process(
229-
ProcessDeclaration('pub', args, mode: ProcessStartMode.inheritStdio));
230+
ProcessDeclaration(exe.pub, args, mode: ProcessStartMode.inheritStdio));
230231
}

lib/src/utils/executables.dart

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import 'dart:io';
2+
3+
final dart = 'dart';
4+
5+
final dartanalyzer = Platform.isWindows ? 'dartanalyzer.bat' : 'dartanalyzer';
6+
7+
final dartfmt = Platform.isWindows ? 'dartfmt.bat' : 'dartfmt';
8+
9+
final pub = Platform.isWindows ? 'pub.bat' : 'pub';

lib/src/utils/global_package_is_active_and_compatible.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import 'dart:io';
33

44
import 'package:pub_semver/pub_semver.dart';
55

6+
import 'executables.dart' as exe;
7+
68
/// Returns `true` if [packageName] is globally activated at a version
79
/// allowed by [constraint]. Returns `false` otherwise.
810
///
@@ -16,9 +18,9 @@ import 'package:pub_semver/pub_semver.dart';
1618
bool globalPackageIsActiveAndCompatible(
1719
String packageName, VersionConstraint constraint,
1820
{Map<String, String> environment}) {
19-
final executable = 'pub';
21+
final executable = exe.pub;
2022
final args = ['global', 'list'];
21-
final result = Process.runSync('pub', ['global', 'list'],
23+
final result = Process.runSync(exe.pub, ['global', 'list'],
2224
environment: environment, stderrEncoding: utf8, stdoutEncoding: utf8);
2325
if (result.exitCode != 0) {
2426
throw ProcessException(

0 commit comments

Comments
 (0)