christoph/wamr
1
Fork 0
Code Releases Activity

Install patched LLDB on vscode extension activation (#1637)

Browse Source 
Download and install the WAMR patched LLDB binary on vscode extension activation.

This allows the user to download the packaged .vsix file, where the activation script
should handle determining what LLDB binary they should use, and install it in the
correct location.
This commit is contained in:
Callum Macmillan
2022-12-01 02:39:14 +00:00
committed by GitHub
parent ce3458da99
commit 6eaf779a2d
7 changed files with 202 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
test-tools/wamr-ide/VSCode-Extension/src/extension.ts
View File

@ -12,12 +12,13 @@ import { WasmTaskProvider } from './taskProvider';
import { TargetConfigPanel } from './view/TargetConfigPanel';
import { NewProjectPanel } from './view/NewProjectPanel';
import {
CheckIfDirectoryExist,
WriteIntoFile,
ReadFromFile,
checkIfDirectoryExists,
writeIntoFile,
readFromFile,
} from './utilities/directoryUtilities';
import { decorationProvider } from './decorationProvider';
import { WasmDebugConfigurationProvider } from './debugConfigurationProvider';
import { isLLDBInstalled, promptInstallLLDB } from './utilities/lldbUtilities';
let wasmTaskProvider: WasmTaskProvider;
let wasmDebugConfigProvider: WasmDebugConfigurationProvider;
@ -213,7 +214,7 @@ export async function activate(context: vscode.ExtensionContext) {
return;
}
});
} else if (!CheckIfDirectoryExist(curWorkspace as string)) {
} else if (!checkIfDirectoryExists(curWorkspace as string)) {
vscode.window
.showWarningMessage(
'Invalid workspace:',
@ -369,7 +370,7 @@ export async function activate(context: vscode.ExtensionContext) {
let disposableDebug = vscode.commands.registerCommand(
'wamride.debug',
() => {
async () => {
if (!isWasmProject) {
vscode.window.showErrorMessage('debug failed', {
modal: true,
@ -378,6 +379,15 @@ export async function activate(context: vscode.ExtensionContext) {
return;
}
/* we should check again whether the user installed lldb, as this can be skipped during activation */
try {
if (!isLLDBInstalled(context)) {
await promptInstallLLDB(context);
}
} catch (e) {
vscode.window.showWarningMessage((e as Error).message);
}
/* refuse to debug if build process failed */
if (!checkIfBuildSuccess()) {
vscode.window.showErrorMessage('Debug failed', {
@ -582,7 +592,7 @@ export async function activate(context: vscode.ExtensionContext) {
return;
}
});
} else if (!CheckIfDirectoryExist(curWorkspace as string)) {
} else if (!checkIfDirectoryExists(curWorkspace as string)) {
vscode.window
.showWarningMessage(
'Invalid workspace:',
@ -686,6 +696,14 @@ export async function activate(context: vscode.ExtensionContext) {
disposableToggleExcludeFile,
disposableDebug
);
try {
if (!isLLDBInstalled(context)) {
await promptInstallLLDB(context);
}
} catch (e) {
vscode.window.showWarningMessage((e as Error).message);
}
}
function openWindoWithSituation(uri: vscode.Uri) {
@ -736,13 +754,13 @@ export function writeIntoConfigFile(
let prjConfigDir = path.join(currentPrjDir, '.wamr');
let configFilePath = path.join(prjConfigDir, 'compilation_config.json');
WriteIntoFile(configFilePath, jsonStr);
writeIntoFile(configFilePath, jsonStr);
}
export function readFromConfigFile(): string {
let prjConfigDir = path.join(currentPrjDir, '.wamr');
let configFilePath = path.join(prjConfigDir, 'compilation_config.json');
return ReadFromFile(configFilePath);
return readFromFile(configFilePath);
}
/**
@ -854,7 +872,7 @@ function generateCMakeFile(
.concat('\n', strSrcList)
.concat('\n', strIncludeList);
WriteIntoFile(cmakeFilePath, fullStr);
writeIntoFile(cmakeFilePath, fullStr);
}
function getAllSrcFiles(_path: string) {