Tweak Windows instructions to mirror macOS (#6490)
* Tweak Windows instructions to mirror macOS
* Pass error codes out of the bat file
* Add @echo off
diff --git a/tool/RELEASE_INSTRUCTIONS.md b/tool/RELEASE_INSTRUCTIONS.md
index 118518e..e4b08a7 100644
--- a/tool/RELEASE_INSTRUCTIONS.md
+++ b/tool/RELEASE_INSTRUCTIONS.md
@@ -28,22 +28,20 @@
> If you need to install the [Github CLI](https://cli.github.com/manual/installation) you can run: `brew install gh`
-- Ensure that you have access to `devtools_tool`
- - For MacOS Users
- - Ensure the `devtools_tool` executable is in your path:
- - add the following to your `~/.bashrc` file.
- - `export PATH=$PATH:<DEVTOOLS_DIR>/tool/bin`
- > [!NOTE]
- > Replace `<DEVTOOLS_DIR>` with the local path to your DevTools
- > repo path.
- - For Windows Users
- - Ensure the `devtools_tool` executable has been globally activated:
- - `flutter pub global activate --source path tool`
- > [!WARNING]
- > Always do this activation step before running
- > `devtools_tool`. If there have been changes to the tool since the
- > last time you have run the activate, then it needs to be rerun to
- > pick up those changes.
+- Ensure that you have access to `devtools_tool` by adding the `tool/bin` folder to your `PATH` environment variable
+ - **MacOS Users**
+ - add the following to your `~/.bashrc` file.
+ - `export PATH=$PATH:<DEVTOOLS_DIR>/tool/bin`
+ > [!NOTE]
+ > Replace `<DEVTOOLS_DIR>` with the local path to your DevTools
+ > repo path.
+ - **Windows Users**
+ - Open "Edit environment variables for your account" from Control Panel
+ - Locate the `Path` variable and click **Edit**
+ - Click the **New** button and paste in `<DEVTOOLS_DIR>/tool/bin`
+ > [!NOTE]
+ > Replace `<DEVTOOLS_DIR>` with the local path to your DevTools
+ > repo path.
- Run: `devtools_tool release-helper`
- This will create a PR for you using the tip of master.
diff --git a/tool/bin/devtools_tool.bat b/tool/bin/devtools_tool.bat
new file mode 100644
index 0000000..58248f4
--- /dev/null
+++ b/tool/bin/devtools_tool.bat
@@ -0,0 +1,14 @@
+@echo off
+
+pushd "%~dp0"
+dart run ./devtools_tool.dart %*
+
+IF %errorlevel% NEQ 0 GOTO :error
+
+popd
+EXIT /B 0
+
+:error
+popd
+EXIT /B %errorlevel%
+
diff --git a/tool/lib/commands/list.dart b/tool/lib/commands/list.dart
index 5246f2c..8d880c0 100644
--- a/tool/lib/commands/list.dart
+++ b/tool/lib/commands/list.dart
@@ -5,6 +5,7 @@
import 'dart:async';
import 'package:args/command_runner.dart';
+import 'package:path/path.dart' as path;
import '../model.dart';
@@ -25,7 +26,7 @@
print('\n${packages.length} packages:');
for (Package p in packages) {
- print(' ${p.relativePath}/');
+ print(' ${p.relativePath}${path.separator}');
}
}
}