From c9a6d6ad0d8f9a23ca8a51c22429cb279879ede1 Mon Sep 17 00:00:00 2001 From: Arkadiusz Bokowy Date: Sat, 22 Oct 2022 00:41:18 +0200 Subject: [PATCH] Show CHIP app selector when staring Linux/Darwin debugger (#23274) * Show CHIP app selector when staring Linux debugger * Add run application for Darwin hosts --- .devcontainer/devcontainer.json | 3 +- .vscode/extensions.json | 3 +- .vscode/launch.json | 54 +++++++++++++++++++++------------ 3 files changed, 36 insertions(+), 24 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 0d0bea51bb06eb..6847480b51a5b9 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -31,13 +31,12 @@ "esbenp.prettier-vscode", "foxundermoon.shell-format", "github.vscode-pull-request-github", - "knisterpeter.vscode-github", "maelvalais.autoconf", "marus25.cortex-debug", "ms-azuretools.vscode-docker", "msedge-dev.gnls", - "npclaudiu.vscode-gn", "redhat.vscode-yaml", + "vadimcn.vscode-lldb", "xaver.clang-format", "yuichinukiyama.vscode-preview-server", "yzhang.markdown-all-in-one" diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 6ce0339c697719..352fb19ae65035 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -12,13 +12,12 @@ "esbenp.prettier-vscode", "foxundermoon.shell-format", "github.vscode-pull-request-github", - "knisterpeter.vscode-github", "maelvalais.autoconf", "marus25.cortex-debug", "ms-azuretools.vscode-docker", "msedge-dev.gnls", - "npclaudiu.vscode-gn", "redhat.vscode-yaml", + "vadimcn.vscode-lldb", "xaver.clang-format", "yuichinukiyama.vscode-preview-server", "yzhang.markdown-all-in-one" diff --git a/.vscode/launch.json b/.vscode/launch.json index 77739937fc05a0..a9999b9e43517f 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -10,6 +10,22 @@ "request": "attach", "pid": "${command:pickProcess}" }, + { + "name": "Run application (Darwin x64)", + "type": "lldb", + "request": "launch", + "program": "${workspaceFolder}/out/${input:outAppDarwin}", + "args": [], + "cwd": "${workspaceFolder}" + }, + { + "name": "Run application (Linux x64)", + "type": "lldb", + "request": "launch", + "program": "${workspaceFolder}/out/${input:outAppLinux}", + "args": [], + "cwd": "${workspaceFolder}" + }, { "name": "QRCode Tests", "type": "cppdbg", @@ -70,26 +86,6 @@ } ] }, - { - "name": "LightingApp (Linux)", - "type": "cppdbg", - "request": "launch", - "program": "${workspaceFolder}/out/lighting-app/chip-lighting-app", - "args": [], - "stopAtEntry": false, - "cwd": "${workspaceFolder}", - "environment": [], - "externalConsole": false, - "MIMode": "gdb", - "preLaunchTask": "Build Lighting App (Linux)", - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "-enable-pretty-printing", - "ignoreFailures": true - } - ] - }, { "name": "LightingApp (Tizen) [remote]", "type": "cppdbg", @@ -423,6 +419,24 @@ } ], "inputs": [ + { + "type": "command", + "id": "outAppDarwin", + "command": "shellCommand.execute", + "args": { + "command": "find ${workspaceFolder}/out/darwin-x64-* -maxdepth 2 -perm +111 -name 'chip-*' |sort |sed 's$${workspaceFolder}/out/$$'", + "description": "Select the application to run" + } + }, + { + "type": "command", + "id": "outAppLinux", + "command": "shellCommand.execute", + "args": { + "command": "find ${workspaceFolder}/out/linux-x64-* -maxdepth 2 -executable -name 'chip-*' |sort |sed 's$${workspaceFolder}/out/$$'", + "description": "Select the application to run" + } + }, { "type": "pickString", "id": "mbedDebugProfile",