From 68ff6acb6aef1d69cf258f321ebc2b50446915e0 Mon Sep 17 00:00:00 2001 From: Christian Weichel Date: Tue, 19 Nov 2019 19:20:40 +0100 Subject: [PATCH] [electron] Added debugger to Electron build --- .../src/browser/arduino-variable-resolver.ts | 2 +- arduino-ide-extension/src/node/boards-service-impl.ts | 3 ++- electron-app/package.json | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/arduino-debugger-extension/src/browser/arduino-variable-resolver.ts b/arduino-debugger-extension/src/browser/arduino-variable-resolver.ts index 8dbd05f7..ab527eb3 100644 --- a/arduino-debugger-extension/src/browser/arduino-variable-resolver.ts +++ b/arduino-debugger-extension/src/browser/arduino-variable-resolver.ts @@ -83,7 +83,7 @@ export class ArduinoVariableResolver implements VariableContribution { toolLocations[t.name] = t.locations!; }) - switch(argument) { + switch (argument) { case "openocd": return toolLocations["openocd"].main; case "openocd-scripts": diff --git a/arduino-ide-extension/src/node/boards-service-impl.ts b/arduino-ide-extension/src/node/boards-service-impl.ts index 8dd110a8..83fa9678 100644 --- a/arduino-ide-extension/src/node/boards-service-impl.ts +++ b/arduino-ide-extension/src/node/boards-service-impl.ts @@ -272,9 +272,10 @@ export class BoardsServiceImpl implements BoardsService { case "openocd": loc.scripts = path.join(loc.main, "share", "openocd", "scripts"); loc.main = path.join(loc.main, "bin", "openocd"); - break + break; case "arm-none-eabi-gcc": ["gdb", "objdump"].forEach(s => loc[s] = path.join(loc.main, "bin", `arm-none-eabi-${s}`)); + break; } return loc; diff --git a/electron-app/package.json b/electron-app/package.json index 976187c0..dcd4724b 100644 --- a/electron-app/package.json +++ b/electron-app/package.json @@ -6,6 +6,7 @@ "dependencies": { "@theia/core": "next", "@theia/cpp": "next", + "@theia/debug": "next", "@theia/editor": "next", "@theia/electron": "next", "@theia/file-search": "next", @@ -19,7 +20,8 @@ "@theia/terminal": "next", "@theia/workspace": "next", "@theia/textmate-grammars": "next", - "arduino-ide-extension": "0.0.4" + "arduino-ide-extension": "0.0.2", + "arduino-debugger-extension": "0.0.2" }, "devDependencies": { "@theia/cli": "next"