diff options
| author | Felix Morgner <felix.morgner@ost.ch> | 2025-07-13 14:24:24 +0000 |
|---|---|---|
| committer | Felix Morgner <felix.morgner@ost.ch> | 2025-07-13 14:24:24 +0000 |
| commit | f049972aadd16ab2fcf4770ebbfa20c66b4994e8 (patch) | |
| tree | dcfd5b51d14a05d65a24bdeecd13413179455e77 /.vscode | |
| parent | bfe60f1c0f316cc512dd61f82667e59b284d3271 (diff) | |
| download | teachos-f049972aadd16ab2fcf4770ebbfa20c66b4994e8.tar.xz teachos-f049972aadd16ab2fcf4770ebbfa20c66b4994e8.zip | |
ide: improve launch configuration
Diffstat (limited to '.vscode')
| -rw-r--r-- | .vscode/launch.json | 16 | ||||
| -rw-r--r-- | .vscode/tasks.json | 37 |
2 files changed, 20 insertions, 33 deletions
diff --git a/.vscode/launch.json b/.vscode/launch.json index 0d379df..4dc9fc6 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -6,7 +6,7 @@ "miDebuggerPath": "x86_64-pc-elf-gdb", "type": "cppdbg", "request": "launch", - "program": "${workspaceFolder}/build/bin/${input:build_type}/_kernel", + "program": "${workspaceFolder}/build/bin/${command:cmake.buildType}/_kernel", "MIMode": "gdb", "miDebuggerServerAddress": "localhost:1234", "cwd": "${workspaceFolder}", @@ -20,7 +20,7 @@ }, { "description": "Load file", - "text": "-file-exec-and-symbols ${workspaceFolder}/build/bin/${input:build_type}/_kernel" + "text": "-file-exec-and-symbols ${workspaceFolder}/build/bin/${command:cmake.buildType}/_kernel" }, { "description": "Set breakpoint on _start", @@ -28,17 +28,5 @@ } ] } - ], - "inputs": [ - { - "id": "build_type", - "type": "pickString", - "default": "Debug", - "description": "The build type to boot", - "options": [ - "Debug", - "MinSizeRel" - ] - } ] }
\ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 6fc5711..5e8c23f 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -3,24 +3,27 @@ "tasks": [ { "label": "QEMU (gdb)", - "command": "qemu-system-x86_64", + "command": "${workspaceFolder}/scripts/qemu-wrapper.sh", "type": "shell", "args": [ - "-S", "-s", "-m", "32M", + "-machine", + "q35", + "-display", + "curses", "-no-reboot", "-d", "int,cpu_reset", "-cdrom", - "${workspaceFolder}/build/teachos-${input:build_type}.iso" + "${workspaceFolder}/build/teachos-${command:cmake.buildType}.iso" ], "isBackground": true, "presentation": { "reveal": "always" }, - "group": "build", + "group": "none", "problemMatcher": [ { "pattern": { @@ -29,9 +32,12 @@ "background": { "activeOnStart": true, "beginsPattern": ".", - "endsPattern": "VNC server running on" + "endsPattern": "QEMU WRAPPER" } } + ], + "dependsOn": [ + "CMake: build", ] }, { @@ -41,27 +47,20 @@ "args": [ "-m", "32M", + "-machine", + "q35", "-display", "curses", "-cdrom", - "${workspaceFolder}/build/teachos-${input:build_type}.iso" + "${workspaceFolder}/build/teachos-${command:cmake.buildType}.iso" ], + "isBackground": true, "presentation": { "reveal": "always" }, - "group": "build", - "problemMatcher": [] - } - ], - "inputs": [ - { - "id": "build_type", - "type": "pickString", - "default": "Debug", - "description": "The build type to boot", - "options": [ - "Debug", - "MinSizeRel" + "group": "none", + "dependsOn": [ + "CMake: build", ] } ] |