Skip to content

Commit 385a5ce

Browse files
committed
update openocd
1 parent 8a2902b commit 385a5ce

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

src/ResInstaller.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export type ExternalToolName = ToolchainName | HexUploaderType | 'cppcheck' | st
4848

4949
export interface ExternalToolInfo {
5050

51-
resource_name: string;
51+
resource_name: string; // resource id (unique)
5252
readable_name: string;
5353
detail?: string;
5454
is_third_party?: boolean;
@@ -156,8 +156,8 @@ export class ResInstaller {
156156
});
157157

158158
this.registerTool('OpenOCD', {
159-
resource_name: 'openocd',
160-
readable_name: 'OpenOCD Programmer (v0.10.0 stable)',
159+
resource_name: 'openocd_7a1adfbec_mingw32',
160+
readable_name: 'OpenOCD Programmer (v0.12.0-rc2)',
161161
setting_name: 'OpenOCD.ExePath',
162162
require_name: `bin/openocd${platform.exeSuffix()}`,
163163
no_binaries: no_binaries
@@ -322,7 +322,7 @@ export class ResInstaller {
322322
if (toolInfo.is_third_party) {
323323
resourceFile = File.fromArray([os.tmpdir(), `${resourceName}.${toolInfo.zip_type}`]);
324324
} else {
325-
resourceFile = File.fromArray([os.tmpdir(), `${resourceName}.7z`])
325+
resourceFile = File.fromArray([os.tmpdir(), `${resourceName}.${toolInfo.zip_type || '7z'}`])
326326
}
327327

328328
try {
@@ -454,7 +454,7 @@ export class ResInstaller {
454454
let drvExePath = toolInfo.getDrvInstaller();
455455
if (drvExePath) {
456456
drvExePath = outDir.path + File.sep + drvExePath;
457-
utility.runShellCommand(`install driver`, `"${drvExePath}"`, undefined, true);
457+
utility.runShellCommand(`install driver`, `start "${resourceName}" /MAX "${drvExePath}"`, undefined, true);
458458
}
459459
}
460460

0 commit comments

Comments
 (0)