Skip to content

Commit

Permalink
Fixes #99: Disambiguates VSCode Tasks
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
rubberduck203 committed Nov 9, 2020
1 parent 3cbcb99 commit eb68e8b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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 */
Expand Down
10 changes: 5 additions & 5 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand All @@ -22,7 +22,7 @@
}
},
{
"label": "cargo build --release",
"label": "Cargo Build (release)",
"type": "process",
"command": "cargo",
"args": ["build", "--release"],
Expand All @@ -32,7 +32,7 @@
"group": "build"
},
{
"label": "cargo build --examples",
"label": "Cargo Build Examples (debug)",
"type": "process",
"command": "cargo",
"args": ["build","--examples"],
Expand All @@ -42,7 +42,7 @@
"group": "build"
},
{
"label": "cargo build --examples --release",
"label": "Cargo Build Examples (release)",
"type": "process",
"command": "cargo",
"args": ["build","--examples", "--release"],
Expand All @@ -52,7 +52,7 @@
"group": "build"
},
{
"label": "cargo clean",
"label": "Cargo Clean",
"type": "process",
"command": "cargo",
"args": ["clean"],
Expand Down

0 comments on commit eb68e8b

Please sign in to comment.