From 525423484affab10c35e847eff00d87f4b1944fb Mon Sep 17 00:00:00 2001 From: Nicolas Berthier Date: Fri, 13 Dec 2024 15:31:59 +0100 Subject: [PATCH] Rename debugger from "gdb" to "superbol-gdb" --- CHANGELOG.md | 3 +++ import/superbol-vscode-debug | 2 +- package.json | 8 ++++---- src/lsp/superbol_free_lib/vscode_extension.ml | 8 ++++---- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 667bee13e..58f95e99f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## [_] Next release +### Fixed +- Name of debugger, to avoid conflicts with the official "gdb" [#381](https://github.com/OCamlPro/superbol-studio-oss/pull/381) + ## [0.1.4] Fifth α release (2024-10-25) diff --git a/import/superbol-vscode-debug b/import/superbol-vscode-debug index 3e61d84f4..03f7b23ce 160000 --- a/import/superbol-vscode-debug +++ b/import/superbol-vscode-debug @@ -1 +1 @@ -Subproject commit 3e61d84f4f6972395ede9fb6573c6ee87dfaf0e4 +Subproject commit 03f7b23cef5911ea76b8fbc0d38fc007872109b8 diff --git a/package.json b/package.json index 53889c460..d6e31254c 100644 --- a/package.json +++ b/package.json @@ -213,7 +213,7 @@ }, "debuggers": [ { - "type": "gdb", + "type": "superbol-gdb", "label": "SuperBOL Debugger for GnuCOBOL", "program": "./_dist/superbol-vscode-gdb.js", "runtime": "node", @@ -352,7 +352,7 @@ "description": "New SuperBOL launch request", "body": { "name": "${2:SuperBOL: debug (launch)}", - "type": "gdb", + "type": "superbol-gdb", "request": "launch", "preLaunchTask": "SuperBOL: build (debug)", "target": "$${_:{file}}", @@ -369,7 +369,7 @@ "description": "Attach to a local debug session", "body": { "name": "${2:SuperBOL: debug (attach local)}", - "type": "gdb", + "type": "superbol-gdb", "request": "attach", "pid": "${3:0}", "target": "$${_:{file}}", @@ -384,7 +384,7 @@ "description": "Attach to a remote debug session", "body": { "name": "${2:SuperBOL: debug (attach remote)}", - "type": "gdb", + "type": "superbol-gdb", "request": "attach", "remote-debugger": "${3:host:port}", "target": "$${_:{file}}", diff --git a/src/lsp/superbol_free_lib/vscode_extension.ml b/src/lsp/superbol_free_lib/vscode_extension.ml index 6a94643ba..9651313e2 100644 --- a/src/lsp/superbol_free_lib/vscode_extension.ml +++ b/src/lsp/superbol_free_lib/vscode_extension.ml @@ -125,7 +125,7 @@ let contributes = ~path: "./syntaxes/dumpfile.tmLanguage.json" ] ~debuggers: [ - Manifest.debugger "gdb" + Manifest.debugger "superbol-gdb" ~label: "SuperBOL Debugger for GnuCOBOL" ~languages: ["cobol"; "COBOL"] ~program: "./_dist/superbol-vscode-gdb.js" @@ -262,7 +262,7 @@ let contributes = "description": "New SuperBOL launch request", "body": { "name": "${2:SuperBOL: debug (launch)}", - "type": "gdb", + "type": "superbol-gdb", "request": "launch", "preLaunchTask": "SuperBOL: build (debug)", "target": "$${_:{file}}", @@ -279,7 +279,7 @@ let contributes = "description": "Attach to a local debug session", "body": { "name": "${2:SuperBOL: debug (attach local)}", - "type": "gdb", + "type": "superbol-gdb", "request": "attach", "pid": "${3:0}", "target": "$${_:{file}}", @@ -294,7 +294,7 @@ let contributes = "description": "Attach to a remote debug session", "body": { "name": "${2:SuperBOL: debug (attach remote)}", - "type": "gdb", + "type": "superbol-gdb", "request": "attach", "remote-debugger": "${3:host:port}", "target": "$${_:{file}}",