Merge pull request #100 from rubberduck203/master

Fixes #99: Disambiguates VSCode Tasks
This commit is contained in:
Adam Greig
2020-11-09 12:00:44 +00:00
committed by GitHub
2 changed files with 7 additions and 7 deletions

4
.vscode/launch.json vendored
View File

@@ -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 */

10
.vscode/tasks.json vendored
View File

@@ -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"],