From eb68e8bba974d14332a2d6a3c6786d3aeb510669 Mon Sep 17 00:00:00 2001 From: "Christopher J. McClellan" Date: Mon, 9 Nov 2020 06:23:45 -0500 Subject: [PATCH] Fixes #99: Disambiguates VSCode Tasks Using the equivalent command line as the task name caused some confusion. Users were under the impression that they could use any valid cargo command as a preLaunchTask in the launch configurations. --- .vscode/launch.json | 4 ++-- .vscode/tasks.json | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index b554e31..4c950ba 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -12,7 +12,7 @@ "name": "Debug (QEMU)", "servertype": "qemu", "cwd": "${workspaceRoot}", - "preLaunchTask": "cargo build", + "preLaunchTask": "Cargo Build (debug)", "runToMain": true, "executable": "./target/thumbv7m-none-eabi/debug/{{project-name}}", /* Run `cargo build --example hello` and uncomment this line to run semi-hosting example */ @@ -27,7 +27,7 @@ "name": "Debug (OpenOCD)", "servertype": "openocd", "cwd": "${workspaceRoot}", - "preLaunchTask": "cargo build", + "preLaunchTask": "Cargo Build (debug)", "runToMain": true, "executable": "./target/thumbv7em-none-eabihf/debug/{{project-name}}", /* Run `cargo build --example itm` and uncomment this line to run itm example */ diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 94f00cb..7f57a27 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -9,7 +9,7 @@ * but we need to provide a label for it, * so we can invoke it from the debug launcher. */ - "label": "cargo build", + "label": "Cargo Build (debug)", "type": "process", "command": "cargo", "args": ["build"], @@ -22,7 +22,7 @@ } }, { - "label": "cargo build --release", + "label": "Cargo Build (release)", "type": "process", "command": "cargo", "args": ["build", "--release"], @@ -32,7 +32,7 @@ "group": "build" }, { - "label": "cargo build --examples", + "label": "Cargo Build Examples (debug)", "type": "process", "command": "cargo", "args": ["build","--examples"], @@ -42,7 +42,7 @@ "group": "build" }, { - "label": "cargo build --examples --release", + "label": "Cargo Build Examples (release)", "type": "process", "command": "cargo", "args": ["build","--examples", "--release"], @@ -52,7 +52,7 @@ "group": "build" }, { - "label": "cargo clean", + "label": "Cargo Clean", "type": "process", "command": "cargo", "args": ["clean"],