Skip to content

support macos arm64 #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

support macos arm64 #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added luahelper-vscode/debugger/luasocket/mac/arm64/lua5.1/mime/core.so
View file
Open in desktop
Binary file not shown.
Binary file added luahelper-vscode/debugger/luasocket/mac/arm64/lua5.1/socket/core.so
View file
Open in desktop
Binary file not shown.
Binary file added luahelper-vscode/debugger/luasocket/mac/arm64/lua5.2/mime/core.so
View file
Open in desktop
Binary file not shown.
Binary file added luahelper-vscode/debugger/luasocket/mac/arm64/lua5.2/socket/core.so
View file
Open in desktop
Binary file not shown.
Binary file added luahelper-vscode/debugger/luasocket/mac/arm64/lua5.3/mime/core.so
View file
Open in desktop
Binary file not shown.
Binary file added luahelper-vscode/debugger/luasocket/mac/arm64/lua5.3/socket/core.so
View file
Open in desktop
Binary file not shown.
Binary file added luahelper-vscode/debugger/luasocket/mac/arm64/lua5.4/lua
View file
Open in desktop
Binary file not shown.
Binary file added luahelper-vscode/debugger/luasocket/mac/arm64/lua5.4/mime/core.so
View file
Open in desktop
Binary file not shown.
Binary file added luahelper-vscode/debugger/luasocket/mac/arm64/lua5.4/socket/core.so
View file
Open in desktop
Binary file not shown.
0 ...-vscode/debugger/luasocket/mac/lua5.1/lua → ...ode/debugger/luasocket/mac/x64/lua5.1/lua
View file
Open in desktop
File renamed without changes.
0 ...ebugger/luasocket/mac/lua5.1/mime/core.so → ...ger/luasocket/mac/x64/lua5.1/mime/core.so
View file
Open in desktop
File renamed without changes.
0 ...ugger/luasocket/mac/lua5.1/socket/core.so → ...r/luasocket/mac/x64/lua5.1/socket/core.so
View file
Open in desktop
File renamed without changes.
0 ...-vscode/debugger/luasocket/mac/lua5.2/lua → ...ode/debugger/luasocket/mac/x64/lua5.2/lua
View file
Open in desktop
File renamed without changes.
0 ...ebugger/luasocket/mac/lua5.2/mime/core.so → ...ger/luasocket/mac/x64/lua5.2/mime/core.so
View file
Open in desktop
File renamed without changes.
0 ...ugger/luasocket/mac/lua5.2/socket/core.so → ...r/luasocket/mac/x64/lua5.2/socket/core.so
View file
Open in desktop
File renamed without changes.
0 ...-vscode/debugger/luasocket/mac/lua5.3/lua → ...ode/debugger/luasocket/mac/x64/lua5.3/lua
View file
Open in desktop
File renamed without changes.
0 ...ebugger/luasocket/mac/lua5.3/mime/core.so → ...ger/luasocket/mac/x64/lua5.3/mime/core.so
View file
Open in desktop
File renamed without changes.
0 ...ugger/luasocket/mac/lua5.3/socket/core.so → ...r/luasocket/mac/x64/lua5.3/socket/core.so
View file
Open in desktop
File renamed without changes.
0 ...-vscode/debugger/luasocket/mac/lua5.4/lua → ...ode/debugger/luasocket/mac/x64/lua5.4/lua
View file
Open in desktop
File renamed without changes.
0 ...ebugger/luasocket/mac/lua5.4/mime/core.so → ...ger/luasocket/mac/x64/lua5.4/mime/core.so
View file
Open in desktop
File renamed without changes.
0 ...ugger/luasocket/mac/lua5.4/socket/core.so → ...r/luasocket/mac/x64/lua5.4/socket/core.so
View file
Open in desktop
File renamed without changes.
14 changes: 12 additions & 2 deletions luahelper-vscode/src/common/luaPath.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ export class LuaPath {
let retStr: string = "";
let suffixStr: string = "";
let platform: string = os.platform();
let arch = os.machine();
switch (platform) {
case "win32":
let suffixVerStr: string = luaVersionStr.replace(".", "");
Expand All @@ -83,7 +84,11 @@ export class LuaPath {
suffixStr = "/debugger/luasocket/linux/lua" + luaVersionStr + "/lua";
break;
case "darwin":
suffixStr = "/debugger/luasocket/mac/lua" + luaVersionStr + "/lua";
if (arch === "arm64") {
suffixStr = "/debugger/luasocket/mac/arm64/lua" + luaVersionStr + "/lua";
} else {
suffixStr = "/debugger/luasocket/mac/x64/lua" + luaVersionStr + "/lua";
}
break;
}
retStr = stdPath + suffixStr;
Expand All @@ -99,6 +104,7 @@ export class LuaPath {
let retStr: string = "";
let suffixStr: string = "";
let platform: string = os.platform();
let arch = os.machine();
switch (platform) {
case "win32":
suffixStr = "/debugger/luasocket/win/x64/lua" + luaVersionStr + "/?.dll";
Expand All @@ -107,7 +113,11 @@ export class LuaPath {
suffixStr = "/debugger/luasocket/linux/lua" + luaVersionStr + "/?.so";
break;
case "darwin":
suffixStr = "/debugger/luasocket/mac/lua" + luaVersionStr + "/?.so";
if (arch === "arm64") {
suffixStr = "/debugger/luasocket/mac/arm64/lua" + luaVersionStr + "/?.so";
} else {
suffixStr = "/debugger/luasocket/mac/x64/lua" + luaVersionStr + "/?.so";
}
break;
}
retStr = stdPath + suffixStr;
Expand Down
3 changes: 2 additions & 1 deletion luahelper-vscode/src/debug/luaDebug.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,8 +333,9 @@ export class LuaDebugSession extends LoggingDebugSession {
let runCMD = pathCMD + cpathCMD + reqCMD + doFileCMD;

let LuaCMD = strVect[0] + " -e ";
this._debugFileTermianl.sendText(LuaCMD + runCMD, true);
this._debugFileTermianl.show();
//兼容terminal启动耗时较长的情况，延迟发送命令
setTimeout(() => this._debugFileTermianl.sendText(LuaCMD + runCMD, true), 2000);
}
else{
// 非单文件调试模式下，拉起program
Expand Down
36 changes: 25 additions & 11 deletions luahelper-vscode/src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,17 +480,31 @@ async function copyLuaSocket() {

vscode.window.showInformationMessage("copy lua socket " + selectWord.label + " lib success.");
} else if (process.platform === "darwin") {
srcCopyDir = path.join(Tools.VSCodeExtensionPath, '/debugger/luasocket/mac/' + selectWord.label + "/socket");
let cmdStr1 = "cp -R " + srcCopyDir + " " + dstPath + "/";
console.log("cmdStr:%s", cmdStr1);
child_process.execSync(cmdStr1);

srcCopyDir = path.join(Tools.VSCodeExtensionPath, '/debugger/luasocket/mac/' + selectWord.label + "/mime");
let cmdStr2 = "cp -R " + srcCopyDir + " " + dstPath + "/";
console.log("cmdStr:%s", cmdStr2);
child_process.execSync(cmdStr2);

vscode.window.showInformationMessage("copy lua socket " + selectWord.label + " lib success.");
if (process.arch === "arm64") {
srcCopyDir = path.join(Tools.VSCodeExtensionPath, '/debugger/luasocket/mac/arm64/' + selectWord.label + "/socket");
let cmdStr1 = "cp -R " + srcCopyDir + " " + dstPath + "/";
console.log("cmdStr:%s", cmdStr1);
child_process.execSync(cmdStr1);

srcCopyDir = path.join(Tools.VSCodeExtensionPath, '/debugger/luasocket/mac/arm64/' + selectWord.label + "/mime");
let cmdStr2 = "cp -R " + srcCopyDir + " " + dstPath + "/";
console.log("cmdStr:%s", cmdStr2);
child_process.execSync(cmdStr2);

vscode.window.showInformationMessage("copy lua socket " + selectWord.label + " lib success.");
} else {
srcCopyDir = path.join(Tools.VSCodeExtensionPath, '/debugger/luasocket/mac/x64/' + selectWord.label + "/socket");
let cmdStr1 = "cp -R " + srcCopyDir + " " + dstPath + "/";
console.log("cmdStr:%s", cmdStr1);
child_process.execSync(cmdStr1);

srcCopyDir = path.join(Tools.VSCodeExtensionPath, '/debugger/luasocket/mac/x64/' + selectWord.label + "/mime");
let cmdStr2 = "cp -R " + srcCopyDir + " " + dstPath + "/";
console.log("cmdStr:%s", cmdStr2);
child_process.execSync(cmdStr2);

vscode.window.showInformationMessage("copy lua socket " + selectWord.label + " lib success.");
}
} else if (process.platform === "linux") {
srcCopyDir = path.join(Tools.VSCodeExtensionPath, '/debugger/luasocket/linux/' + selectWord.label + "/socket");
let cmdStr1 = "cp -a " + srcCopyDir + " " + dstPath + "/";
Expand Down
3 changes: 2 additions & 1 deletion luahelper-vscode/src/luapandaDebug.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,9 @@ export class LuaConfigurationProvider implements vscode.DebugConfigurationProvid

let LuaCMD = strVect[0] + " -e ";

LuaConfigurationProvider.RunFileTerminal.sendText(LuaCMD + runCMD, true);
LuaConfigurationProvider.RunFileTerminal.show();
//兼容terminal启动耗时较长的情况，延迟发送命令
setTimeout(() => LuaConfigurationProvider.RunFileTerminal.sendText(LuaCMD + runCMD, true), 2000);
return;
}

Expand Down