From 0223c23cfbaf0f6fdc4a42d8511a5a78ec9d22f4 Mon Sep 17 00:00:00 2001 From: Jan Wiesemann Date: Sun, 28 Jul 2024 00:03:35 +0200 Subject: [PATCH] Reordered VS-Code Tasks to follow the [Release] > [Debug] schema (#3810) Co-authored-by: hedger --- .vscode/example/tasks.json | 58 +++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/.vscode/example/tasks.json b/.vscode/example/tasks.json index 1bc6d9ee7..aab2994f7 100644 --- a/.vscode/example/tasks.json +++ b/.vscode/example/tasks.json @@ -63,48 +63,42 @@ "type": "shell", "command": "./fbt updater_all" }, - { - "label": "[Debug] Flash (USB, w/o resources)", - "group": "build", - "type": "shell", - "command": "./fbt FORCE=1 flash_usb" - }, { "label": "[Release] Flash (USB, w/o resources)", "group": "build", "type": "shell", "command": "./fbt COMPACT=1 DEBUG=0 FORCE=1 flash_usb" }, + { + "label": "[Debug] Flash (USB, w/o resources)", + "group": "build", + "type": "shell", + "command": "./fbt FORCE=1 flash_usb" + }, { "label": "[Debug:unit_tests] Flash (USB)", "group": "build", "type": "shell", "command": "./fbt FIRMWARE_APP_SET=unit_tests FORCE=1 flash_usb_full" }, - { - "label": "[Debug] Flash (USB, with resources)", - "group": "build", - "type": "shell", - "command": "./fbt FORCE=1 flash_usb_full" - }, { "label": "[Release] Flash (USB, with resources)", "group": "build", "type": "shell", "command": "./fbt COMPACT=1 DEBUG=0 FORCE=1 flash_usb_full" }, + { + "label": "[Debug] Flash (USB, with resources)", + "group": "build", + "type": "shell", + "command": "./fbt FORCE=1 flash_usb_full" + }, { "label": "[Debug] Create PVS-Studio report", "group": "build", "type": "shell", "command": "./fbt firmware_pvs" }, - { - "label": "[Debug] Build FAPs", - "group": "build", - "type": "shell", - "command": "./fbt fap_dist" - }, { "label": "[Release] Build FAPs", "group": "build", @@ -112,10 +106,10 @@ "command": "./fbt COMPACT=1 DEBUG=0 fap_dist" }, { - "label": "[Debug] Build App", + "label": "[Debug] Build FAPs", "group": "build", "type": "shell", - "command": "./fbt build APPSRC=${relativeFileDirname}" + "command": "./fbt fap_dist" }, { "label": "[Release] Build App", @@ -124,10 +118,10 @@ "command": "./fbt COMPACT=1 DEBUG=0 build APPSRC=${relativeFileDirname}" }, { - "label": "[Debug] Launch App on Flipper", + "label": "[Debug] Build App", "group": "build", "type": "shell", - "command": "./fbt launch APPSRC=${relativeFileDirname}" + "command": "./fbt build APPSRC=${relativeFileDirname}" }, { "label": "[Release] Launch App on Flipper", @@ -135,6 +129,12 @@ "type": "shell", "command": "./fbt COMPACT=1 DEBUG=0 launch APPSRC=${relativeFileDirname}" }, + { + "label": "[Debug] Launch App on Flipper", + "group": "build", + "type": "shell", + "command": "./fbt launch APPSRC=${relativeFileDirname}" + }, { "label": "[Debug] Launch App on Flipper with Serial Console", "dependsOrder": "sequence", @@ -144,18 +144,18 @@ "Serial Console" ] }, - { - "label": "[Debug] Build and upload all FAPs to Flipper over USB", - "group": "build", - "type": "shell", - "command": "./fbt fap_deploy" - }, { "label": "[Release] Build and upload all FAPs to Flipper over USB", "group": "build", "type": "shell", "command": "./fbt COMPACT=1 DEBUG=0 fap_deploy" }, + { + "label": "[Debug] Build and upload all FAPs to Flipper over USB", + "group": "build", + "type": "shell", + "command": "./fbt fap_deploy" + }, { // Press Ctrl+] to quit "label": "Serial Console", @@ -180,4 +180,4 @@ } } ] -} \ No newline at end of file +}