From f049972aadd16ab2fcf4770ebbfa20c66b4994e8 Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@ost.ch>
Date: Sun, 13 Jul 2025 14:24:24 +0000
Subject: ide: improve launch configuration

---
 .vscode/launch.json | 16 ++--------------
 .vscode/tasks.json  | 37 ++++++++++++++++++-------------------
 2 files changed, 20 insertions(+), 33 deletions(-)

(limited to '.vscode')

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",
             ]
         }
     ]
-- 
cgit v1.2.3