jeans/arduino-ide
jeans/arduino-ide
1
0
Fork 0
mirror of https://github.com/arduino/arduino-ide.git synced 2025-07-08 11:56:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[electron] Added debugger to Electron build

Browse Source
This commit is contained in:
Christian Weichel 2019-11-19 19:20:40 +01:00 committed by Miro Spönemann
parent 76f126b913
commit 68ff6acb6a
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arduino-debugger-extension/src/browser/arduino-variable-resolver.ts
View File

@ -83,7 +83,7 @@ export class ArduinoVariableResolver implements VariableContribution {
toolLocations[t.name] = t.locations!; toolLocations[t.name] = t.locations!;
}) })
switch(argument) { switch (argument) {
case "openocd": case "openocd":
return toolLocations["openocd"].main; return toolLocations["openocd"].main;
case "openocd-scripts": case "openocd-scripts":

3
arduino-ide-extension/src/node/boards-service-impl.ts
View File

@ -272,9 +272,10 @@ export class BoardsServiceImpl implements BoardsService {
case "openocd": case "openocd":
loc.scripts = path.join(loc.main, "share", "openocd", "scripts"); loc.scripts = path.join(loc.main, "share", "openocd", "scripts");
loc.main = path.join(loc.main, "bin", "openocd"); loc.main = path.join(loc.main, "bin", "openocd");
break break;
case "arm-none-eabi-gcc": case "arm-none-eabi-gcc":
["gdb", "objdump"].forEach(s => loc[s] = path.join(loc.main, "bin", `arm-none-eabi-${s}`)); ["gdb", "objdump"].forEach(s => loc[s] = path.join(loc.main, "bin", `arm-none-eabi-${s}`));
break;
} }
return loc; return loc;

4
electron-app/package.json
View File

@ -6,6 +6,7 @@
"dependencies": { "dependencies": {
"@theia/core": "next", "@theia/core": "next",
"@theia/cpp": "next", "@theia/cpp": "next",
"@theia/debug": "next",
"@theia/editor": "next", "@theia/editor": "next",
"@theia/electron": "next", "@theia/electron": "next",
"@theia/file-search": "next", "@theia/file-search": "next",
@ -19,7 +20,8 @@
"@theia/terminal": "next", "@theia/terminal": "next",
"@theia/workspace": "next", "@theia/workspace": "next",
"@theia/textmate-grammars": "next", "@theia/textmate-grammars": "next",
"arduino-ide-extension": "0.0.4" "arduino-ide-extension": "0.0.2",
"arduino-debugger-extension": "0.0.2"
}, },
"devDependencies": { "devDependencies": {
"@theia/cli": "next" "@theia/cli": "next"